Patch for an Issue #246

stamparm · stamparm · commit a52dbc575b9c · 2012-11-13T10:21:11.000+01:00
diff --git a/lib/controller/controller.py b/lib/controller/controller.py
@@ -300,7 +300,7 @@ def start():
                 if conf.cookie:
                     message += "\nCookie: %s" % conf.cookie
 
-                if conf.data:
+                if conf.data is not None:
                     message += "\nPOST data: %s" % urlencode(conf.data) if conf.data else ""
 
                 if conf.forms:
diff --git a/lib/core/option.py b/lib/core/option.py
@@ -1110,7 +1110,7 @@ def __setHTTPMethod():
     Check and set the HTTP method to perform HTTP requests through.
     """
 
-    conf.method = HTTPMETHOD.POST if conf.data else HTTPMETHOD.GET
+    conf.method = HTTPMETHOD.POST if conf.data is not None else HTTPMETHOD.GET
 
     debugMsg = "setting the HTTP method to %s" % conf.method
     logger.debug(debugMsg)
diff --git a/lib/core/target.py b/lib/core/target.py
@@ -80,11 +80,11 @@ def __setRequestParams():
             testableParameters = True
 
     # Perform checks on POST parameters
-    if conf.method == HTTPMETHOD.POST and not conf.data:
+    if conf.method == HTTPMETHOD.POST and conf.data is None:
         errMsg = "HTTP POST method depends on HTTP data value to be posted"
         raise sqlmapSyntaxException, errMsg
 
-    if conf.data:
+    if conf.data is not None:
         conf.method = HTTPMETHOD.POST
 
         if CUSTOM_INJECTION_MARK_CHAR in conf.data:  # later processed
diff --git a/lib/request/connect.py b/lib/request/connect.py
@@ -210,7 +210,7 @@ def getPage(**kwargs):
         page = None
 
         _ = urlparse.urlsplit(url)
-        requestMsg = u"HTTP request [#%d]:\n%s " % (threadData.lastRequestUID, method or (HTTPMETHOD.POST if post else HTTPMETHOD.GET))
+        requestMsg = u"HTTP request [#%d]:\n%s " % (threadData.lastRequestUID, method or (HTTPMETHOD.POST if post is not None else HTTPMETHOD.GET))
         requestMsg += ("%s%s" % (_.path or "/", ("?%s" % _.query) if _.query else "")) if not any((refreshing, crawling)) else url
         responseMsg = u"HTTP response "
         requestHeaders = u""
@@ -291,7 +291,7 @@ def getPage(**kwargs):
             headers[HTTPHEADER.ACCEPT_ENCODING] = HTTP_ACCEPT_ENCODING_HEADER_VALUE if method != HTTPMETHOD.HEAD and kb.pageCompress else "identity"
             headers[HTTPHEADER.HOST] = host or getHostHeader(url)
 
-            if post and HTTPHEADER.CONTENT_TYPE not in headers:
+            if post is not None and HTTPHEADER.CONTENT_TYPE not in headers:
                 headers[HTTPHEADER.CONTENT_TYPE] = POST_HINT_CONTENT_TYPES.get(kb.postHint, DEFAULT_CONTENT_TYPE)
 
             if headers.get(HTTPHEADER.CONTENT_TYPE) == POST_HINT_CONTENT_TYPES[POST_HINT.MULTIPART]:
@@ -326,7 +326,7 @@ def getPage(**kwargs):
                 cookies = conf.cj._cookies_for_request(req)
                 requestHeaders += "\n%s" % ("Cookie: %s" % ";".join("%s=%s" % (getUnicode(cookie.name), getUnicode(cookie.value)) for cookie in cookies))
 
-            if post:
+            if post is not None:
                 if not getRequestHeader(req, HTTPHEADER.CONTENT_LENGTH):
                     requestHeaders += "\n%s: %d" % (string.capwords(HTTPHEADER.CONTENT_LENGTH), len(post))
 
@@ -335,7 +335,7 @@ def getPage(**kwargs):
 
             requestMsg += "\n%s" % requestHeaders
 
-            if post:
+            if post is not None:
                 requestMsg += "\n\n%s" % getUnicode(post)
 
             requestMsg += "\n"
@@ -689,13 +689,13 @@ def _randomizeParameter(paramString, randomParameter):
                             get = re.sub("((\A|\W)%s=)([^%s]+)" % (name, delimiter), "\g<1>%s" % value, get)
                         elif '%s=' % name in (post or ""):
                             post = re.sub("((\A|\W)%s=)([^%s]+)" % (name, delimiter), "\g<1>%s" % value, post)
-                        elif post:
+                        elif post is not None:
                             post += "%s%s=%s" % (delimiter, name, value)
                         else:
                             get += "%s%s=%s" % (delimiter, name, value)
 
         get = urlencode(get, limit=True)
-        if post:
+        if post is not None:
             if place not in (PLACE.POST, PLACE.CUSTOM_POST) and hasattr(post, UNENCODED_ORIGINAL_VALUE):
                 post = getattr(post, UNENCODED_ORIGINAL_VALUE)
             elif not skipUrlEncode and kb.postHint not in POST_HINT_CONTENT_TYPES.keys():
