SnakeScan 1.5.9__tar.gz → 1.6.0__tar.gz

{snakescan-1.5.9 → snakescan-1.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: SnakeScan
-Version: 1.5.9
+Version: 1.6.0
 Summary: Module SnakeScan
 Author: Den*Ram
 Description-Content-Type: text/markdown
@@ -40,7 +40,7 @@ SnakeScan.run()
  for i in range(len(ports)):
  Watcher("127.0.0.1",ports[i])
  ```
-## Added CLI command line use
+## Added CLI command line use snake or Snake
 ```
 usage: Snake [-h] [-sp] [-v] [-i] [-p PORTS] [-s SINGLE]
              [-t] [-ch] [-l]

{snakescan-1.5.9 → snakescan-1.6.0}/README.md

@@ -26,7 +26,7 @@ SnakeScan.run()
  for i in range(len(ports)):
  Watcher("127.0.0.1",ports[i])
  ```
-## Added CLI command line use
+## Added CLI command line use snake or Snake
 ```
 usage: Snake [-h] [-sp] [-v] [-i] [-p PORTS] [-s SINGLE]
              [-t] [-ch] [-l]

{snakescan-1.5.9 → snakescan-1.6.0}/SnakeScan/CLI.py

@@ -1,13 +1,15 @@
+import sys
 import argparse
 import socket
 import ipaddress
 from concurrent.futures import ProcessPoolExecutor
-from tqdm import tqdm
 from termcolor import colored
 from threading import Thread
+from tqdm import tqdm
 from SnakeScan.Check_subnet import Check_network
 from SnakeScan.PoolExecutor import PoolProcessExecutor
 
+
 def main():
     pass
 
@@ -63,7 +65,7 @@ ports = {
     8080: "Tomcat",
     10000: "Webmin",
 }
-__version__ = "1.5.9"
+version = "1.6.0"
 
 
 def is_port_open(host, port):
@@ -115,6 +117,24 @@ def SnakeArgs():
 
 port_user = SnakeArgs().ports
 host = SnakeArgs().host
+if host.startswith("http://"):
+            host = host.strip()
+            host = host.split("http:")
+            host = host[1].strip("//")
+            host = host.split("/")
+            host = host[0]
+            for i in range(len(host)):
+                if host[i] == "/":
+                    host = host[0:i]
+if host.startswith("https://"):
+            host = host.strip()
+            host = host.split("https:")
+            host = host[1].strip("//")
+            host = host.split("/")
+            host = host[0]
+            for i in range(len(host)):
+                if host[i] == "/":
+                    host = host[0:i]
 if host == "None":
     host = "localhost"
 if SnakeArgs().ports:
@@ -157,22 +177,6 @@ if SnakeArgs().ports:
     print(f"Open{colored('|√|','green')}:{portsopen}")
     portsopen = 0
     print("-" * 60)
-if "http://" in host:
-    host = host.strip()
-    host = host.split("http:")
-    host = host.strip("//")
-    for i in range(len(host)):
-        if host[i] == "/":
-            host = host[0:i]
-if "https://" in host:
-    host = host.strip()
-    host = host.strip("https:")
-    host = host.strip("//")
-    for i in range(len(host)):
-        if host[i] == "/":
-            host = host[0:i]
-if host == "None":
-    host = "localhost"
 if SnakeArgs().check:
     Check_network(host)
 if SnakeArgs().single:
@@ -230,7 +234,11 @@ if SnakeArgs().info:
     network += "0"
     network += "/24"
     hosting = network
-    ip_obj = ipaddress.ip_address(host)
+    try:
+        ip_obj = ipaddress.ip_address(host)
+    except Exception as e:
+        print(e)
+        sys.exit()
     print(f"Type IP: {type(ip_obj)}")
     print(f"Version IP: {ip_obj.version}")
     network_obj = ipaddress.ip_network(network)
@@ -251,7 +259,7 @@ if SnakeArgs().info:
         print("".center(60, "-"))
 if SnakeArgs().thread:
     print(f"Thread".center(60, "-"))
-    PoolProcessExecutor(host)
+
     for port in ports.keys():
         t = Thread(
             target=is_port_open_threads,
@@ -259,10 +267,10 @@ if SnakeArgs().thread:
         )
         threads.append(t)
         t.start()
-        for t in threads:
-            t.join()
+    for t in threads:
+        t.join()
 if SnakeArgs().version:
-    print(f"Build_{__version__}")
+    print(f"Build_{version}")
 if SnakeArgs().speed:
     print(f"ProcessPoolExecutor".center(60, "-"))
     PoolProcessExecutor(host)

{snakescan-1.5.9 → snakescan-1.6.0}/SnakeScan/PoolExecutor.py

@@ -1,6 +1,7 @@
 import socket
 from termcolor import colored
 from concurrent.futures import ProcessPoolExecutor
+
 ports = {
     20: "FTP-DATA",
     21: "FTP",
@@ -43,6 +44,8 @@ ports = {
     8080: "Tomcat",
     10000: "Webmin",
 }
+
+
 def is_port_open_threads(host, port):
     with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
         try:
@@ -55,11 +58,13 @@ def is_port_open_threads(host, port):
                 print(f"Closed{colored('|X|','red')}-->|{port}|")
         else:
             print(f"Open{colored('|√|','green')}-->{ports.get(port)}|{port}|")
+
+
 def PoolProcessExecutor(host):
     with ProcessPoolExecutor(max_workers=None) as executor:
         try:
             for port in ports.keys():
-                future = executor.submit(is_port_open_threads,host,port)
+                future = executor.submit(is_port_open_threads, host, port)
 
         except Exception as e:
             print(e)

{snakescan-1.5.9 → snakescan-1.6.0}/SnakeScan/__init__.py

@@ -1,6 +1,6 @@
 """Module SnakeScan"""
 
-__version__ = "1.5.9"
+__version__ = "1.6.0"
 import socket
 import ipaddress
 from art import tprint
@@ -170,17 +170,17 @@ def run():
             finally:
                 print("".center(60, "-"))
             continue
-        if "http://" in host:
+        if host.startswith("http://"):
             host = host.strip()
             host = host.split("http:")
-            host = host.strip("//")
+            host = host[1].strip("//")
             for i in range(len(host)):
                 if host[i] == "/":
                     host = host[0:i]
-        if "https://" in host:
+        if host.startswith("https://"):
             host = host.strip()
-            host = host.strip("https:")
-            host = host.strip("//")
+            host = host.split("https:")
+            host = host[1].strip("//")
             for i in range(len(host)):
                 if host[i] == "/":
                     host = host[0:i]
@@ -227,8 +227,8 @@ def run():
                         )
                         threads.append(t)
                         t.start()
-                        for t in threads:
-                            t.join()
+                    for t in threads:
+                        t.join()
                 if "-s" in str(port_user):
                     port_user = port_single.strip("-s")
                     port_user = port_user.split()

{snakescan-1.5.9 → snakescan-1.6.0}/pyproject.toml

@@ -20,4 +20,5 @@ Homepage = "https://github.com/Den-Ram/SnakeScan"
 Repository = "https://github.com/Den-Ram/SnakeScan"
 [project.scripts]
 SnakeScan = "SnakeScan:run"
-Snake = "SnakeScan.CLI:main"
+Snake = "SnakeScan.CLI:main"
+snake = "SnakeScan.CLI:main"