From ed5f4abebd00a71f36cd366d978c100d4219fde1 Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Tue, 2 Oct 2018 14:56:20 +0200
Subject: [PATCH] Minor updates

---
 lib/core/settings.py        |  2 +-
 txt/checksum.md5            |  8 ++++----
 xml/banner/generic.xml      | 22 +++++++++++-----------
 xml/banner/set-cookie.xml   | 22 +++++++++++++++++++---
 xml/banner/x-powered-by.xml | 18 +++++++++++++++++-
 5 files changed, 52 insertions(+), 20 deletions(-)

diff --git a/lib/core/settings.py b/lib/core/settings.py
index 141b35603..613135d4f 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.10.3"
+VERSION = "1.2.10.4"
 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/txt/checksum.md5 b/txt/checksum.md5
index 95a547ffb..17a56a063 100644
--- a/txt/checksum.md5
+++ b/txt/checksum.md5
@@ -49,7 +49,7 @@ c8c386d644d57c659d74542f5f57f632  lib/core/patch.py
 0c3eef46bdbf87e29a3f95f90240d192  lib/core/replication.py
 a7db43859b61569b601b97f187dd31c5  lib/core/revision.py
 fcb74fcc9577523524659ec49e2e964b  lib/core/session.py
-2f0cd79e7e10a6e137f4748a589c4c0b  lib/core/settings.py
+40d7d26b71f11cbc128a0ef7c67e2da0  lib/core/settings.py
 dd68a9d02fccb4fa1428b20e15b0db5d  lib/core/shell.py
 a7edc9250d13af36ac0108f259859c19  lib/core/subprocessng.py
 62bc180e3e828949ffb342a8f756c183  lib/core/target.py
@@ -457,17 +457,17 @@ a687449cd4e45f69e33b13d41e021480  waf/uspses.py
 68e332530fab216d017ede506c3fec2f  waf/yundun.py
 bea35ba732ccc9548e6c4023cea6832b  waf/yunsuo.py
 47f8f6623841232a93c5229d6c1bebfe  waf/zenedge.py
-dc394c5b90ada0a5d5853b5ad1f7d56d  xml/banner/generic.xml
+e68f399aeaa5b516f043af88dd4871a0  xml/banner/generic.xml
 d8925c034263bf1b83e7d8e1c78eec57  xml/banner/mssql.xml
 7b21aeb3ad66d7686eacd23a6346292c  xml/banner/mysql.xml
 9b262a617b06af56b1267987d694bf6f  xml/banner/oracle.xml
 c26cd4fa986ddc9f6d92dd87c8fc61cb  xml/banner/postgresql.xml
 4970709ca31bcaea5eb79547a132606a  xml/banner/server.xml
 d48c971769c6131e35bd52d2315a8d58  xml/banner/servlet-engine.xml
-58be20a3b29a9108d043786907700469  xml/banner/set-cookie.xml
+5fa1805d3007c68b051f2c70afcf41ed  xml/banner/set-cookie.xml
 d989813ee377252bca2103cea524c06b  xml/banner/sharepoint.xml
 350605448f049cd982554123a75f11e1  xml/banner/x-aspnet-version.xml
-817078783e1edaa492773d3b34d8eef0  xml/banner/x-powered-by.xml
+ccb5e02a692f75d11b7fd00f1db48bf5  xml/banner/x-powered-by.xml
 3059d50cf0cd17a403c17833f0bcd4df  xml/boundaries.xml
 6cffc395cd0280f5c1a84542da6642e5  xml/errors.xml
 a279656ea3fcb85c727249b02f828383  xml/livetests.xml
diff --git a/xml/banner/generic.xml b/xml/banner/generic.xml
index 27e8bdd86..6e671825f 100644
--- a/xml/banner/generic.xml
+++ b/xml/banner/generic.xml
@@ -33,47 +33,47 @@
 
     <!-- Reference: https://msdn.microsoft.com/en-us/library/windows/desktop/ms724832%28v=vs.85%29.aspx -->
 
-    <regexp value="Windows.*10\.0">
+    <regexp value="Windows.*\b10\.0">
         <info type="Windows" distrib="2016|10"/>
     </regexp>
 
-    <regexp value="Windows.*6\.3">
+    <regexp value="Windows.*\b6\.3">
         <info type="Windows" distrib="2012 R2|8.1"/>
     </regexp>
 
