sciveo 0.1.19__tar.gz → 0.1.20__tar.gz

{sciveo-0.1.19 → sciveo-0.1.20}/PKG-INFO

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

{sciveo-0.1.19 → sciveo-0.1.20}/sciveo/cli.py

@@ -29,6 +29,7 @@ def main():
   parser.add_argument('--block', type=bool, default=True, help='Block flag')
   parser.add_argument('--auth', type=str, default=config['secret_access_key'], help='Auth secret access key')
   parser.add_argument('--timeout', type=float, default=1.0, help='Timeout')
+  parser.add_argument('--net', type=str, default=None, help='Network like 192.168.10.0/24')
   parser.add_argument('--port', type=int, default=22, help='Host port number, used for network ops')
   parser.add_argument('--localhost', type=bool, default=False, help='Add localhost to list of hosts')
   args = parser.parse_args()
@@ -36,7 +37,7 @@ def main():
   if args.command == 'monitor':
     MonitorStart(period=args.period, block=args.block)()
   elif args.command == 'scan':
-    NetworkTools(timeout=args.timeout, localhost=args.localhost).scan_port(port=args.port)
+    NetworkTools(timeout=args.timeout, localhost=args.localhost).scan_port(port=args.port, network=args.net)
   elif args.command == 'init':
     home = os.path.expanduser('~')
     base_path = os.path.join(home, '.sciveo')

sciveo-0.1.20/sciveo/network/sniffer.py

@@ -0,0 +1,75 @@
+#
+# Pavlin Georgiev, Softel Labs
+#
+# This is a proprietary file and may not be copied,
+# distributed, or modified without express permission
+# from the owner. For licensing inquiries, please
+# contact pavlin@softel.bg.
+#
+# 2024
+#
+
+import socket
+import threading
+from scapy.all import sniff, IP, TCP
+
+from sciveo.common.tools.logger import *
+from sciveo.common.tools.timers import Timer
+
+
+class StreamSniffer:
+  def __init__(self, iface=None):
+    self.iface = iface
+    self.running = False
+    self.lock = threading.Lock()
+    self.streams = {}
+
+  def start(self):
+    self.running = True
+    self.sniff_thread = threading.Thread(target=self.sniff_packets)
+    self.sniff_thread.start()
+
+  def stop(self):
+    debug(type(self).__name__, "stopping...")
+    self.running = False
+    self.sniff_thread.join()
+
+  def sniff_packets(self):
+    debug(type(self).__name__, "start sniffing on", self.iface)
+    sniff(iface=self.iface, prn=self.on_packet, stop_filter=self.should_stop)
+
+  def on_packet(self, packet):
+    if IP in packet:
+      self.append_ip_packet(packet)
+
+  def should_stop(self, packet):
+    return not self.running
+
+  def append_ip_packet(self, packet):
+    ip_src = packet[IP].src
+    with self.lock:
+      self.streams.setdefault(ip_src, [])
+      self.streams[ip_src].append(packet)
+
+  def get_ip_stream(self, ip):
+    current_packets = []
+    with self.lock:
+      if ip in self.streams:
+        current_packets = self.streams[ip][:]
+        self.streams[ip] = []
+    return current_packets
+
+  def keys(self):
+    with self.lock:
+      return list(self.streams.keys())
+
+
+if __name__ == "__main__":
+  # debug(NetworkTools(timeout=1.0, localhost=False).scan_port(port=9901))
+
+  import time
+  sniffer = StreamSniffer(iface="en0")
+  sniffer.start()
+  time.sleep(5)
+  sniffer.stop()
+  debug(sniffer.keys())

{sciveo-0.1.19 → sciveo-0.1.20}/sciveo/network/tools.py

@@ -10,8 +10,8 @@
 #
 
 import socket
+import ipaddress
 import threading
-from scapy.all import sniff, IP, TCP
 
 from sciveo.common.tools.logger import *
 from sciveo.common.tools.timers import Timer
@@ -56,14 +56,23 @@ class NetworkTools:
     network_prefix = '.'.join(octets[:3])
     return [f'{network_prefix}.{i}' for i in range(1, 255)]
 
-  def scan_port(self, port=22):
+  def scan_port(self, port=22, network=None):
     t = Timer()
-    list_local_ips = self.get_local_nets()
-    # debug(type(self).__name__, "scan_port", "list_local_ips", list_local_ips)
     self.data["scan"].setdefault(port, [])
