Some more things regarding #4269

This commit is contained in:
Miroslav Stampar 2020-07-16 16:10:02 +02:00
parent 6375f9e506
commit e910fc6b8b
7 changed files with 153 additions and 163 deletions

View File

@ -4,6 +4,7 @@
<html lang="en"> <html lang="en">
<head> <head>
<title>DEMO</title>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
@ -74,7 +75,7 @@
<div class="sidebar-nav navbar-collapse"> <div class="sidebar-nav navbar-collapse">
<ul class="nav" id="side-menu"> <ul class="nav" id="side-menu">
<li> <li>
<a href="#"><i class="glyphicon glyphicon-home"></i> Options<span class="arrow"></span></a> <a href="#"><em class="glyphicon glyphicon-home"></em> Options<span class="arrow"></span></a>
<ul class="nav nav-second-level"> <ul class="nav nav-second-level">
<li><a>Target</a></li> <li><a>Target</a></li>
<li><a>Request</a></li> <li><a>Request</a></li>

View File

@ -18,7 +18,7 @@ from lib.core.enums import OS
from thirdparty.six import unichr as _unichr from thirdparty.six import unichr as _unichr
# sqlmap version (<major>.<minor>.<month>.<monthly commit>) # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
VERSION = "1.4.7.11" VERSION = "1.4.7.12"
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)

View File

@ -163,8 +163,7 @@ class SmartRedirectHandler(_urllib.request.HTTPRedirectHandler):
retVal = getSafeExString(ex) retVal = getSafeExString(ex)
except: except:
retVal = "" retVal = ""
finally: return retVal
return retVal
result.read = types.MethodType(_, result) result.read = types.MethodType(_, result)

View File

@ -570,7 +570,7 @@ class Route(object):
def prepare(self): def prepare(self):
""" Do all on-demand work immediately (useful for debugging).""" """ Do all on-demand work immediately (useful for debugging)."""
self.call self.call()
def all_plugins(self): def all_plugins(self):
""" Yield all Plugins affecting this route. """ """ Yield all Plugins affecting this route. """
@ -1518,7 +1518,7 @@ class BaseRequest(object):
raise AttributeError("Attribute already defined: %s" % name) raise AttributeError("Attribute already defined: %s" % name)
self.environ[key] = value self.environ[key] = value
def __delattr__(self, name, value): def __delattr__(self, name):
try: try:
del self.environ['bottle.request.ext.%s' % name] del self.environ['bottle.request.ext.%s' % name]
except KeyError: except KeyError:

View File

@ -1930,7 +1930,7 @@ class ListControl(Control):
raise AttributeError("control '%s' is disabled" % self.name) raise AttributeError("control '%s' is disabled" % self.name)
if self.readonly: if self.readonly:
raise AttributeError("control '%s' is readonly" % self.name) raise AttributeError("control '%s' is readonly" % self.name)
action == bool(action) action = bool(action)
compat = self._form.backwards_compat compat = self._form.backwards_compat
if not compat and item.disabled: if not compat and item.disabled:
raise AttributeError("item is disabled") raise AttributeError("item is disabled")

View File

@ -1271,16 +1271,6 @@ class CallgrindParser(LineParser):
return None return None
key, value = pair key, value = pair
return value return value
line = self.lookahead()
mo = self._key_re.match(line)
if not mo:
return None
key, value = line.split(':', 1)
if key not in keys:
return None
value = value.strip()
self.consume()
return key, value
def parse_keys(self, keys): def parse_keys(self, keys):
line = self.lookahead() line = self.lookahead()

View File

@ -722,7 +722,7 @@ class XDotAttrParser:
def handle_font_characteristics(self, flags): def handle_font_characteristics(self, flags):
# TODO # TODO
if flags != 0: if flags != 0:
sys.stderr.write("warning: font characteristics not supported yet\n" % op) sys.stderr.write("warning: font characteristics not supported yet\n")
def handle_text(self, x, y, j, w, t): def handle_text(self, x, y, j, w, t):
self.shapes.append(TextShape(self.pen, x, y, j, w, t)) self.shapes.append(TextShape(self.pen, x, y, j, w, t))