sciveo 0.1.8__tar.gz → 0.1.9__tar.gz

{sciveo-0.1.8 → sciveo-0.1.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sciveo
-Version: 0.1.8
+Version: 0.1.9
 Description-Content-Type: text/markdown
 Provides-Extra: mon
 Provides-Extra: net

{sciveo-0.1.8 → sciveo-0.1.9}/sciveo/monitoring/network.py

@@ -10,41 +10,12 @@
 #
 
 import socket
-import asyncio
+import threading
 
 from sciveo.common.tools.logger import *
 from sciveo.common.tools.timers import Timer
 
 
-class NetworkScanner:
-  def __init__(self, timeout=1.0):
-    self.timeout = timeout
-
-  async def scan_port(self, ip, port):
-    try:
-      reader, writer = await asyncio.wait_for(asyncio.open_connection(ip, port), timeout=self.timeout)
-      writer.close()
-      await writer.wait_closed()
-      return (ip, port)
-    except Exception as e:
-      # print("Exception", e)
-      return None
-
-  async def scan_all_ports(self, ip, ports):
-    tasks = [self.scan_port(ip, port) for port in ports]
-    return await asyncio.gather(*tasks)
-
-  async def scan_async(self, ips, ports):
-    results = []
-    for ip in ips:
-      results.extend(await self.scan_all_ports(ip, ports))
-    results = [x for x in results if x is not None]
-    return results
-
-  def scan(self, ips, ports):
-    return asyncio.run(self.scan_async(ips, ports))
-
-
 class NetworkTools:
   def __init__(self, **kwargs):
     self.default_arguments = {
@@ -60,6 +31,9 @@ class NetworkTools:
     for i in range(16, 32):
       self.net_classes.append(f"172.{i}.")
 
+    self.data = {"scan": {}}
+    self.data_lock = threading.Lock()
+
   def get_local_nets(self):
     list_local_ips = []
     try:
@@ -83,48 +57,41 @@ class NetworkTools:
 
   def scan_port(self, port=22):
     t = Timer()
-    result = []
     list_local_ips = self.get_local_nets()
     debug(type(self).__name__, "scan_port", "list_local_ips", list_local_ips)
     for local_ip in list_local_ips:
       list_ip = self.generate_ip_list(local_ip)
-      result += self.scan_port_hosts(list_ip, port)
+      self.scan_port_hosts(list_ip, port)
     if self.arguments["localhost"]:
-      result += self.scan_port_hosts(["127.0.0.1"], port)
-    debug(type(self).__name__, "scan_port elapsed time", t.stop(), "result", result)
-    return result
+      self.scan_port_hosts(["127.0.0.1"], port)
+    debug(type(self).__name__, f"scan_port [{port}] elapsed time", t.stop(), self.data["scan"][port])
+    return self.data["scan"][port]
 
   def scan_port_hosts(self, list_ip, port=22):
-    list_hosts = []
     timeout = self.arguments["timeout"]
+    list_threads = []
     for ip in list_ip:
-      try:
-        with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock:
-          sock.settimeout(timeout)
-          result = sock.connect_ex((ip, port))
-          if result == 0:
-            list_hosts.append(ip)
-          # debug(type(self).__name__, "scan_ports", ip, port, result)
-      except socket.error:
-        pass
-    return list_hosts
+      t = threading.Thread(target=self.scan_host_port, args=(ip, port, timeout))
+      t.start()
+      list_threads.append(t)
+    for t in list_threads:
+      t.join()
+
+  def scan_host_port(self, ip, port, timeout):
+    try:
+      with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock:
+        sock.settimeout(timeout)
+        result = sock.connect_ex((ip, port))
+        if result == 0:
+          with self.data_lock:
+            self.data["scan"].setdefault(port, [])
+            self.data["scan"][port].append(ip)
+        # debug(type(self).__name__, "scan_ports", ip, port, result)
+    except socket.error:
+      pass
 
 
 if __name__ == "__main__":
-  t1 = Timer()
   net = NetworkTools(timeout=0.5, localhost=True)
-  result = net.scan_port(port=22)
-  t1 = t1.stop()
-  print(result, "elapsed", t1)
-
-  t2 = Timer()
-  list_local_ips = net.get_local_nets()
-  list_scan_ips = []
-  for local_ip in list_local_ips:
-    list_scan_ips += net.generate_ip_list(local_ip)
-  # print(list_scan_ips)
-  ns = NetworkScanner(timeout=0.5)
-  result = ns.scan(list_scan_ips, [22])
-  t2 = t2.stop()
-  print(result, "elapsed", t2)
-  print("elapsed", t1, t2, t1 - t2)
+  list_hosts = net.scan_port(port=22)
+  print(list_hosts)

sciveo-0.1.9/sciveo/version.py

@@ -0,0 +1,2 @@
+
+__version__ = '0.1.9'

{sciveo-0.1.8 → sciveo-0.1.9}/sciveo.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sciveo
-Version: 0.1.8
+Version: 0.1.9
 Description-Content-Type: text/markdown
 Provides-Extra: mon
 Provides-Extra: net

sciveo-0.1.8/sciveo/version.py

@@ -1,2 +0,0 @@
-
-__version__ = '0.1.8'