From 44f6951dfeed4bd5a64e10550d836da308f7d4bc Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Tue, 10 Apr 2018 11:35:39 +0200
Subject: [PATCH] Update of xml/banner files

---
 lib/core/settings.py      |  2 +-
 lib/parse/headers.py      |  2 +-
 txt/checksum.md5          | 14 +++++-----
 xml/banner/generic.xml    |  4 +++
 xml/banner/mysql.xml      | 16 +++++++++++
 xml/banner/postgresql.xml |  9 -------
 xml/banner/server.xml     | 56 ++++++++++++++++++++++++++++++++++++---
 xml/banner/set-cookie.xml |  2 +-
 8 files changed, 83 insertions(+), 22 deletions(-)

diff --git a/lib/core/settings.py b/lib/core/settings.py
index 70b9fba45..746705d3f 100644
--- a/lib/core/settings.py
+++ b/lib/core/settings.py
@@ -19,7 +19,7 @@ from lib.core.enums import DBMS_DIRECTORY_NAME
 from lib.core.enums import OS
 
 # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.2.4.9"
+VERSION = "1.2.4.10"
 TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
 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)
diff --git a/lib/parse/headers.py b/lib/parse/headers.py
index 83cd7e890..1b3c225f3 100644
--- a/lib/parse/headers.py
+++ b/lib/parse/headers.py
@@ -31,7 +31,7 @@ def headersParser(headers):
             "x-powered-by": os.path.join(paths.SQLMAP_XML_BANNER_PATH, "x-powered-by.xml"),
         }
 
-    for header in itertools.ifilter(lambda x: x in kb.headerPaths, headers):
+    for header in itertools.ifilter(lambda _: _ in kb.headerPaths, headers):
         value = headers[header]
         xmlfile = kb.headerPaths[header]
         handler = FingerprintHandler(value, kb.headersFp)
diff --git a/txt/checksum.md5 b/txt/checksum.md5
index 3af4187b6..abe940bc4 100644
--- a/txt/checksum.md5
+++ b/txt/checksum.md5
@@ -46,7 +46,7 @@ c9a56e58984420a5abb7a3f7aadc196d  lib/core/optiondict.py
 0c3eef46bdbf87e29a3f95f90240d192  lib/core/replication.py
 a7db43859b61569b601b97f187dd31c5  lib/core/revision.py
 fcb74fcc9577523524659ec49e2e964b  lib/core/session.py
-3ae3e12c5183d4468fbeb1cb6f4e231c  lib/core/settings.py
+416a9d32cc0b6ee6281e0ec062a4d169  lib/core/settings.py
 0dfc2ed40adf72e302291f6ecd4406f6  lib/core/shell.py
 a7edc9250d13af36ac0108f259859c19  lib/core/subprocessng.py
 a35efa7bec9f1e6cedf17c9830a79241  lib/core/target.py
@@ -60,7 +60,7 @@ e772deb63270375e685fa5a7b775c382  lib/core/wordlist.py
 f667710f17b8447358ee7508a9d2faf1  lib/parse/cmdline.py
 fb2e2f05dde98caeac6ccf3e67192177  lib/parse/configfile.py
 3794ff139869f5ae8e81cfdbe5714f56  lib/parse/handler.py
-8d7321a1bc1a26ac55b2398bf445d78f  lib/parse/headers.py
+aaad2a0d80f05eaebe52c71519b3dfc7  lib/parse/headers.py
 33f21b11b7963062df8fa2292229df80  lib/parse/html.py
 1e5532ede194ac9c083891c2f02bca93  lib/parse/__init__.py
 ec4e56bbb1349176b2a22e0b99ba6a55  lib/parse/payloads.py
@@ -450,14 +450,14 @@ a687449cd4e45f69e33b13d41e021480  waf/uspses.py
 68e332530fab216d017ede506c3fec2f  waf/yundun.py
 bea35ba732ccc9548e6c4023cea6832b  waf/yunsuo.py
 705ac8663513c12150cb5623ef4a04fb  waf/zenedge.py
-e87d59af23b7b18cd56c9883e5f02d5c  xml/banner/generic.xml
+dc394c5b90ada0a5d5853b5ad1f7d56d  xml/banner/generic.xml
 d8925c034263bf1b83e7d8e1c78eec57  xml/banner/mssql.xml
-b8b56f4aa34bf65365808919b97119a7  xml/banner/mysql.xml
+7b21aeb3ad66d7686eacd23a6346292c  xml/banner/mysql.xml
 9b262a617b06af56b1267987d694bf6f  xml/banner/oracle.xml
