atomicshop 2.19.16__py3-none-any.whl → 2.19.18__py3-none-any.whl

atomicshop/__init__.py

@@ -1,4 +1,4 @@
 """Atomic Basic functions and classes to make developer life easier"""
 
 __author__ = "Den Kras"
-__version__ = '2.19.16'
+__version__ = '2.19.18'

atomicshop/etws/trace.py

@@ -1,7 +1,7 @@
 import queue
 import sys
-import time
 import multiprocessing.managers
+from datetime import datetime
 
 # Import FireEye Event Tracing library.
 import etw
@@ -9,7 +9,6 @@ import etw
 from ..print_api import print_api
 from . import sessions
 from ..process_poller import simple_process_pool
-from ..wrappers.psutilw import psutilw
 
 
 class EventTrace(etw.ETW):
@@ -147,9 +146,13 @@ class EventTrace(etw.ETW):
 
         event: tuple = self.event_queue.get()
 
+        current_datetime = datetime.now()
+        readable_time = current_datetime.strftime('%Y-%m-%d %H:%M:%S.%f')
+
         event_dict: dict = {
             'EventId': event[0],
-            'EventHeader': event[1]
+            'EventHeader': event[1],
+            'timestamp': readable_time
         }
 
         if 'ProcessId' not in event[1]:

atomicshop/etws/traces/trace_dns.py

