sqlmapproject/sqlmap
1
1
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2024-11-22 09:36:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Trivial code style updates

Browse Source
This commit is contained in:
Miroslav Stampar 2019-04-19 13:54:48 +02:00
parent 10fe87fb4e
commit e7469ab570
14 changed files with 73 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extra/shutils/blanks.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# Copyright (c) 2006-2013 sqlmap developers (http://sqlmap.org/) # Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
# See the file 'LICENSE' for copying permission # See the file 'LICENSE' for copying permission
# Removes trailing spaces from blank lines inside project files # Removes trailing spaces from blank lines inside project files

2
extra/shutils/drei.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# Copyright (c) 2006-2013 sqlmap developers (http://sqlmap.org/) # Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
# See the file 'LICENSE' for copying permission # See the file 'LICENSE' for copying permission
# Stress test against Python3 # Stress test against Python3

2
extra/shutils/pydiatra.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# Copyright (c) 2006-2013 sqlmap developers (http://sqlmap.org/) # Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
# See the file 'LICENSE' for copying permission # See the file 'LICENSE' for copying permission
# Runs py2diatra on all python files (prerequisite: pip install pydiatra) # Runs py2diatra on all python files (prerequisite: pip install pydiatra)

2
extra/shutils/pyflakes.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# Copyright (c) 2006-2013 sqlmap developers (http://sqlmap.org/) # Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
# See the file 'LICENSE' for copying permission # See the file 'LICENSE' for copying permission
# Runs pyflakes on all python files (prerequisite: apt-get install pyflakes) # Runs pyflakes on all python files (prerequisite: apt-get install pyflakes)

2
extra/vulnserver/vulnserver.py
View File

@ -117,7 +117,7 @@ class ReqHandler(BaseHTTPRequestHandler):
output += "<td>%s</td>" % value output += "<td>%s</td>" % value
output += "</tr>\n" output += "</tr>\n"
output += "</table>\n" output += "</table>\n"
output += "</body></html>"; output += "</body></html>"
except Exception as ex: except Exception as ex:
output = "%s: %s" % (re.search(r"'([^']+)'", str(type(ex))).group(1), ex) output = "%s: %s" % (re.search(r"'([^']+)'", str(type(ex))).group(1), ex)

2
lib/core/settings.py
View File

@ -17,7 +17,7 @@ from lib.core.enums import DBMS_DIRECTORY_NAME
from lib.core.enums import OS from lib.core.enums import OS
# sqlmap version (<major>.<minor>.<month>.<monthly commit>) # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
VERSION = "1.3.4.30" VERSION = "1.3.4.31"
TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable" TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34} TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34}
VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE) VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)

51
lib/utils/sgmllib.py
View File

@ -121,12 +121,15 @@ class SGMLParser(_markupbase.ParserBase):
i = n i = n
break break
match = interesting.search(rawdata, i) match = interesting.search(rawdata, i)
if match: j = match.start() if match:
else: j = n j = match.start()
else:
j = n
if i < j: if i < j:
self.handle_data(rawdata[i:j]) self.handle_data(rawdata[i:j])
i = j i = j
if i == n: break if i == n:
break
if rawdata[i] == '<': if rawdata[i] == '<':
if starttagopen.match(rawdata, i): if starttagopen.match(rawdata, i):
if self.literal: if self.literal:
@ -134,12 +137,14 @@ class SGMLParser(_markupbase.ParserBase):
i = i + 1 i = i + 1
continue continue
k = self.parse_starttag(i) k = self.parse_starttag(i)
if k < 0: break if k < 0:
break
i = k i = k
continue continue
if rawdata.startswith("</", i): if rawdata.startswith("</", i):
k = self.parse_endtag(i) k = self.parse_endtag(i)
if k < 0: break if k < 0:
break
i = k i = k
self.literal = 0 self.literal = 0
continue continue
@ -157,12 +162,14 @@ class SGMLParser(_markupbase.ParserBase):
# This should be removed, # This should be removed,
# and comments handled only in parse_declaration. # and comments handled only in parse_declaration.
k = self.parse_comment(i) k = self.parse_comment(i)
if k < 0: break if k < 0:
break
i = k i = k
continue continue
if rawdata.startswith("<?", i): if rawdata.startswith("<?", i):
k = self.parse_pi(i) k = self.parse_pi(i)
if k < 0: break if k < 0:
break
i = i+k i = i+k
continue continue
if rawdata.startswith("<!", i): if rawdata.startswith("<!", i):
@ -170,7 +177,8 @@ class SGMLParser(_markupbase.ParserBase):
# deployed," this should only be the document type # deployed," this should only be the document type
# declaration ("<!DOCTYPE html...>"). # declaration ("<!DOCTYPE html...>").
k = self.parse_declaration(i) k = self.parse_declaration(i)
if k < 0: break if k < 0:
break
i = k i = k
continue continue
elif rawdata[i] == '&': elif rawdata[i] == '&':
@ -183,14 +191,16 @@ class SGMLParser(_markupbase.ParserBase):
name = match.group(1) name = match.group(1)
self.handle_charref(name) self.handle_charref(name)
i = match.end(0) i = match.end(0)
if rawdata[i-1] != ';': i = i-1 if rawdata[i-1] != ';':
i = i-1
continue continue
match = entityref.match(rawdata, i) match = entityref.match(rawdata, i)
if match: if match:
name = match.group(1) name = match.group(1)
self.handle_entityref(name) self.handle_entityref(name)
i = match.end(0) i = match.end(0)
if rawdata[i-1] != ';': i = i-1 if rawdata[i-1] != ';':
i = i-1
continue continue
else: else:
self.error('neither < nor & ??') self.error('neither < nor & ??')
@ -275,7 +285,8 @@ class SGMLParser(_markupbase.ParserBase):
self.lasttag = tag self.lasttag = tag
while k < j: while k < j:
match = attrfind.match(rawdata, k) match = attrfind.match(rawdata, k)
if not match: break if not match:
break
attrname, rest, attrvalue = match.group(1, 2, 3) attrname, rest, attrvalue = match.group(1, 2, 3)
if not rest: if not rest:
attrvalue = attrname attrvalue = attrname
@ -361,7 +372,8 @@ class SGMLParser(_markupbase.ParserBase):
return return
found = len(self.stack) found = len(self.stack)
for i in range(found): for i in range(found):
if self.stack[i] == tag: found = i if self.stack[i] == tag:
found = i
while len(self.stack) > found: while len(self.stack) > found:
tag = self.stack[-1] tag = self.stack[-1]
try: try:
@ -450,10 +462,17 @@ class SGMLParser(_markupbase.ParserBase):
pass pass
# To be overridden -- handlers for unknown objects # To be overridden -- handlers for unknown objects
def unknown_starttag(self, tag, attrs): pass def unknown_starttag(self, tag, attrs):
def unknown_endtag(self, tag): pass pass
def unknown_charref(self, ref): pass
def unknown_entityref(self, ref): pass def unknown_endtag(self, tag):
pass
def unknown_charref(self, ref):
pass
def unknown_entityref(self, ref):
pass
class TestSGMLParser(SGMLParser): class TestSGMLParser(SGMLParser):