diff --git a/lib/controller/controller.py b/lib/controller/controller.py index 4d30140ad..768cfff2a 100644 --- a/lib/controller/controller.py +++ b/lib/controller/controller.py @@ -365,7 +365,7 @@ def start(): # a warning message to the user in case the page is not stable checkStability() - # Do a little prioritization reorder of a testable parameter list + # Do a little prioritization reorder of a testable parameter list parameters = conf.parameters.keys() # Order of testing list (last to first) diff --git a/lib/core/enums.py b/lib/core/enums.py index 9f99a7cda..bd606d080 100644 --- a/lib/core/enums.py +++ b/lib/core/enums.py @@ -24,7 +24,7 @@ class SORT_ORDER: class DBMS: ACCESS = "Microsoft Access" - DB2 = "IBM DB2" + DB2 = "IBM DB2" FIREBIRD = "Firebird" MAXDB = "SAP MaxDB" MSSQL = "Microsoft SQL Server" diff --git a/lib/core/subprocessng.py b/lib/core/subprocessng.py index da5232efd..efd3cf34b 100644 --- a/lib/core/subprocessng.py +++ b/lib/core/subprocessng.py @@ -34,7 +34,7 @@ def blockingReadFromFD(fd): # Uncomment the following line if the process seems to # take a huge amount of cpu time # time.sleep(0.01) - continue + continue else: raise break @@ -52,9 +52,9 @@ def blockingWriteToFD(fd, data): wrote_data = os.write(fd, data) except (OSError, IOError), io: if io.errno in (errno.EAGAIN, errno.EINTR): - continue + continue else: - raise + raise if wrote_data < data_length: blockingWriteToFD(fd, data[wrote_data:]) diff --git a/lib/request/rangehandler.py b/lib/request/rangehandler.py index 3b421cc59..122d1cd2d 100644 --- a/lib/request/rangehandler.py +++ b/lib/request/rangehandler.py @@ -17,8 +17,8 @@ class HTTPRangeHandler(urllib2.BaseHandler): Reference: http://stackoverflow.com/questions/1971240/python-seek-on-remote-file This was extremely simple. The Range header is a HTTP feature to - begin with so all this class does is tell urllib2 that the - "206 Partial Content" response from the HTTP server is what we + begin with so all this class does is tell urllib2 that the + "206 Partial Content" response from the HTTP server is what we expected. Example: diff --git a/plugins/dbms/db2/enumeration.py b/plugins/dbms/db2/enumeration.py index f14cb149d..27b49c57d 100644 --- a/plugins/dbms/db2/enumeration.py +++ b/plugins/dbms/db2/enumeration.py @@ -11,7 +11,7 @@ from plugins.generic.enumeration import Enumeration as GenericEnumeration class Enumeration(GenericEnumeration): def __init__(self): - GenericEnumeration.__init__(self) + GenericEnumeration.__init__(self) def getPasswordHashes(self): warnMsg = "on DB2 it is not possible to list password hashes" diff --git a/plugins/dbms/mssqlserver/filesystem.py b/plugins/dbms/mssqlserver/filesystem.py index be9d000ea..20cb3cdc1 100644 --- a/plugins/dbms/mssqlserver/filesystem.py +++ b/plugins/dbms/mssqlserver/filesystem.py @@ -261,22 +261,22 @@ class Filesystem(GenericFilesystem): Set file = fs.GetFile(inputFilePath) If file.Size Then Wscript.Echo "Loading from: " & inputFilePath - Wscript.Echo + Wscript.Echo Set fd = fs.OpenTextFile(inputFilePath, 1) data = fd.ReadAll fd.Close data = Replace(data, " ", "") data = Replace(data, vbCr, "") data = Replace(data, vbLf, "") - Wscript.Echo "Fixed Input: " + Wscript.Echo "Fixed Input: " Wscript.Echo data - Wscript.Echo + Wscript.Echo decodedData = base64_decode(data) - Wscript.Echo "Output: " + Wscript.Echo "Output: " Wscript.Echo decodedData - Wscript.Echo + Wscript.Echo Wscript.Echo "Writing output in: " & outputFilePath - Wscript.Echo + Wscript.Echo Set ofs = CreateObject("Scripting.FileSystemObject").OpenTextFile(outputFilePath, 2, True) ofs.Write decodedData ofs.close diff --git a/tamper/multiplespaces.py b/tamper/multiplespaces.py index 718762896..fa800d42a 100644 --- a/tamper/multiplespaces.py +++ b/tamper/multiplespaces.py @@ -22,7 +22,7 @@ def tamper(payload, **kwargs): Example: * Input: UNION SELECT - * Output: UNION SELECT + * Output: UNION SELECT Notes: * Useful to bypass very weak and bespoke web application firewalls diff --git a/tamper/space2morehash.py b/tamper/space2morehash.py index 99491516c..b1d16b64d 100644 --- a/tamper/space2morehash.py +++ b/tamper/space2morehash.py @@ -51,7 +51,7 @@ def tamper(payload, **kwargs): else: return match.group() - retVal = "" + retVal = "" if payload: payload = re.sub(r"(?<=\W)(?P[A-Za-z_]+)(?=\W|\Z)", lambda match: process(match), payload) diff --git a/tamper/space2mssqlblank.py b/tamper/space2mssqlblank.py index af88722e0..44df5dcf0 100644 --- a/tamper/space2mssqlblank.py +++ b/tamper/space2mssqlblank.py @@ -42,16 +42,16 @@ def tamper(payload, **kwargs): # STX 02 start of text # ETX 03 end of text # EOT 04 end of transmission - # ENQ 05 enquiry - # ACK 06 acknowledge + # ENQ 05 enquiry + # ACK 06 acknowledge # BEL 07 bell # BS 08 backspace # TAB 09 horizontal tab # LF 0A new line - # VT 0B vertical TAB - # FF 0C new page - # CR 0D carriage return - # SO 0E shift out + # VT 0B vertical TAB + # FF 0C new page + # CR 0D carriage return + # SO 0E shift out # SI 0F shift in blanks = ('%01', '%02', '%03', '%04', '%05', '%06', '%07', '%08', '%09', '%0B', '%0C', '%0D', '%0E', '%0F', '%0A') retVal = payload @@ -82,7 +82,7 @@ def tamper(payload, **kwargs): else: retVal += random.choice(blanks) - continue + continue retVal += payload[i]