minor improvement (resuming of already cracked values)

stamparm · stamparm · commit f9bb762d1dab · 2011-11-01T19:00:34.000Z
diff --git a/lib/utils/hash.py b/lib/utils/hash.py
@@ -50,6 +50,7 @@
 from lib.core.convert import hexdecode
 from lib.core.convert import hexencode
 from lib.core.convert import utf8encode
+from lib.core.data import conf
 from lib.core.data import kb
 from lib.core.data import logger
 from lib.core.enums import DBMS
@@ -500,7 +501,15 @@ def dictionaryAttack(attack_dict):
 
                     key = hash(repr(item))
                     if item and key not in keys:
-                        attack_info.append(item)
+                        resumed = conf.hashDB.retrieve(hash_)
+                        if not resumed:
+                            attack_info.append(item)
+                        else:
+                            infoMsg = "resuming found '%s' ('%s')" % (resumed, hash_)
+                            if user and not user.startswith(DUMMY_USER_PREFIX):
+                                infoMsg += " for user '%s'" % user
+                            logger.info(infoMsg)
+                            results.append((user, hash_, resumed))
                         keys.add(key)
 
         if not attack_info:
@@ -615,7 +624,9 @@ def dictionaryAttack(attack_dict):
                         process.join()
 
                 while not retVal.empty():
-                    results.append(retVal.get(block=False))
+                    _, hash_, word = item = retVal.get(block=False)
+                    conf.hashDB.write(hash_, word)
+                    results.append(item)
 
             clearConsoleLine()
 
@@ -689,7 +700,9 @@ class Value():
                             process.join()
 
                     while not retVal.empty():
-                        results.append(retVal.get(block=False))
+                        _, hash_, word = item = retVal.get(block=False)
+                        conf.hashDB.write(hash_, word)
+                        results.append(item)
 
                 clearConsoleLine()
 
diff --git a/lib/utils/hashdb.py b/lib/utils/hashdb.py
@@ -40,15 +40,16 @@ def close(self):
         except:
             pass
 
-    def hashKey(self, key):
+    @staticmethod
+    def hashKey(key):
         key = key.encode(UNICODE_ENCODING) if isinstance(key, unicode) else repr(key)
         retVal = int(hashlib.md5(key).hexdigest()[:8], 16)
         return retVal
 
     def retrieve(self, key):
         retVal = None
         if key:
-            hash_ = self.hashKey(key)
+            hash_ = HashDB.hashKey(key)
             while True:
                 try:
                     for row in self.cursor.execute("SELECT value FROM storage WHERE id=?", (hash_,)):
@@ -62,7 +63,7 @@ def retrieve(self, key):
 
     def write(self, key, value):
         if key:
-            hash_ = self.hashKey(key)
+            hash_ = HashDB.hashKey(key)
             while True:
                 try:
                     try:
