Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix "Prefer format() over string interpolation operator" issue #7

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix "Prefer format() over string interpolation operator" issue #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
110 changes: 54 additions & 56 deletions Modules/IPy.py
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Modules/dirbust.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
print "\033[1;37m[-] ----------------------------------------------------------------------------- \033[1;m"
for filename in os.listdir(folder):
outfile = " -o " + "./results/" + name + "/" + name + "_dirb_" + filename + "_" + port
DIRBSCAN = "dirb %s %s/%s %s -S -r" % (url, folder, filename, outfile)
DIRBSCAN = "dirb {0!s} {1!s}/{2!s} {3!s} -S -r".format(url, folder, filename, outfile)
try:
results = subprocess.check_output(DIRBSCAN, shell=True)
resultarr = results.split("\n")
Expand Down
4 changes: 2 additions & 2 deletions Modules/dnsrecon.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

try:
ip_address = sys.argv[1]
HOSTNAME = "host %s | cut -d ' ' -f5 | cut -d '.' -f1,2,3" % (ip_address)
DOMAINNAME = "host %s | cut -d ' ' -f5 | cut -d '.' -f2,3" % (ip_address)
HOSTNAME = "host {0!s} | cut -d ' ' -f5 | cut -d '.' -f1,2,3".format((ip_address))
DOMAINNAME = "host {0!s} | cut -d ' ' -f5 | cut -d '.' -f2,3".format((ip_address))
port = 53

print "\033[1;37m[-] ----------------------------------------------------------------------------- \033[1;m"
Expand Down
16 changes: 8 additions & 8 deletions Modules/recon.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ def getIp():
def dnsEnum(ip_address, port):
#print('\033[1;34m[*] Detected DNS on {0} : {1}\033[1;m'.format(ip_address, port))
if port.strip() == "53":
SCRIPT = "./Modules/dnsrecon.py %s" % (ip_address) # execute the python script
SCRIPT = "./Modules/dnsrecon.py {0!s}".format((ip_address)) # execute the python script
subprocess.call(SCRIPT, shell=True)
return

Expand All @@ -140,7 +140,7 @@ def httpEnum(ip_address, port):
#print('\033[1;34m[*] Detected HTTP on {0} : {1}\033[1;m'.format(ip_address, port))
checkpath("./results/")
try:
SCRIPT = "./Modules/httprecon.py %s %s" % (ip_address, port) # execute the python script
SCRIPT = "./Modules/httprecon.py {0!s} {1!s}".format(ip_address, port) # execute the python script
subprocess.call(SCRIPT, shell=True)
except:
pass
Expand All @@ -162,27 +162,27 @@ def mssqlEnum(ip_address, port):

def sshEnum(ip_address, port):
#print('\033[1;34m[*] Detected SSH on {0} : {1}\033[1;m'.format(ip_address, port))
SCRIPT = "./Modules/sshrecon.py %s %s" % (ip_address, port)
SCRIPT = "./Modules/sshrecon.py {0!s} {1!s}".format(ip_address, port)
subprocess.call(SCRIPT, shell=True)
return

def telnetEnum(ip_address, port):
#print('\033[1;34m[*] Detected TELNET on {0} : {1}\033[1;m'.format(ip_address, port))
SCRIPT = "./Modules/telnetrecon.py %s %s" % (ip_address, port)
SCRIPT = "./Modules/telnetrecon.py {0!s} {1!s}".format(ip_address, port)
subprocess.call(SCRIPT, shell=True)
return

def snmpEnum(ip_address, port):
#print('\033[1;34m[*] Detected SNMP on {0} : {1}\033[1;m'.format(ip_address, port))
SCRIPT = "./Modules/snmprecon.py %s" % (ip_address)
SCRIPT = "./Modules/snmprecon.py {0!s}".format((ip_address))
subprocess.call(SCRIPT, shell=True)
return


