fixed no-internet-connection and made core python3 compatible

hackcat · Feb 28, 2019 · 8f90346 · 8f90346
1 parent 2ac3efd
commit 8f90346
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 18 deletions.
diff --git a/ptf b/ptf
@@ -76,20 +76,20 @@ if __name__ == "__main__":
             # create automatic launcher
             create_launcher()
 
-            # pull in the framework
-            import src.framework
-
-            # if we want to skip going into module
-            if  "--update-all" in sys.argv[1:]:
-                if "-y" in sys.argv[1:]:
-                    src.framework.handle_prompt("use modules/install_update_all", True)
-                else:
-                    src.framework.handle_prompt("use modules/install_update_all")
-            elif "--update-installed" in sys.argv[1:]:
-                src.framework.handle_prompt("use modules/update_installed")
+        # pull in the framework
+        import src.framework
+
+        # if we want to skip going into module
+        if  "--update-all" in sys.argv[1:]:
+            if "-y" in sys.argv[1:]:
+                src.framework.handle_prompt("use modules/install_update_all", True)
             else:
-                # or just ask what you want
-                src.framework.mainloop()
+                src.framework.handle_prompt("use modules/install_update_all")
+        elif "--update-installed" in sys.argv[1:]:
+            src.framework.handle_prompt("use modules/update_installed")
+        else:
+            # or just ask what you want
+            src.framework.mainloop()
 
     except KeyboardInterrupt:
         print("\n")

diff --git a/src/core.py b/src/core.py
@@ -51,11 +51,18 @@ class bcolors:
 
 # custom parser for zaproxy
 def zaproxy():
-    file = urllib.urlopen('https://raw.githubusercontent.com/zaproxy/zap-admin/master/ZapVersions.xml')
-    data = file.readlines()
-    file.close()
-    for url in data:
-        if "Linux.tar.gz" in url and "<url>" in url: return url.rstrip().replace("<url>", "").replace("</url>", "").strip()
+    if sys.version_info > (3,0):
+        file = urllib.request.urlopen('https://raw.githubusercontent.com/zaproxy/zap-admin/master/ZapVersions.xml')
+        data = file.readlines()
+        file.close()
+        for url in data:
+            if b'Linux.tar.gz' in url and b'<url>' in url: return url.decode('utf-8').replace("<url>", "").replace("</url>", "").strip()
+    else:
+        file = urllib.urlopen('https://raw.githubusercontent.com/zaproxy/zap-admin/master/ZapVersions.xml')
+        data = file.readlines()
+        file.close()
+        for url in data:
+            if "Linux.tar.gz" in url and "<url>" in url: return url.rstrip().replace("<url>", "").replace("</url>", "").strip()
 
 
 # get the main SET path