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

@ -1,150 +1,151 @@
<!DOCTYPE html> <!DOCTYPE html>
<!-- http://angrytools.com/bootstrap/editor/ --> <!-- http://angrytools.com/bootstrap/editor/ -->
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8"> <title>DEMO</title>
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.0/css/bootstrap.min.css" rel="stylesheet"> <meta name="viewport" content="width=device-width, initial-scale=1">
<link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.0/css/bootstrap-theme.min.css" rel="stylesheet"> <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.0/css/bootstrap.min.css" rel="stylesheet">
<link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.0/css/bootstrap-theme.min.css" rel="stylesheet">
<!--[if lt IE 9]><script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script><script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script><![endif]-->
</head> <!--[if lt IE 9]><script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script><script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script><![endif]-->
<body> </head>
<style> <body>
#wrapper { width: 100%; } <style>
#wrapper { width: 100%; }
#page-wrapper {
padding: 0 15px; #page-wrapper {
min-height: 568px; padding: 0 15px;
background-color: #fff; min-height: 568px;
} background-color: #fff;
}
@media(min-width:768px) {
#page-wrapper { @media(min-width:768px) {
position: inherit; #page-wrapper {
margin: 0 0 0 250px; position: inherit;
padding: 0 30px; margin: 0 0 0 250px;
border-left: 1px solid #e7e7e7; padding: 0 30px;
} border-left: 1px solid #e7e7e7;
} }
}
.sidebar .sidebar-nav.navbar-collapse { padding-right: 0; padding-left: 0; }
.sidebar .sidebar-search { padding: 15px; } .sidebar .sidebar-nav.navbar-collapse { padding-right: 0; padding-left: 0; }
.sidebar ul li { border-bottom: 1px solid #e7e7e7; } .sidebar .sidebar-search { padding: 15px; }
.sidebar ul li { border-bottom: 1px solid #e7e7e7; }
.sidebar ul li a.active { background-color: #eee; }
.sidebar ul li a.active { background-color: #eee; }
.sidebar .arrow { float: right;}
.sidebar .fa.arrow:before { content: "f104";} .sidebar .arrow { float: right;}
.sidebar .active>a>.fa.arrow:before { content: "f107"; } .sidebar .fa.arrow:before { content: "f104";}
.sidebar .nav-second-level li, .sidebar .active>a>.fa.arrow:before { content: "f107"; }
.sidebar .nav-third-level li { .sidebar .nav-second-level li,
border-bottom: 0!important; .sidebar .nav-third-level li {
} border-bottom: 0!important;
}
.sidebar .nav-second-level li a { padding-left: 37px; }
.sidebar .nav-third-level li a { padding-left: 52px; } .sidebar .nav-second-level li a { padding-left: 37px; }
.sidebar .nav-third-level li a { padding-left: 52px; }
@media(min-width:768px) {
.sidebar { @media(min-width:768px) {
z-index: 1; .sidebar {
position: absolute; z-index: 1;
width: 250px; position: absolute;
margin-top: 51px; width: 250px;
} margin-top: 51px;
} }
</style> }
<div id="wrapper"> </style>
<div id="wrapper">
<nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0">
<div class="navbar-header"> <nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> <div class="navbar-header">
<span class="sr-only">Toggle navigation</span> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="icon-bar"></span> <span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> <span class="icon-bar"></span>
<a class="navbar-brand" href="index.html">sqlmap</a> </button>
</div> <a class="navbar-brand" href="index.html">sqlmap</a>
</div>
<div class="navbar-default sidebar" role="navigation">
<div class="sidebar-nav navbar-collapse"> <div class="navbar-default sidebar" role="navigation">
<ul class="nav" id="side-menu"> <div class="sidebar-nav navbar-collapse">
<li> <ul class="nav" id="side-menu">
<a href="#"><i class="glyphicon glyphicon-home"></i> Options<span class="arrow"></span></a> <li>
<ul class="nav nav-second-level"> <a href="#"><em class="glyphicon glyphicon-home"></em> Options<span class="arrow"></span></a>
<li><a>Target</a></li> <ul class="nav nav-second-level">
<li><a>Request</a></li> <li><a>Target</a></li>
<li><a>Optimization</a></li> <li><a>Request</a></li>
<li><a>Injection</a></li> <li><a>Optimization</a></li>
<li><a>Detection</a></li> <li><a>Injection</a></li>
<li><a>Techniques</a></li> <li><a>Detection</a></li>
<li><a>Fingerprint</a></li> <li><a>Techniques</a></li>
<li><a>Enumeration</a></li> <li><a>Fingerprint</a></li>
<li><a>Brute force</a></li> <li><a>Enumeration</a></li>
<li><a>User-defined function injection</a></li> <li><a>Brute force</a></li>
<li><a>File system access</a></li> <li><a>User-defined function injection</a></li>
<li><a>Operating system access</a></li> <li><a>File system access</a></li>
<li><a>Windows registry access</a></li> <li><a>Operating system access</a></li>
<li><a>General</a></li> <li><a>Windows registry access</a></li>
<li><a>Miscellaneous</a></li> <li><a>General</a></li>
</ul> <li><a>Miscellaneous</a></li>
</li> </ul>
</ul> </li>
</div> </ul>
</div> </div>
</nav> </div>
</nav>
<div id="page-wrapper">
<div class="row"> <div id="page-wrapper">
<h4>DEMO</h4> <div class="row">
</div> <h4>DEMO</h4>
</div> </div>
</div> </div>
<script> </div>
/* <script>
* metismenu - v1.0.3 /*
* Easy menu jQuery plugin for Twitter Bootstrap 3 * metismenu - v1.0.3
* https://github.com/onokumus/metisMenu * Easy menu jQuery plugin for Twitter Bootstrap 3
* * https://github.com/onokumus/metisMenu
* Made by Osman Nuri Okumuş *
* Under MIT License * Made by Osman Nuri Okumuş
*/ * Under MIT License
!function(a,b,c){function d(b,c){this.element=b,this.settings=a.extend({},f,c),this._defaults=f,this._name=e,this.init()}var e="metisMenu",f={toggle:!0};d.prototype={init:function(){var b=a(this.element),c=this.settings.toggle;this.isIE()<=9?(b.find("li.active").has("ul").children("ul").collapse("show"),b.find("li").not(".active").has("ul").children("ul").collapse("hide")):(b.find("li.active").has("ul").children("ul").addClass("collapse in"),b.find("li").not(".active").has("ul").children("ul").addClass("collapse")),b.find("li").has("ul").children("a").on("click",function(b){b.preventDefault(),a(this).parent("li").toggleClass("active").children("ul").collapse("toggle"),c&&a(this).parent("li").siblings().removeClass("active").children("ul.in").collapse("hide")})},isIE:function(){for(var a,b=3,d=c.createElement("div"),e=d.getElementsByTagName("i");d.innerHTML="<!--[if gt IE "+ ++b+"]><i></i><![endif]-->",e[0];)return b>4?b:a}},a.fn[e]=function(b){return this.each(function(){a.data(this,"plugin_"+e)||a.data(this,"plugin_"+e,new d(this,b))})}}(jQuery,window,document); */
!function(a,b,c){function d(b,c){this.element=b,this.settings=a.extend({},f,c),this._defaults=f,this._name=e,this.init()}var e="metisMenu",f={toggle:!0};d.prototype={init:function(){var b=a(this.element),c=this.settings.toggle;this.isIE()<=9?(b.find("li.active").has("ul").children("ul").collapse("show"),b.find("li").not(".active").has("ul").children("ul").collapse("hide")):(b.find("li.active").has("ul").children("ul").addClass("collapse in"),b.find("li").not(".active").has("ul").children("ul").addClass("collapse")),b.find("li").has("ul").children("a").on("click",function(b){b.preventDefault(),a(this).parent("li").toggleClass("active").children("ul").collapse("toggle"),c&&a(this).parent("li").siblings().removeClass("active").children("ul.in").collapse("hide")})},isIE:function(){for(var a,b=3,d=c.createElement("div"),e=d.getElementsByTagName("i");d.innerHTML="<!--[if gt IE "+ ++b+"]><i></i><![endif]-->",e[0];)return b>4?b:a}},a.fn[e]=function(b){return this.each(function(){a.data(this,"plugin_"+e)||a.data(this,"plugin_"+e,new d(this,b))})}}(jQuery,window,document);
$(function() {
$(function() {
$('#side-menu').metisMenu();
$('#side-menu').metisMenu();
});
});
//Loads the correct sidebar on window load,
//collapses the sidebar on window resize. //Loads the correct sidebar on window load,
// Sets the min-height of #page-wrapper to window size //collapses the sidebar on window resize.
$(function() { // Sets the min-height of #page-wrapper to window size
$(window).bind("load resize", function() { $(function() {
topOffset = 50; $(window).bind("load resize", function() {
width = (this.window.innerWidth > 0) ? this.window.innerWidth : this.screen.width; topOffset = 50;
if (width < 768) { width = (this.window.innerWidth > 0) ? this.window.innerWidth : this.screen.width;
$('div.navbar-collapse').addClass('collapse') if (width < 768) {
topOffset = 100; // 2-row-menu $('div.navbar-collapse').addClass('collapse')
} else { topOffset = 100; // 2-row-menu
$('div.navbar-collapse').removeClass('collapse') } else {
} $('div.navbar-collapse').removeClass('collapse')
}
height = (this.window.innerHeight > 0) ? this.window.innerHeight : this.screen.height;
height = height - topOffset; height = (this.window.innerHeight > 0) ? this.window.innerHeight : this.screen.height;
if (height < 1) height = 1; height = height - topOffset;
if (height > topOffset) { if (height < 1) height = 1;
$("#page-wrapper").css("min-height", (height) + "px"); if (height > topOffset) {
} $("#page-wrapper").css("min-height", (height) + "px");
}) }
}); })
</script> });
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script> </script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.0/js/bootstrap.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
</body> <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.0/js/bootstrap.min.js"></script>
</body>
</html> </html>

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))