@@ -136,6 +136,7 @@ class DnsRequestResponseTrace:
             status = 'Error'
 
         event_dict: dict = {
+            'timestamp': event['timestamp'],
             'event_id': event['EventId'],
             'query': event['EventHeader']['QueryName'],
             'query_type_id': str(event['EventHeader']['QueryType']),

atomicshop/etws/traces/trace_tcp.py

@@ -112,6 +112,7 @@ class TcpIpNewConnectionsTrace:
         remote_address = remote_address.replace('[', '').replace(']', '')
 
         event_dict: dict = {
+            'timestamp': event['timestamp'],
             'event_id': event['EventId'],
             'local_ip': local_address,
             'local_port': local_port,

atomicshop/wrappers/psutilw/networks.py

@@ -5,12 +5,16 @@ import socket
 import psutil
 
 
-def get_process_using_port(port: int) -> Union[dict, None]:
+def get_process_using_port(ip_port: str) -> Union[dict, None]:
     """
     Function to find the process using the port.
-    :param port: Port number.
+    :param ip_port: string, Listening IP and port number. Example: '192.168.0.1:443'
     :return: dict['pid', 'name', 'cmdline'] or None.
     """
+
+    ip_address, port = ip_port.split(':')
+    port = int(port)
+
     for proc in psutil.process_iter(['pid', 'name', 'cmdline']):
         try:
             connections = proc.connections(kind='inet')
@@ -34,17 +38,18 @@ def get_process_using_port(port: int) -> Union[dict, None]:
     return None
 
 
-def get_processes_using_port_list(ports: list) -> Union[dict, None]:
+def get_processes_using_port_list(ips_ports: list) -> Union[dict, None]:
     """
     Function to find the process using the port.
-    :param ports: List of port numbers.
+    :param ips_ports: List of listening ips and port numbers. Example:
+        ['192.168.0.1:443', '192.168.0.2:443']
     :return: dict[port: {'pid', 'name', 'cmdline'}] or None.
     """
     port_process_map = {}
-    for port in ports:
-        process_info = get_process_using_port(port)
+    for ip_port in ips_ports:
+        process_info = get_process_using_port(ip_port)
         if process_info:
-            port_process_map[port] = process_info
+            port_process_map[ip_port] = process_info
 
     return port_process_map
 

atomicshop/wrappers/socketw/dns_server.py

@@ -273,7 +273,8 @@ class DnsServer:
         except ValueError as e:
             raise DnsConfigurationValuesError(e)
 
-        port_in_use = networks.get_processes_using_port_list([self.listening_port])
+        ips_ports: list[str] = [f'{self.listening_interface}:{self.listening_port}']
+        port_in_use = networks.get_processes_using_port_list(ips_ports)
         if port_in_use:
             error_messages: list = list()
             for port, process_info in port_in_use.items():

atomicshop/wrappers/socketw/socket_wrapper.py

@@ -309,7 +309,11 @@ class SocketWrapper:
                     print_api(message, color='red', logger=self.logger)
                     return 1
 
-        port_in_use = networks.get_processes_using_port_list(self.listening_port_list)
+        ips_ports: list[str] = list()
+        for port in self.listening_port_list:
+            ips_ports.append(f"{self.listening_interface}:{port}")
+
+        port_in_use = networks.get_processes_using_port_list(ips_ports)
         if port_in_use:
             error_messages: list = list()
             for port, process_info in port_in_use.items():

{atomicshop-2.19.16.dist-info → atomicshop-2.19.18.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: atomicshop
-Version: 2.19.16
+Version: 2.19.18
 Summary: Atomic functions and classes to make developer life easier
 Author: Denis Kras
 License: MIT License

{atomicshop-2.19.16.dist-info → atomicshop-2.19.18.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=iSWSvU0vNJjZowFs0TPAYg5UgE0d7XERSmYHkUprfXg,124
+atomicshop/__init__.py,sha256=4UeQSXSVlnbqLSWgBWo0xew0C1VyVkT67l5_ABe7iDA,124
 atomicshop/_basics_temp.py,sha256=6cu2dd6r2dLrd1BRNcVDKTHlsHs_26Gpw8QS6v32lQ0,3699
 atomicshop/_create_pdf_demo.py,sha256=Yi-PGZuMg0RKvQmLqVeLIZYadqEZwUm-4A9JxBl_vYA,3713
 atomicshop/_patch_import.py,sha256=ENp55sKVJ0e6-4lBvZnpz9PQCt3Otbur7F6aXDlyje4,6334
@@ -119,11 +119,11 @@ atomicshop/etws/_pywintrace_fix.py,sha256=nHrtnAb796eOZ6FlCqcsuRh_TSqSPp6JXLN6TB
 atomicshop/etws/const.py,sha256=v3x_IdCYeSKbCGywiZFOZln80ldpwKW5nuMDuUe51Jg,1257
 atomicshop/etws/providers.py,sha256=CXNx8pYdjtpLIpA66IwrnE64XhY4U5ExnFBMLEb8Uzk,547
 atomicshop/etws/sessions.py,sha256=b_KeiOvgOBJezJokN81TRlrvJiQNJlIWN4Z6UVjuxP0,1335
-atomicshop/etws/trace.py,sha256=p-5wegZ-5SuJ3UsprCCnlor8g2LPkF9ZOynLCYaEvXQ,7647
+atomicshop/etws/trace.py,sha256=u38pgUa9_eG1WBSDUOJ2PmCRQWifZJCEmovCy8OFk18,7786
 atomicshop/etws/traces/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-atomicshop/etws/traces/trace_dns.py,sha256=SWeex1mK7rrMzCmmL3qiGaD_jzbRiiwJ_mhMZz5TwJc,6879
+atomicshop/etws/traces/trace_dns.py,sha256=mCZgkSrfYrq9rBfqWGmY7rRSqFQeMoQWCOC8ggjKUak,6925
 atomicshop/etws/traces/trace_sysmon_process_creation.py,sha256=OM-bkK38uYMwWLZKNOTDa0Xdk3sO6sqsxoMUIiPvm5g,4656
-atomicshop/etws/traces/trace_tcp.py,sha256=pQF4A_qM-HjEhzMQUyTmUqOWdvSaqqAg5PwnkVn2fy4,5236
+atomicshop/etws/traces/trace_tcp.py,sha256=bHxngCxuKFOlSJw7z7fWAG613nzqLYZMktgxAlGC5rQ,5282
 atomicshop/file_io/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/file_io/csvs.py,sha256=zv0kKjRT-ZWRi0WpMIUQ_FKyP9Dt0f5Bc98Qsj6ClPU,9495
 atomicshop/file_io/docxs.py,sha256=Nyt3hSpzwqUKZEP5p5efqNpjFs9XqkK40Kp7BbbPo7E,6245
@@ -290,7 +290,7 @@ atomicshop/wrappers/playwrightw/waits.py,sha256=PBFdz_PoM7Fo7O8hLqMrxNPzBEYgPoXw
 atomicshop/wrappers/psutilw/cpus.py,sha256=w6LPBMINqS-T_X8vzdYkLS2Wzuve28Ydp_GafTCngrc,236
 atomicshop/wrappers/psutilw/disks.py,sha256=3ZSVoommKH1TWo37j_83frB-NqXF4Nf5q5mBCX8G4jE,9221
 atomicshop/wrappers/psutilw/memories.py,sha256=_S0aL8iaoIHebd1vOFrY_T9aROM5Jx2D5CvDh_4j0Vc,528
-atomicshop/wrappers/psutilw/networks.py,sha256=uv0QN-7Abp15iQ2leWj6oIoItBtBKhuLkN0i9w0vHaM,2591
+atomicshop/wrappers/psutilw/networks.py,sha256=S_p1vyZN8LsauHset8OPNAi3TmR6F9A4Amqe9EgoMAI,2814
 atomicshop/wrappers/psutilw/processes.py,sha256=ihYnxfMTVEXHWy92iewktoZGxazx3v5QCIn0bNLnfsU,2859
 atomicshop/wrappers/psutilw/psutilw.py,sha256=q3EwgprqyrR4zLCjl4l5DHFOQoukEvQMIPjNB504oQ0,21262
 atomicshop/wrappers/psycopgw/psycopgw.py,sha256=XJvVf0oAUjCHkrYfKeFuGCpfn0Oxj3u4SbKMKA1508E,7118
@@ -316,7 +316,7 @@ atomicshop/wrappers/socketw/accepter.py,sha256=hZZKVYlF3LOHQJsSIEKXZUf6QXXWm-Atq
 atomicshop/wrappers/socketw/base.py,sha256=zYwFxiEzTcItFi1RZQCMxMTLBvECVUiKwivPYKcu44g,2713
 atomicshop/wrappers/socketw/certificator.py,sha256=mtWPJ_ew3OSwt0-1W4jaoco1VIY4NRCrMv3mDUxb_Cc,12418
 atomicshop/wrappers/socketw/creator.py,sha256=aSwfN_IwXXf4Hob35vHXUxD_OPeshZcRDZU2hMyfKs0,13243
-atomicshop/wrappers/socketw/dns_server.py,sha256=RklzINNuoMQn4PGGQEI5hiAldprbVwwvikY6u9X-jTY,49067
+atomicshop/wrappers/socketw/dns_server.py,sha256=vNh22q5CBzCf8Rn50NNDRs05J4AyRSoT78lTT0q-rb4,49141
 atomicshop/wrappers/socketw/exception_wrapper.py,sha256=B-X5SHLSUIWToihH2MKnOB1F4A81_X0DpLLfnYKYbEc,7067
 atomicshop/wrappers/socketw/get_process.py,sha256=aJC-_qFUv3NgWCSUzDI72E4z8_-VTZE9NVZ0CwUoNlM,5698
 atomicshop/wrappers/socketw/receiver.py,sha256=9B3MvcDqr4C3x2fsnjG5SQognd1wRqsBgikxZa0wXG8,8243
@@ -324,14 +324,14 @@ atomicshop/wrappers/socketw/sender.py,sha256=aX_K8l_rHjd5AWb8bi5mt8-YTkMYVRDB6Dn
 atomicshop/wrappers/socketw/sni.py,sha256=T9PXROiTYYxrd_7X4Hoj9hoNPXXTQpa2HdvmBJJIoeA,17607
 atomicshop/wrappers/socketw/socket_client.py,sha256=oa3GwS4OPgokrJE5_Oc4-5_wlXHxSH9J5f2DKebms8k,22035
 atomicshop/wrappers/socketw/socket_server_tester.py,sha256=Qobmh4XV8ZxLUaw-eW4ESKAbeSLecCKn2OWFzMhadk0,6420
-atomicshop/wrappers/socketw/socket_wrapper.py,sha256=S03micuzwD06BSz5YU8DsKfAs_toppgQsndpczj60s4,36124
+atomicshop/wrappers/socketw/socket_wrapper.py,sha256=3JhqFmHcNDWYBSqBiJbyXZ5btkEXtbqVG0r4XRCyFGs,36265
 atomicshop/wrappers/socketw/ssl_base.py,sha256=kmiif84kMhBr5yjQW17p935sfjR5JKG0LxIwBA4iVvU,2275
 atomicshop/wrappers/socketw/statistics_csv.py,sha256=fgMzDXI0cybwUEqAxprRmY3lqbh30KAV-jOpoFKT-m8,3395
 atomicshop/wrappers/winregw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/winregw/winreg_installed_software.py,sha256=Qzmyktvob1qp6Tjk2DjLfAqr_yXV0sgWzdMW_9kwNjY,2345
 atomicshop/wrappers/winregw/winreg_network.py,sha256=AENV88H1qDidrcpyM9OwEZxX5svfi-Jb4N6FkS1xtqA,8851
-atomicshop-2.19.16.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-2.19.16.dist-info/METADATA,sha256=uDnHTYzOlT54oM3QgJckEUYc5iDwE6wBipRH9S1aUB8,10631
-atomicshop-2.19.16.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-2.19.16.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-2.19.16.dist-info/RECORD,,
+atomicshop-2.19.18.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-2.19.18.dist-info/METADATA,sha256=Vs7F9AQLJXcK_EzKoeh2fHWlXxnZMsv4-Ow8ymwnNAk,10631
+atomicshop-2.19.18.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+atomicshop-2.19.18.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-2.19.18.dist-info/RECORD,,