-    <regexp value="Windows.*6\.2">
+    <regexp value="Windows.*\b6\.2">
         <info type="Windows" distrib="2012|8"/>
     </regexp>
 
-    <regexp value="Windows.*6\.1">
+    <regexp value="Windows.*\b6\.1">
         <info type="Windows" distrib="2008 R2|7"/>
     </regexp>
 
-    <regexp value="Windows.*6\.0">
+    <regexp value="Windows.*\b6\.0">
         <info type="Windows" distrib="2008|Vista"/>
     </regexp>
 
-    <regexp value="Windows.*5\.2">
+    <regexp value="Windows.*\b5\.2">
         <info type="Windows" distrib="2003"/>
     </regexp>
 
-    <regexp value="Windows.*5\.1">
+    <regexp value="Windows.*\b5\.1">
         <info type="Windows" distrib="XP"/>
     </regexp>
 
-    <regexp value="Windows.*5\.0">
+    <regexp value="Windows.*\b5\.0">
         <info type="Windows" distrib="2000"/>
     </regexp>
 
-    <regexp value="Windows.*4\.0">
+    <regexp value="Windows.*\b4\.0">
         <info type="Windows" distrib="NT 4.0"/>
     </regexp>
 
-    <regexp value="Windows.*3\.0">
+    <regexp value="Windows.*\b3\.0">
         <info type="Windows" distrib="NT 4.0"/>
     </regexp>
 
-    <regexp value="Windows.*2\.0">
+    <regexp value="Windows.*\b2\.0">
         <info type="Windows" distrib="NT 4.0"/>
     </regexp>
 
diff --git a/xml/banner/set-cookie.xml b/xml/banner/set-cookie.xml
index 4e85296b8..fc454fcaa 100644
--- a/xml/banner/set-cookie.xml
+++ b/xml/banner/set-cookie.xml
@@ -19,19 +19,35 @@
         <info technology="JSP"/>
     </regexp>
 
+    <regexp value="JServSessionId">
+        <info technology="JServ"/>
+    </regexp>
+
+    <regexp value="Ltpatoken">
+        <info technology="WebSphere"/>
+    </regexp>
+
     <regexp value="PHPSESSION">
         <info technology="PHP"/>
     </regexp>
 
+    <regexp value="RoxenUserID">
+        <info technology="Roxen"/>
+    </regexp>
+
+    <regexp value="wiki\d+_session">
+        <info technology="MediaWiki"/>
+    </regexp>
+
     <regexp value="Apache">
         <info technology="Apache"/>
     </regexp>
 
-    <regexp value="JServSessionId">
-        <info technology="Apache|JSP"/>
+    <regexp value="DomAuthSessID">
+        <info technology="Domino|Notes"/>
     </regexp>
 
-    <regexp value="CFID|CFTOKEN|CFMAGIC">
+    <regexp value="CFID|CFTOKEN|CFMAGIC|CFGLOBALS">
         <info technology="ColdFusion"/>
     </regexp>
 </root>
diff --git a/xml/banner/x-powered-by.xml b/xml/banner/x-powered-by.xml
index 633a35e5c..64741769c 100644
--- a/xml/banner/x-powered-by.xml
+++ b/xml/banner/x-powered-by.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- Reference: http://www.http-stats.com/X-Powered-By -->
+<!-- Reference: https://publicwww.com/popular/powered/index.html -->
 
 <root>
     <regexp value="PHP[\-\_\/\ ]([\d\.]+)">
@@ -15,6 +15,22 @@
         <info technology="ASP" type="Windows"/>
     </regexp>
 
+    <regexp value="EasyEngine ([\d\.]+)">
+        <info technology="EasyEngine" tech_version="1"/>
+    </regexp>
+
+    <regexp value="PleskLin">
+        <info technology="Plesk" type="Linux"/>
+    </regexp>
+
+    <regexp value="PleskWin">
+        <info technology="Plesk" type="Windows"/>
+    </regexp>
+
+    <regexp value="ThinkPHP">
+        <info technology="ThinkPHP"/>
+    </regexp>
+
     <regexp value="ASP\.NET">
         <info technology="ASP.NET" type="Windows"/>
     </regexp>