-    for local_ip in list_local_ips:
-      list_ip = self.generate_ip_list(local_ip)
+
+    if network is None:
+      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)
+        self.scan_port_hosts(list_ip, port)
+    else:
+      list_ip = []
+      net = ipaddress.ip_network(network, strict=False)
+      for ip in net.hosts():
+        list_ip.append(str(ip))
       self.scan_port_hosts(list_ip, port)
+
     if self.arguments["localhost"]:
       self.scan_port_hosts(["127.0.0.1"], port)
     self.data["scan"][port].sort(key=lambda ip: int(ip.split('.')[-1]))
@@ -91,61 +100,3 @@ class NetworkTools:
         # debug(type(self).__name__, "scan_ports", ip, port, result)
     except socket.error:
       pass
-
-
-class StreamSniffer:
-  def __init__(self, iface=None):
-    self.iface = iface
-    self.running = False
-    self.lock = threading.Lock()
-    self.streams = {}
-
-  def start(self):
-    self.running = True
-    self.sniff_thread = threading.Thread(target=self.sniff_packets)
-    self.sniff_thread.start()
-
-  def stop(self):
-    debug(type(self).__name__, "stopping...")
-    self.running = False
-    self.sniff_thread.join()
-
-  def sniff_packets(self):
-    debug(type(self).__name__, "start sniffing on", self.iface)
-    sniff(iface=self.iface, prn=self.on_packet, stop_filter=self.should_stop)
-
-  def on_packet(self, packet):
-    if IP in packet:
-      self.append_ip_packet(packet)
-
-  def should_stop(self, packet):
-    return not self.running
-
-  def append_ip_packet(self, packet):
-    ip_src = packet[IP].src
-    with self.lock:
-      self.streams.setdefault(ip_src, [])
-      self.streams[ip_src].append(packet)
-
-  def get_ip_stream(self, ip):
-    current_packets = []
-    with self.lock:
-      if ip in self.streams:
-        current_packets = self.streams[ip][:]
-        self.streams[ip] = []
-    return current_packets
-
-  def keys(self):
-    with self.lock:
-      return list(self.streams.keys())
-
-
-if __name__ == "__main__":
-  # debug(NetworkTools(timeout=1.0, localhost=False).scan_port(port=9901))
-
-  import time
-  sniffer = StreamSniffer(iface="en0")
-  sniffer.start()
-  time.sleep(5)
-  sniffer.stop()
-  debug(sniffer.keys())

sciveo-0.1.20/sciveo/network/tunnel.py

@@ -0,0 +1,17 @@
+#
+# Pavlin Georgiev, Softel Labs
+#
+# This is a proprietary file and may not be copied,
+# distributed, or modified without express permission
+# from the owner. For licensing inquiries, please
+# contact pavlin@softel.bg.
+#
+# 2024
+#
+
+
+import os
+import subprocess
+
+from sciveo.common.tools.logger import *
+

sciveo-0.1.20/sciveo/version.py

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

{sciveo-0.1.19 → sciveo-0.1.20}/sciveo.egg-info/PKG-INFO

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

{sciveo-0.1.19 → sciveo-0.1.20}/sciveo.egg-info/SOURCES.txt

@@ -39,6 +39,7 @@ sciveo/monitoring/monitor.py
 sciveo/monitoring/start.py
 sciveo/network/__init__.py
 sciveo/network/camera.py
+sciveo/network/sniffer.py
 sciveo/network/tools.py
 sciveo/network/tunnel.py
 test/test_compress.py

sciveo-0.1.19/sciveo/network/tunnel.py