-d90fe5a47b95dff3eb1797764c9db6c5  xml/banner/postgresql.xml
-b07b5c47c751787e136650ded060197f  xml/banner/server.xml
+c26cd4fa986ddc9f6d92dd87c8fc61cb  xml/banner/postgresql.xml
+4970709ca31bcaea5eb79547a132606a  xml/banner/server.xml
 d48c971769c6131e35bd52d2315a8d58  xml/banner/servlet-engine.xml
-2d53fdaca0d7b42edad5192661248d76  xml/banner/set-cookie.xml
+58be20a3b29a9108d043786907700469  xml/banner/set-cookie.xml
 d989813ee377252bca2103cea524c06b  xml/banner/sharepoint.xml
 350605448f049cd982554123a75f11e1  xml/banner/x-aspnet-version.xml
 817078783e1edaa492773d3b34d8eef0  xml/banner/x-powered-by.xml
diff --git a/xml/banner/generic.xml b/xml/banner/generic.xml
index eb97b1d88..27e8bdd86 100644
--- a/xml/banner/generic.xml
+++ b/xml/banner/generic.xml
@@ -27,6 +27,10 @@
         <info sp="4"/>
     </regexp>
 
+    <regexp value="Service Pack 5">
+        <info sp="5"/>
+    </regexp>
+
     <!-- Reference: https://msdn.microsoft.com/en-us/library/windows/desktop/ms724832%28v=vs.85%29.aspx -->
 
     <regexp value="Windows.*10\.0">
diff --git a/xml/banner/mysql.xml b/xml/banner/mysql.xml
index 5ac157302..b637ebb92 100644
--- a/xml/banner/mysql.xml
+++ b/xml/banner/mysql.xml
@@ -35,6 +35,22 @@
         <info dbms_version="1" type="Linux" distrib="Debian" release="6.0" codename="squeeze"/>
     </regexp>
 
+    <regexp value="^([\d\.]+)[\-\_]Debian[\-\_][\d\.]+wheezy">
+        <info dbms_version="1" type="Linux" distrib="Debian" release="7.0" codename="wheezy"/>
+    </regexp>
+
+    <regexp value="^([\d\.]+)[\-\_]Debian[\-\_][\d\.]+jessie">
+        <info dbms_version="1" type="Linux" distrib="Debian" release="8.0" codename="jessie"/>
+    </regexp>
+
+    <regexp value="^([\d\.]+)[\-\_]Debian[\-\_][\d\.]+stretch">
+        <info dbms_version="1" type="Linux" distrib="Debian" release="9.0" codename="stretch"/>
+    </regexp>
+
+    <regexp value="^([\d\.]+)[\-\_]Debian[\-\_][\d\.]+buster">
+        <info dbms_version="1" type="Linux" distrib="Debian" release="10.0" codename="buster"/>
+    </regexp>
+
     <regexp value="^([\d\.]+)[\-\_]Debian[\-\_][\d\.]+(sid|unstable)">
         <info dbms_version="1" type="Linux" distrib="Debian" codename="unstable"/>
     </regexp>
diff --git a/xml/banner/postgresql.xml b/xml/banner/postgresql.xml
index 4c64844d7..7f03e8e8c 100644
--- a/xml/banner/postgresql.xml
+++ b/xml/banner/postgresql.xml
@@ -13,13 +13,4 @@
     <regexp value="mingw([\d]+)">
         <info type="Windows"/>
     </regexp>
-
-    <!-- Ubuntu -->
-    <regexp value="PostgreSQL\s+(8\.2\.7)\s+on.*?\(Ubuntu 4\.2\.3-2ubuntu4\)">
-        <info dbms_version="1" type="Linux" distrib="Ubuntu" release="8.04" codename="Hardy Heron"/>
-    </regexp>
-
-    <regexp value="PostgreSQL\s+(8\.3\.5)\s+on.*?\(Ubuntu 4\.3\.2-1ubuntu11\)">
-        <info dbms_version="1" type="Linux" distrib="Ubuntu" release="8.10" codename="Intrepid Ibex"/>
-    </regexp>
 </root>
diff --git a/xml/banner/server.xml b/xml/banner/server.xml
index 48f0ab158..737a13f14 100644
--- a/xml/banner/server.xml
+++ b/xml/banner/server.xml
@@ -89,6 +89,10 @@
         <info type="Linux" distrib="CentOS" release="6.8"/>
     </regexp>
 
