Finishing implementation for an Issue #58

stamparm · stamparm · commit 23f2c5f1662e · 2013-08-20T19:35:49.000+02:00
diff --git a/lib/core/common.py b/lib/core/common.py
@@ -2246,9 +2246,6 @@ def logHTTPTraffic(requestLogMsg, responseLogMsg):
 def getPageTemplate(payload, place):  # Cross-linked function
     raise NotImplementedError
 
-def setHTTPProxy():  # Cross-linked function
-    raise NotImplementedError
-
 def getPublicTypeMembers(type_, onlyValues=False):
     """
     Useful for getting members from types (e.g. in enums)
diff --git a/lib/core/option.py b/lib/core/option.py
@@ -22,6 +22,7 @@
 import lib.core.common
 import lib.core.threads
 import lib.core.convert
+import lib.request.connect
 
 from lib.controller.checks import checkConnection
 from lib.core.common import Backend
@@ -985,6 +986,9 @@ def _setHTTPProxy():
         if conf.proxyList:
             conf.proxy = conf.proxyList[0]
             conf.proxyList = conf.proxyList[1:] + conf.proxyList[:1]
+
+            infoMsg = "loading proxy '%s' from a supplied proxy list file" % conf.proxy
+            logger.info(infoMsg)
         else:
             if conf.hostname in ('localhost', '127.0.0.1') or conf.ignoreProxy:
                 proxyHandler.proxies = {}
@@ -2172,8 +2176,8 @@ def _basicOptionValidation():
 def _resolveCrossReferences():
     lib.core.threads.readInput = readInput
     lib.core.common.getPageTemplate = getPageTemplate
-    lib.core.common.setHTTPProxy = _setHTTPProxy
     lib.core.convert.singleTimeWarnMessage = singleTimeWarnMessage
+    lib.request.connect.setHTTPProxy = _setHTTPProxy
 
 def initOptions(inputOptions=AttribDict(), overrideOptions=False):
     if not inputOptions.disableColoring:
diff --git a/lib/request/connect.py b/lib/request/connect.py
@@ -37,7 +37,6 @@
 from lib.core.common import randomStr
 from lib.core.common import readInput
 from lib.core.common import removeReflectiveValues
-from lib.core.common import setHTTPProxy
 from lib.core.common import singleTimeLogMessage
 from lib.core.common import singleTimeWarnMessage
 from lib.core.common import stdev
@@ -112,8 +111,7 @@ def _retryProxy(**kwargs):
             warnMsg = "changing proxy"
             logger.warn(warnMsg)
 
-            conf.proxy = conf.proxyList[0]
-            conf.proxyList = conf.proxyList[1:] + conf.proxyList[:1]
+            conf.proxy = None
             setHTTPProxy()
 
         if kb.testMode and kb.previousMethod == PAYLOAD.METHOD.TIME:
@@ -900,3 +898,6 @@ def _randomizeParameter(paramString, randomParameter):
             return comparison(page, headers, code, getRatioValue=False, pageLength=pageLength), comparison(page, headers, code, getRatioValue=True, pageLength=pageLength)
         else:
             return comparison(page, headers, code, getRatioValue, pageLength)
+
+def setHTTPProxy():  # Cross-linked function
+    raise NotImplementedError
