Merge remote-tracking branch 'origin/master'

hashtopolis · Jan 25, 2018 · 6c59ca1 · 6c59ca1
2 parents 22044b9 + 73b50d0
commit 6c59ca1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 19 deletions.
diff --git a/python/htpclient/hashcat_cracker.py b/python/htpclient/hashcat_cracker.py
@@ -1,3 +1,4 @@
+import string
 import logging
 import subprocess
 from queue import Queue, Empty
@@ -106,8 +107,11 @@ def run_loop(self, proc, chunk, task):
                                     f.close()
                                 logging.info("Progress:" + str("{:6.2f}".format(relative_progress/100)) + "% Cracks: " + str(cracks_count) + " Accepted: " + str(ans['cracked']) + " Skips: " + str(ans['skipped']) + " Zaps: " + str(len(zaps)))
                     else:
+                        # hacky solution to exclude warnings from hashcat
+                        if str(line[0]) not in string.printable:
+                            continue
                         line = line.decode()
-                        if ":" in line and "Line-length exception" not in line:
+                        if ":" in line:
                             cracks.append(line.strip())
                         else:
                             pass

diff --git a/python/htpclient/initialize.py b/python/htpclient/initialize.py
@@ -24,27 +24,19 @@ def run(self):
 
     @staticmethod
     def get_os():
-        if os.name == 'nt':
-            system = 1  # Windows
-        elif os.name == 'posix':
-            # Linux or OS X
-            if platform.system() == 'Darwin':
-                system = 2  # OS X
-            else:
-                system = 0  # Linux
-        else:
-            system = 0  # Linux
-        return system
+        osdict = {"Linux":   0,
+                  "Windows": 1,
+                  "Darwin":  2}
+        os = platform.system()
+        return osdict[os]
 
     @staticmethod
     def get_os_extension():
-        if os.name == 'nt':
-            ext = '.exe'  # Windows
-        elif os.name == 'posix':
-            ext = ''  # Linux or OS X
-        else:
-            ext = ''
-        return ext
+        extdict = {0: "",     # Linux
+                   1: ".exe", # Windows
+                   2: ""}     # Mac OS
+        os = Initialize.get_os()
+        return extdict[os]
 
     def __login(self):
         req = JsonRequest({'action': 'login', 'token': self.config.get_value('token'), 'clientSignature': self.get_version()})