minor update (optimization) regarding -a switch

stamparm · stamparm · commit 8d93bdfa4b95 · 2010-11-07T08:11:56.000Z
diff --git a/lib/core/option.py b/lib/core/option.py
@@ -31,6 +31,7 @@
 from lib.core.common import parseTargetUrl
 from lib.core.common import paths
 from lib.core.common import randomRange
+from lib.core.common import readCachedFileContent
 from lib.core.common import readInput
 from lib.core.common import runningAsAdmin
 from lib.core.common import sanitizeStr
@@ -835,7 +836,6 @@ def __setHTTPUserAgent():
         * A random value read from a list of User-Agent headers from a
           file choosed as user option
     """
-
     if conf.agent:
         debugMsg = "setting the HTTP User-Agent header"
         logger.debug(debugMsg)
@@ -856,39 +856,28 @@ def __setHTTPUserAgent():
 
         return
 
-    debugMsg  = "fetching random HTTP User-Agent header from "
-    debugMsg += "file '%s'" % conf.userAgentsFile
-    logger.debug(debugMsg)
-
-    try:
-        fd = codecs.open(conf.userAgentsFile, "r", conf.dataEncoding)
-    except IOError:
-        warnMsg  = "unable to read HTTP User-Agent header "
-        warnMsg += "file '%s'" % conf.userAgentsFile
-        logger.warn(warnMsg)
-
-        conf.httpHeaders.append(("User-Agent", __defaultHTTPUserAgent()))
-
-        return
-
-    __count = 0
-    __userAgents = []
+    if not kb.userAgents:
+        debugMsg  = "loading random HTTP User-Agent header(s) from "
+        debugMsg += "file '%s'" % conf.userAgentsFile
+        logger.debug(debugMsg)
 
-    while True:
-        line = fd.readline()
+        try:
+            kb.userAgents = getFileItems(conf.userAgentsFile)
+        except IOError:
+            warnMsg  = "unable to read HTTP User-Agent header "
+            warnMsg += "file '%s'" % conf.userAgentsFile
+            logger.warn(warnMsg)
 
-        if not line:
-            break
+            conf.httpHeaders.append(("User-Agent", __defaultHTTPUserAgent()))
 
-        __userAgents.append(line)
-        __count += 1
+            return
 
-    fd.close()
+    __count = len(kb.userAgents)
 
     if __count == 1:
-        __userAgent = __userAgents[0]
+        __userAgent = kb.userAgents[0]
     else:
-        __userAgent = __userAgents[randomRange(stop=__count)]
+        __userAgent = kb.userAgents[randomRange(stop=__count)]
 
     __userAgent = sanitizeStr(__userAgent)
     conf.httpHeaders.append(("User-Agent", __userAgent))
@@ -1114,6 +1103,7 @@ def __setKnowledgeBaseAttributes():
     kb.unionPosition   = None
     kb.unionNegative   = False
     kb.unionFalseCond  = False
+    kb.userAgents      = None
     kb.valueStack      = []
 
 def __saveCmdline():
diff --git a/txt/user-agents.txt b/txt/user-agents.txt
@@ -1,3 +1,6 @@
+# Copyright (c) 2006-2010 sqlmap developers (http://sqlmap.sourceforge.net/)
+# See the file 'doc/COPYING' for copying permission
+
 Accoona-AI-Agent/1.1.2 (aicrawler at accoonabot dot com)
 Baiduspider ( http://www.baidu.com/search/spider.htm)
 curl/7.13.1 (powerpc-apple-darwin8.0) libcurl/7.13.1 OpenSSL/0.9.7b zlib/1.2.2
