diff --git a/doc/README.html b/doc/README.html index 28197b9b9..583ba0679 100644 --- a/doc/README.html +++ b/doc/README.html @@ -317,6 +317,17 @@ interpreter to be installed on the operating system. option to update it to the latest stable version available on its SourceForge File List page.

+

You can also checkout the source code from the sqlmap +Subversion +repository to give a try to the development release:

+

+

+
+$ svn checkout https://svn.sqlmap.org/sqlmap/trunk/sqlmap sqlmap-dev
+
+
+

+

4. License and copyright

diff --git a/doc/README.pdf b/doc/README.pdf index 4573c5478..d99406f46 100644 Binary files a/doc/README.pdf and b/doc/README.pdf differ diff --git a/doc/README.sgml b/doc/README.sgml index 688f56b50..ee2494a18 100644 --- a/doc/README.sgml +++ b/doc/README.sgml @@ -280,6 +280,15 @@ option to update it to the latest stable version available on its . +

+You can also checkout the source code from the sqlmap + +repository to give a try to the development release: + + +$ svn checkout https://svn.sqlmap.org/sqlmap/trunk/sqlmap sqlmap-dev + + License and copyright diff --git a/doc/THANKS b/doc/THANKS index 91a78b019..8fc8d1164 100644 --- a/doc/THANKS +++ b/doc/THANKS @@ -51,6 +51,9 @@ Will Holcomb Luke Jahnke for reporting a bug when running against MySQL < 5.0 +Nico Leidecker + for providing with feedback on a few features + Pavol Luptak for reporting a bug when injecting on a POST data parameter diff --git a/lib/parse/headers.py b/lib/parse/headers.py index 524d453b8..5637ef17e 100644 --- a/lib/parse/headers.py +++ b/lib/parse/headers.py @@ -41,28 +41,30 @@ def headersParser(headers): and the web application technology """ + # It is enough to parse the headers on first four HTTP responses if kb.headersCount > 3: return kb.headersCount += 1 - # TODO: ahead here topHeaders = { - #"cookie": "%s/cookie.xml" % paths.SQLMAP_XML_BANNER_PATH, - #"microsoftsharepointteamservices": "%s/microsoftsharepointteamservices.xml" % paths.SQLMAP_XML_BANNER_PATH, + "cookie": "%s/cookie.xml" % paths.SQLMAP_XML_BANNER_PATH, + "microsoftsharepointteamservices": "%s/sharepoint.xml" % paths.SQLMAP_XML_BANNER_PATH, "server": "%s/server.xml" % paths.SQLMAP_XML_BANNER_PATH, - #"servlet-engine": "%s/servlet-engine.xml" % paths.SQLMAP_XML_BANNER_PATH, - #"set-cookie": "%s/cookie.xml" % paths.SQLMAP_XML_BANNER_PATH, - #"www-authenticate": "%s/www-authenticate.xml" % paths.SQLMAP_XML_BANNER_PATH, - #"x-aspnet-version": "%s/x-aspnet-version.xml" % paths.SQLMAP_XML_BANNER_PATH, + "servlet-engine": "%s/servlet.xml" % paths.SQLMAP_XML_BANNER_PATH, + "set-cookie": "%s/cookie.xml" % paths.SQLMAP_XML_BANNER_PATH, + "x-aspnet-version": "%s/x-aspnet-version.xml" % paths.SQLMAP_XML_BANNER_PATH, "x-powered-by": "%s/x-powered-by.xml" % paths.SQLMAP_XML_BANNER_PATH, } for header in headers: if header in topHeaders.keys(): - value = headers[header] + value = headers[header] xmlfile = topHeaders[header] + checkFile(xmlfile) + handler = FingerprintHandler(value, kb.headersFp) + parse(xmlfile, handler) parse(paths.GENERIC_XML, handler) diff --git a/xml/banner/cookie.xml b/xml/banner/cookie.xml new file mode 100644 index 000000000..b8acfa0a9 --- /dev/null +++ b/xml/banner/cookie.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xml/banner/generic.xml b/xml/banner/generic.xml index 475786e28..0c358b36d 100644 --- a/xml/banner/generic.xml +++ b/xml/banner/generic.xml @@ -2,6 +2,7 @@ + @@ -39,6 +40,7 @@ + @@ -88,6 +90,7 @@ + diff --git a/xml/banner/server.xml b/xml/banner/server.xml index 5be3dd14d..092ca29fa 100644 --- a/xml/banner/server.xml +++ b/xml/banner/server.xml @@ -1,7 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -29,270 +66,236 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - + - + - + - + - + - + - + - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -366,4 +369,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xml/banner/servlet.xml b/xml/banner/servlet.xml new file mode 100644 index 000000000..75106859d --- /dev/null +++ b/xml/banner/servlet.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/xml/banner/sharepoint.xml b/xml/banner/sharepoint.xml new file mode 100644 index 000000000..fe3f7b7b1 --- /dev/null +++ b/xml/banner/sharepoint.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/xml/banner/x-aspnet-version.xml b/xml/banner/x-aspnet-version.xml new file mode 100644 index 000000000..5cabdc4ce --- /dev/null +++ b/xml/banner/x-aspnet-version.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/xml/banner/x-powered-by.xml b/xml/banner/x-powered-by.xml index 3afbf20d1..0ca885459 100644 --- a/xml/banner/x-powered-by.xml +++ b/xml/banner/x-powered-by.xml @@ -1,5 +1,7 @@ + + @@ -9,7 +11,7 @@ - + @@ -17,7 +19,11 @@ - + + + + +