def smtpEnum(ip_address, port):
#print('\033[1;34m[*] Detected SMTP on {0} : {1}\033[1;m'.format(ip_address, port))
if port.strip() == "25":
SCRIPT = "./Modules/smtprecon.py %s" % (ip_address)
SCRIPT = "./Modules/smtprecon.py {0!s}".format((ip_address))
subprocess.call(SCRIPT, shell=True)
else:
print '\033[1;33mWARNING: SMTP detected on non-standard port, smtprecon skipped (must run manually)\033[1;m'
Expand All @@ -192,14 +192,14 @@ def smtpEnum(ip_address, port):
def smbEnum(ip_address, port):
#print('\033[1;34m[*] Detected SMB on {0} : {1}\033[1;m'.format(ip_address, port))
if port.strip() == "445":
SCRIPT = "./Modules/smbrecon.py %s 2>/dev/null" % (ip_address)
SCRIPT = "./Modules/smbrecon.py {0!s} 2>/dev/null".format((ip_address))
subprocess.call(SCRIPT, shell=True)
return


def ftpEnum(ip_address, port):
#print('\033[1;34m[*] Detected FTP on {0} : {1}\033[1;m'.format(ip_address, port))
SCRIPT = "./Modules/ftprecon.py %s %s" % (ip_address, port)
SCRIPT = "./Modules/ftprecon.py {0!s} {1!s}".format(ip_address, port)
subprocess.call(SCRIPT, shell=True)
return

