Minor bug fix to --cookie-urlencode

bdamele · bdamele · commit 505647b00fb5 · 2010-01-15T11:24:30.000Z
diff --git a/lib/core/agent.py b/lib/core/agent.py
@@ -26,7 +26,6 @@
 
 from lib.core.common import randomInt
 from lib.core.common import randomStr
-from lib.core.convert import urlencode
 from lib.core.data import conf
 from lib.core.data import kb
 from lib.core.data import queries
@@ -79,11 +78,6 @@ def payload(self, place=None, parameter=None, value=None, newValue=None, negativ
             retValue = paramString.replace("%s=%s" % (parameter, value),
                                            "%s=%s" % (parameter, newValue))
         
-        if conf.cookieUrlencode and (kb.injPlace == "Cookie" or place == "Cookie"):
-            name = retValue[:retValue.find('=')]
-            value = retValue[retValue.find('=') + 1:]
-            retValue = "%s=%s" % (name, urlencode(value, convall=True))
-            
         return retValue
 
     def fullPayload(self, query):
diff --git a/lib/request/basic.py b/lib/request/basic.py
@@ -28,9 +28,10 @@
 import StringIO
 import zlib
 
+from lib.core.common import directoryPath
+from lib.core.common import sanitizeCookie
 from lib.core.data import conf
 from lib.core.data import kb
-from lib.core.common import directoryPath
 from lib.parse.headers import headersParser
 from lib.parse.html import htmlParser
 
@@ -44,6 +45,9 @@ def forgeHeaders(cookie, ua):
 
     for header, value in conf.httpHeaders:
         if cookie and header == "Cookie":
+            if conf.cookieUrlencode:
+                cookie = sanitizeCookie(cookie)
+
             headers[header] = cookie
         elif ua and header == "User-Agent":
             headers[header] = ua
