From 78ca3711626eb37b2c9930f35482a0994352f510 Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Wed, 1 Mar 2017 10:07:26 +0100
Subject: [PATCH] Adding option --web-root (Issue #2419)

---
 lib/core/common.py     | 6 +++++-
 lib/core/optiondict.py | 1 +
 lib/core/settings.py   | 2 +-
 lib/parse/cmdline.py   | 3 +++
 sqlmap.conf            | 3 +++
 txt/checksum.md5       | 8 ++++----
 6 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/lib/core/common.py b/lib/core/common.py
index a1cd539ec..d86851384 100644
--- a/lib/core/common.py
+++ b/lib/core/common.py
@@ -730,7 +730,11 @@ def getManualDirectories():
 
     directories = normalizePath(directories)
 
-    if directories:
+    if conf.webRoot: 
+        directories = [conf.webRoot]
+        infoMsg = "using '%s' as web server document root" % conf.webRoot
+        logger.info(infoMsg)
+    elif directories:
         infoMsg = "retrieved the web server document root: '%s'" % directories
         logger.info(infoMsg)
     else:
diff --git a/lib/core/optiondict.py b/lib/core/optiondict.py
index e8bf9bfa3..19a5fdb45 100644
--- a/lib/core/optiondict.py
+++ b/lib/core/optiondict.py
@@ -229,6 +229,7 @@ optDict = {
                                "skipWaf":           "boolean",
                                "smart":             "boolean",
                                "tmpDir":            "string",
+                               "webRoot":           "string",
                                "wizard":            "boolean",
                                "verbose":           "integer",
                              },
diff --git a/lib/core/settings.py b/lib/core/settings.py
index edf6f7907..ab93afb00 100755
--- 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.1.2.21"
+VERSION = "1.1.3.0"
 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/cmdline.py b/lib/parse/cmdline.py
index 38b77f222..9fefa7a6c 100644
--- a/lib/parse/cmdline.py
+++ b/lib/parse/cmdline.py
@@ -756,6 +756,9 @@ def cmdLineParser(argv=None):
         miscellaneous.add_option("--tmp-dir", dest="tmpDir",
                                   help="Local directory for storing temporary files")
 
+        miscellaneous.add_option("--web-root", dest="webRoot",
+                                  help="Web server document root directory (e.g. \"/var/www\")")
+
         miscellaneous.add_option("--wizard", dest="wizard",
                                   action="store_true",
                                   help="Simple wizard interface for beginner users")
diff --git a/sqlmap.conf b/sqlmap.conf
index dff91fb91..a620f854a 100644
--- a/sqlmap.conf
+++ b/sqlmap.conf
@@ -790,6 +790,9 @@ smart = False
 # Local directory for storing temporary files.
 tmpDir =
 
+# Web server document root directory (e.g. "/var/www").
+webRoot =
+
 # Simple wizard interface for beginner users.
 # Valid: True or False
 wizard = False
diff --git a/txt/checksum.md5 b/txt/checksum.md5
index bafd8bc7b..6c069bc6c 100644
--- a/txt/checksum.md5
+++ b/txt/checksum.md5
@@ -26,7 +26,7 @@ dc386321e8813788f155dc557a78be8d  lib/controller/controller.py
 310efc965c862cfbd7b0da5150a5ad36  lib/controller/__init__.py
 19905ecb4437b94512cf21d5f1720091  lib/core/agent.py
 6cc95a117fbd34ef31b9aa25520f0e31  lib/core/bigarray.py
-7a8ce69bba0dc1fda2cd3bba3cbad092  lib/core/common.py
+49a5b57e69bd15a3f718e880fb7fa01f  lib/core/common.py
 5065a4242a8cccf72f91e22e1007ae63  lib/core/convert.py
 a8143dab9d3a27490f7d49b6b29ea530  lib/core/data.py
 7936d78b1a7f1f008ff92bf2f88574ba  lib/core/datatype.py
@@ -38,14 +38,14 @@ a8143dab9d3a27490f7d49b6b29ea530  lib/core/data.py
 9381a0c7e8bc19986299e84f4edda1a0  lib/core/exception.py
 310efc965c862cfbd7b0da5150a5ad36  lib/core/__init__.py
 9ba39bf66e9ecd469446bdbbeda906c3  lib/core/log.py
-5831b80df6764faf1dd9470ff589ae87  lib/core/optiondict.py
+66c9795e2e7da32f46f04497ae910070  lib/core/optiondict.py
 0324fce84ef88ed0416123f73c54a6d7  lib/core/option.py
 5f2f56e6c5f274408df61943f1e080c0  lib/core/profiling.py
 40be71cd774662a7b420caeb7051e7d5  lib/core/readlineng.py
 d8e9250f3775119df07e9070eddccd16  lib/core/replication.py
 785f86e3f963fa3798f84286a4e83ff2  lib/core/revision.py
 40c80b28b3a5819b737a5a17d4565ae9  lib/core/session.py
-b31d1e512f49ff729ea81a7052236514  lib/core/settings.py
+36001abd1286001c8d1ad41212290cba  lib/core/settings.py
 d91291997d2bd2f6028aaf371bf1d3b6  lib/core/shell.py
 2ad85c130cc5f2b3701ea85c2f6bbf20  lib/core/subprocessng.py
 afd0636d2e93c23f4f0a5c9b6023ea17  lib/core/target.py
@@ -56,7 +56,7 @@ ad74fc58fc7214802fd27067bce18dd2  lib/core/unescaper.py
 4d13ed693401a498b6d073a2a494bd83  lib/core/wordlist.py
 310efc965c862cfbd7b0da5150a5ad36  lib/__init__.py
 8c4b04062db2245d9e190b413985202a  lib/parse/banner.py
-31156d03e6f80842073cb78835d81c39  lib/parse/cmdline.py
+942e1d7cb6f777ff198358d43246c40c  lib/parse/cmdline.py
 3a31657bc38f277d0016ff6d50bde61f  lib/parse/configfile.py
 14539f1be714d4f1ed042067d63bc50a  lib/parse/handler.py
 64e5bb3ecbdd75144500588b437ba8da  lib/parse/headers.py