Minor style update

stamparm · stamparm · commit bf5544903b8a · 2013-01-09T16:10:26.000+01:00
diff --git a/lib/core/option.py b/lib/core/option.py
@@ -14,6 +14,7 @@
 import string
 import sys
 import threading
+import time
 import urllib2
 import urlparse
 
@@ -580,10 +581,16 @@ def _findPageForms():
         page, _ = Request.queryPage(content=True)
         findPageForms(page, conf.url, True, True)
     else:
-        for target in getFileItems(conf.bulkFile):
+        targets = getFileItems(conf.bulkFile)
+        for i in xrange(len(targets)):
             try:
+                target = targets[i]
                 page, _, _= Request.getPage(url=target.strip(), crawling=True, raise404=False)
                 findPageForms(page, target, False, True)
+
+                if conf.verbose in (1, 2):
+                    status = '%d/%d links visited (%d%%)' % (i + 1, len(targets), round(100.0 * (i + 1) / len(targets)))
+                    dataToStdout("\r[%s] [INFO] %s" % (time.strftime("%X"), status), True)
             except Exception, ex:
                 errMsg = "problem occured while searching for forms at '%s' ('%s')" % (target, ex)
                 logger.error(errMsg)
diff --git a/lib/core/testing.py b/lib/core/testing.py
@@ -73,7 +73,7 @@ def smokeTest():
                         retVal = False
 
             count += 1
-            status = '%d/%d (%d%s) ' % (count, length, round(100.0*count/length), '%')
+            status = '%d/%d (%d%%) ' % (count, length, round(100.0 * count / length))
             dataToStdout("\r[%s] [INFO] complete: %s" % (time.strftime("%X"), status))
 
     clearConsoleLine()
diff --git a/lib/techniques/blind/inference.py b/lib/techniques/blind/inference.py
@@ -412,7 +412,7 @@ def blindThread():
                                 if conf.verbose in (1, 2) and not showEta:
                                     _ = count - firstChar
                                     output += '_' * (min(length, conf.progressWidth) - len(output))
-                                    status = ' %d/%d (%d%s)' % (_, length, round(100.0 * _ / length), '%')
+                                    status = ' %d/%d (%d%%)' % (_, length, round(100.0 * _ / length))
                                     output += status if _ != length else " " * len(status)
 
                                     dataToStdout("\r[%s] [INFO] retrieved: %s" % (time.strftime("%X"), filterControlChars(output)))
diff --git a/lib/techniques/brute/use.py b/lib/techniques/brute/use.py
@@ -101,7 +101,7 @@ def tableExistsThread():
                     dataToStdout(infoMsg, True)
 
             if conf.verbose in (1, 2):
-                status = '%d/%d items (%d%s)' % (threadData.shared.count, threadData.shared.limit, round(100.0*threadData.shared.count/threadData.shared.limit), '%')
+                status = '%d/%d items (%d%%)' % (threadData.shared.count, threadData.shared.limit, round(100.0 * threadData.shared.count / threadData.shared.limit))
                 dataToStdout("\r[%s] [INFO] tried %s" % (time.strftime("%X"), status), True)
 
             kb.locks.io.release()
@@ -192,7 +192,7 @@ def columnExistsThread():
                     dataToStdout(infoMsg, True)
 
             if conf.verbose in (1, 2):
-                status = '%d/%d items (%d%s)' % (threadData.shared.count, threadData.shared.limit, round(100.0*threadData.shared.count/threadData.shared.limit), '%')
+                status = '%d/%d items (%d%%)' % (threadData.shared.count, threadData.shared.limit, round(100.0 * threadData.shared.count / threadData.shared.limit))
                 dataToStdout("\r[%s] [INFO] tried %s" % (time.strftime("%X"), status), True)
 
             kb.locks.io.release()
diff --git a/lib/utils/crawler.py b/lib/utils/crawler.py
@@ -96,7 +96,7 @@ def crawlThread():
 
                 if conf.verbose in (1, 2):
                     threadData.shared.count += 1
-                    status = '%d/%d links visited (%d%s)' % (threadData.shared.count, threadData.shared.length, round(100.0*threadData.shared.count/threadData.shared.length), '%')
+                    status = '%d/%d links visited (%d%%)' % (threadData.shared.count, threadData.shared.length, round(100.0 * threadData.shared.count / threadData.shared.length))
                     dataToStdout("\r[%s] [INFO] %s" % (time.strftime("%X"), status), True)
 
         threadData.shared.deeper = set()