@@ -1,131 +0,0 @@
-#
-# Pavlin Georgiev, Softel Labs
-#
-# This is a proprietary file and may not be copied,
-# distributed, or modified without express permission
-# from the owner. For licensing inquiries, please
-# contact pavlin@softel.bg.
-#
-# 2024
-#
-
-
-import os
-import subprocess
-
-from sciveo.common.tools.logger import *
-
-
-class WireGuardBase:
-  def __init__(self, interface='wg0'):
-    self.interface = interface
-    self.config_path = f'/etc/wireguard/{self.interface}.conf'
-    self.private_key = None
-    self.public_key = None
-
-  def _run_command(self, command):
-    try:
-      result = subprocess.run(command, shell=True, check=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-      return result.stdout.decode().strip()
-    except subprocess.CalledProcessError as e:
-      debug(type(self).__name__, f"Error executing command: {e.stderr.decode().strip()}")
-      return None
-
-  def generate_keys(self, private_key_path=None, public_key_path=None):
-    # Generate the private key
-    self.private_key = self._run_command("wg genkey")
-    if not self.private_key:
-      raise Exception("Failed to generate private key.")
-
-    # Generate the public key from the private key
-    self.public_key = self._run_command(f"echo {self.private_key} | wg pubkey")
-    if not self.public_key:
-      raise Exception("Failed to generate public key.")
-
-    # Optionally save the keys to files
-    if private_key_path:
-      with open(private_key_path, 'w') as f:
-        f.write(self.private_key)
-      debug(type(self).__name__, f"Private key saved to {private_key_path}")
-
-    if public_key_path:
-      with open(public_key_path, 'w') as f:
-        f.write(self.public_key)
-      debug(type(self).__name__, f"Public key saved to {public_key_path}")
-
-    return self.private_key, self.public_key
-
-  def start(self):
-    debug(type(self).__name__, f"Starting WireGuard interface {self.interface}...")
-    return self._run_command(f'sudo systemctl start [email protected]{self.interface}')
-
-  def stop(self):
-    debug(type(self).__name__, f"Stopping WireGuard interface {self.interface}...")
-    return self._run_command(f'sudo systemctl stop [email protected]{self.interface}')
-
-  def restart(self):
-    debug(type(self).__name__, f"Restarting WireGuard interface {self.interface}...")
-    return self._run_command(f'sudo systemctl restart [email protected]{self.interface}')
-
-  def status(self):
-    debug(type(self).__name__, f"Checking status of WireGuard interface {self.interface}...")
-    return self._run_command(f'sudo systemctl status [email protected]{self.interface}')
-
-class WGServer(WireGuardBase):
-  def init(self, private_key=None, listen_port=51820, address='192.168.21.1/24'):
-    if not private_key:
-      private_key = self.private_key
-    config = f"""
-    [Interface]
-    Address = {address}
-    ListenPort = {listen_port}
-    PrivateKey = {private_key}
-    SaveConfig = true
-    """
-    with open(self.config_path, 'w') as config_file:
-      config_file.write(config.strip())
-    debug(type(self).__name__, f"Server configuration written to {self.config_path}")
-
-  def add_peer(self, peer_public_key, allowed_ips):
-    peer_config = f"""
-    [Peer]
-    PublicKey = {peer_public_key}
-    AllowedIPs = {allowed_ips}
-    """
-    with open(self.config_path, 'a') as config_file:
-      config_file.write(peer_config.strip())
-    debug(type(self).__name__, f"Added peer with PublicKey: {peer_public_key}")
-
-class WGClient(WireGuardBase):
-  def init(self, private_key=None, server_public_key=None, endpoint=None, address='192.168.21.2/24', allowed_ips='0.0.0.0/0', keepalive=25):
-    if not private_key:
-      private_key = self.private_key
-    config = f"""
-    [Interface]
-    Address = {address}
-    PrivateKey = {private_key}
-
-    [Peer]
-    PublicKey = {server_public_key}
-    Endpoint = {endpoint}
-    AllowedIPs = {allowed_ips}
-    PersistentKeepalive = {keepalive}
-    """
-    with open(self.config_path, 'w') as config_file:
-      config_file.write(config.strip())
-    debug(type(self).__name__, f"Client configuration written to {self.config_path}")
-
-
-if __name__ == "__main__":
-  server = WGServer(interface='wg0')
-  server.generate_keys(private_key_path='/etc/wireguard/server_private.key', public_key_path='/etc/wireguard/server_public.key')
-  server.init(private_key=server.private_key, listen_port=51820, address='192.168.21.1/24')
-  server.add_peer(peer_public_key='<client_public_key>', allowed_ips='192.168.21.2/32')
-  server.start()
-  debug(type(self).__name__, server.status())
-
-  # client = WGClient(interface='wg0')
-  # client.generate_keys(private_key_path='/etc/wireguard/client_private.key', public_key_path='/etc/wireguard/client_public.key')
-  # client.init(private_key=client.private_key, server_public_key='<server_public_key>', endpoint='<server_ip>:51820')
-  # client.start()
-  # debug(type(self).__name__, client.status())

sciveo-0.1.19/sciveo/version.py

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