Expand Down
16 changes: 8 additions & 8 deletions Modules/samrdump.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,15 @@ def dump(self, addr):
addr. Addr is a valid host name or IP address.
"""

logging.info('Retrieving endpoint list from %s' % addr)
logging.info('Retrieving endpoint list from {0!s}'.format(addr))

# Try all requested protocols until one works.
entries = []
for protocol in self.__protocols:
protodef = SAMRDump.KNOWN_PROTOCOLS[protocol]
port = protodef[1]

logging.info("Trying protocol %s..." % protocol)
logging.info("Trying protocol {0!s}...".format(protocol))
rpctransport = transport.SMBTransport(addr, port, r'\samr', self.__username, self.__password, self.__domain, self.__lmhash, self.__nthash, self.__aesKey, doKerberos = self.__doKerberos)

try:
Expand All @@ -82,7 +82,7 @@ def dump(self, addr):

for entry in entries:
(username, uid, user) = entry
base = "%s (%d)" % (username, uid)
base = "{0!s} ({1:d})".format(username, uid)
print base + '/FullName:', user['FullName']
print base + '/UserComment:', user['UserComment']
print base + '/PrimaryGroupId:', user['PrimaryGroupId']
Expand All @@ -94,7 +94,7 @@ def dump(self, addr):
if 1 == num:
logging.info('Received one entry.')
else:
logging.info('Received %d entries.' % num)
logging.info('Received {0:d} entries.'.format(num))
else:
logging.info('No entries received.')

Expand All @@ -116,9 +116,9 @@ def __fetchList(self, rpctransport):

print 'Found domain(s):'
for domain in domains:
print " . %s" % domain['Name']
print " . {0!s}".format(domain['Name'])

logging.info("Looking up users in domain %s" % domains[0]['Name'])
logging.info("Looking up users in domain {0!s}".format(domains[0]['Name']))

resp = samr.hSamrLookupDomainInSamServer(dce, serverHandle,domains[0]['Name'] )

Expand All @@ -139,7 +139,7 @@ def __fetchList(self, rpctransport):

for user in resp['Buffer']['Buffer']:
r = samr.hSamrOpenUser(dce, domainHandle, samr.USER_READ_GENERAL | samr.USER_READ_PREFERENCES | samr.USER_READ_ACCOUNT, user['RelativeId'])
print "Found user: %s, uid = %d" % (user['Name'], user['RelativeId'] )
print "Found user: {0!s}, uid = {1:d}".format(user['Name'], user['RelativeId'] )

info = samr.hSamrQueryInformationUser2(dce, r['UserHandle'],samr.USER_INFORMATION_CLASS.UserAllInformation)
entry = (user['Name'], user['RelativeId'], info['Buffer']['All'])
Expand All @@ -150,7 +150,7 @@ def __fetchList(self, rpctransport):
status = resp['ErrorCode']

except ListUsersException, e:
logging.critical("Error listing users: %s" % e)
logging.critical("Error listing users: {0!s}".format(e))

dce.disconnect()

Expand Down
2 changes: 1 addition & 1 deletion Modules/smbrecon.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
scanresults = subprocess.check_output(VULNSCAN, shell=True)
recon.logparsertxt(scanresults)

NBTSCAN = "./Modules/samrdump.py %s" % (ip)
NBTSCAN = "./Modules/samrdump.py {0!s}".format((ip))
nbtresults = subprocess.check_output(NBTSCAN, shell=True)
if ("Connection refused" not in nbtresults) and ("Connect error" not in nbtresults) and ("Connection reset" not in nbtresults):
print('\033[1;33m[+] \033[1;33mSAMRDUMP has connected to {0} if there are results displaying them below\033[1;m'.format(ip))
Expand Down
2 changes: 1 addition & 1 deletion Modules/snmprecon.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
print "\033[1;37m[-] ----------------------------------------------------------------------------- \033[1;m"
print('\033[1;37m[-] | Starting SNMP scan for {0}\033[1;m'.format(ip_address))
print "\033[1;37m[-] ----------------------------------------------------------------------------- \033[1;m"
ONESIXONESCAN = "onesixtyone %s" % (ip_address)
ONESIXONESCAN = "onesixtyone {0!s}".format((ip_address))
results = subprocess.check_output(ONESIXONESCAN, shell=True).strip()


Expand Down
4 changes: 2 additions & 2 deletions Modules/telnetrecon.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
print "\033[1;37m[-] ----------------------------------------------------------------------------- \033[1;m"
print('\033[1;37m[-] | Starting hydra TELNET scan against {0}:{1}\033[1;m'.format(ip_address, port))
print "\033[1;37m[-] ----------------------------------------------------------------------------- \033[1;m"
HYDRA = "hydra -L /usr/share/wordlists/metasploit/unix_users.txt -P /usr/share/wordlists/rockyou.txt -f -o ./results/%s/%s_telnethydra.txt -u %s -s %s telnet" % (ip_address, ip_address, ip_address, port)
HYDRA = "hydra -L /usr/share/wordlists/metasploit/unix_users.txt -P /usr/share/wordlists/rockyou.txt -f -o ./results/{0!s}/{1!s}_telnethydra.txt -u {2!s} -s {3!s} telnet".format(ip_address, ip_address, ip_address, port)
try:
with open(os.devnull, "w") as f:
results = subprocess.check_output(HYDRA, shell=True, stdout=f)
Expand All @@ -29,7 +29,7 @@
print "\033[1;37m[-] ----------------------------------------------------------------------------- \033[1;m"
print('\033[1;37m[-] | Starting TELNET script scan for {0}:{1}\033[1;m'.format(ip_address, port))
print "\033[1;37m[-] ----------------------------------------------------------------------------- \033[1;m"
TELNETSCAN = "nmap -sV -Pn -vv -p %s --script=telnet-* -oN './results/%s/%s_telnet.nmap' %s" % (port, ip_address, ip_address, ip_address)
TELNETSCAN = "nmap -sV -Pn -vv -p {0!s} --script=telnet-* -oN './results/{1!s}/{2!s}_telnet.nmap' {3!s}".format(port, ip_address, ip_address, ip_address)
results = subprocess.check_output(TELNETSCAN, shell=True)
recon.logparsertxt(results)
outfile = "results/{0}/{0}_telnetrecon.txt".format(ip_address)
Expand Down
Loading