+    <regexp value="Apache/2\.4\.6 \(CentOS\)">
+        <info type="Linux" distrib="CentOS" release="7-1708"/>
+    </regexp>
+
     <!-- Apache: Debian -->
 
     <regexp value="Apache/1\.0\.5 \(Unix\) Debian/GNU">
@@ -155,8 +159,8 @@
         <info type="Linux" distrib="Debian" release="8.0" codename="jessie"/>
     </regexp>
 
-    <regexp value="Apache/2\.4\.18 \(Debian\)">
-        <info type="Linux" distrib="Debian" release="9.0" codename="jessie (testing)"/>
+    <regexp value="Apache/2\.4\.25 \(Debian\)">
+        <info type="Linux" distrib="Debian" release="9.0" codename="stretch"/>
     </regexp>
 
     <!-- Apache: Fedora -->
@@ -273,6 +277,22 @@
         <info type="Linux" distrib="Fedora" release="23"/>
     </regexp>
 
+    <regexp value="Apache/2\.4\.18 \(Fedora\)">
+        <info type="Linux" distrib="Fedora" release="24"/>
+    </regexp>
+
+    <regexp value="Apache/2\.4\.23 \(Fedora\)">
+        <info type="Linux" distrib="Fedora" release="25"/>
+    </regexp>
+
+    <regexp value="Apache/2\.4\.25 \(Fedora\)">
+        <info type="Linux" distrib="Fedora" release="26"/>
+    </regexp>
+
+    <regexp value="Apache/2\.4\.28 \(Fedora\)">
+        <info type="Linux" distrib="Fedora" release="27"/>
+    </regexp>
+
     <!-- Apache: FreeBSD -->
 
     <regexp value="Apache/2\.0\.16 \(FreeBSD\)">
@@ -379,6 +399,14 @@
         <info type="FreeBSD" release="10.3"/>
     </regexp>
 
+    <regexp value="Apache/2\.4\.27 \(FreeBSD\)">
+        <info type="FreeBSD" release="10.4"/>
+    </regexp>
+
+    <regexp value="Apache/2\.4\.26 \(FreeBSD\)">
+        <info type="FreeBSD" release="11.1"/>
+    </regexp>
+
     <!-- Apache: Mandrake / Mandriva -->
 
     <regexp value="Apache/1\.3\.6 \(Unix\)\s+\(Mandrake/Linux\)">
@@ -678,6 +706,14 @@
         <info type="Linux" distrib="SuSE" release="13.2"/>
     </regexp>
 
+    <regexp value="Apache/2\.4\.16 \(Linux/SuSE\)">
+        <info type="Linux" distrib="SuSE" release="42.1"/>
+    </regexp>
+
+    <regexp value="Apache/2\.4\.23 \(Linux/SuSE\)">
+        <info type="Linux" distrib="SuSE" release="42.2|42.3"/>
+    </regexp>
+
     <!-- Apache: Ubuntu -->
 
     <regexp value="Apache/2\.0\.50 \(Ubuntu\)">
@@ -753,7 +789,15 @@
     </regexp>
 
     <regexp value="Apache/2\.4\.18 \(Ubuntu\)">
-        <info type="Linux" distrib="Ubuntu" release="16.04" codename="xenial"/>
+        <info type="Linux" distrib="Ubuntu" release="16.04|16.10" codename="xenial|yakkety"/>
+    </regexp>
+
+    <regexp value="Apache/2\.4\.25 \(Ubuntu\)">
+        <info type="Linux" distrib="Ubuntu" release="17.04" codename="zesty"/>
+    </regexp>
+
+    <regexp value="Apache/2\.4\.27 \(Ubuntu\)">
+        <info type="Linux" distrib="Ubuntu" release="17.10" codename="artful"/>
     </regexp>
 
     <!-- Nginx -->
@@ -761,4 +805,10 @@
     <regexp value="nginx/([\w\.]+)">
         <info technology="Nginx"/>
     </regexp>
+
+    <!-- Google Web Server -->
+
+    <regexp value="GWS/([\w\.]+)">
+        <info technology="Google Web Server"/>
+    </regexp>
 </root>
diff --git a/xml/banner/set-cookie.xml b/xml/banner/set-cookie.xml
index c9e34d2ce..4e85296b8 100644
--- a/xml/banner/set-cookie.xml
+++ b/xml/banner/set-cookie.xml
@@ -11,7 +11,7 @@
         <info technology="ASP" type="Windows"/>
     </regexp>
 
-    <regexp value="ASP\.NET_SessionId">
+    <regexp value="ASP\.NET_SessionId|\.ASPXAUTH">
         <info technology="ASP.NET" type="Windows"/>
     </regexp>