atomicshop 2.20.1__py3-none-any.whl → 2.20.3__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.20.1'
+__version__ = '2.20.3'

atomicshop/mitm/connection_thread_worker.py

@@ -294,6 +294,7 @@ def thread_worker_main(
         client_message: ClientMessage = ClientMessage()
         client_message.client_name = client_name
         client_message.client_ip = client_ip
+        client_message.server_ip = server_ip
         client_message.source_port = source_port
         client_message.destination_port = destination_port
         client_message.server_name = server_name
@@ -542,6 +543,13 @@ def thread_worker_main(
         client_name = socket.gethostbyaddr(client_ip)[0]
         destination_port = client_socket.getsockname()[1]
 
+        if config_static.TCPServer.server_response_mode:
+            # If in response mode, then we'll get the TCP server's input address.
+            server_ip = client_socket.getsockname()[0]
+        else:
+            # If not in response mode, we will get the ip from the socket that will connect later to the service.
+            server_ip = ""
+
         network_logger.info(f"Thread Created - Client [{client_ip}:{source_port}] | "
                             f"Destination service: [{server_name}:{destination_port}]")
 
@@ -569,6 +577,9 @@ def thread_worker_main(
             if not service_client:
                 service_client = create_client_socket(client_message_connection)
                 service_socket_instance, connection_error = service_client.service_connection()
+                # Now we'll update the server IP with the IP of the service.
+                server_ip = service_socket_instance.getpeername()[0]
+                client_message_connection.server_ip = server_ip
         else:
             client_message_connection.timestamp = datetime.now()
             client_message_connection.action = 'service_connect'

atomicshop/wrappers/playwrightw/scenarios.py

@@ -12,7 +12,7 @@ from bs4 import BeautifulSoup
 
 from . import engine, base, combos
 from ...basics import threads, multiprocesses
-from ...web import USER_AGENTS
+from ... import web
 
 
 def get_text_from_html_tag(url: str, tag_name: str, attribute: str, value: str) -> str:
@@ -219,7 +219,7 @@ def _fetch_content(
     with sync_playwright() as p:
         browser = p.chromium.launch(headless=headless)  # Set headless=True if you don't want to see the browser
 
-        user_agent: str = USER_AGENTS['Windows_Chrome_Latest']
+        user_agent: str = web.USER_AGENTS['Windows_Chrome_Latest']
 
         if text_fetch_method == "playwright_copypaste":
             context = browser.new_context(permissions=["clipboard-read", "clipboard-write"], user_agent=user_agent)

{atomicshop-2.20.1.dist-info → atomicshop-2.20.3.dist-info}/METADATA

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

{atomicshop-2.20.1.dist-info → atomicshop-2.20.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=v-nWc0H5hzfYpv98O85V2zxHgjjuPKnvoGqDkz_SCGE,123
+atomicshop/__init__.py,sha256=jrfooKEB2n1xq7etpsauLw74Y-KUQXdITvpLqaKbRYc,123
 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
@@ -135,7 +135,7 @@ atomicshop/file_io/xmls.py,sha256=zh3SuK-dNaFq2NDNhx6ivcf4GYCfGM8M10PcEwDSpxk,21
 atomicshop/mitm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/mitm/config_static.py,sha256=DjSnDtMU8srdqca8s6Q-oFCWgjjiCjXRhyk-nafRAUk,7788
 atomicshop/mitm/config_toml_editor.py,sha256=2p1CMcktWRR_NW-SmyDwylu63ad5e0-w1QPMa8ZLDBw,1635
-atomicshop/mitm/connection_thread_worker.py,sha256=6xfQ5MmWR2pqgDfjjelSgHfiTzhprRXNpfhgpoNbsGI,28688
+atomicshop/mitm/connection_thread_worker.py,sha256=tn71RotrQOTo6dyAakuLlY4HrM5ia_0FbNKLCY6Xahg,29304
 atomicshop/mitm/import_config.py,sha256=0Ij14aISTllTOiWYJpIUMOWobQqGofD6uafui5uWllE,9272
 atomicshop/mitm/initialize_engines.py,sha256=rijND1jxt3Zs8P0jhcQZc0tgcWD4-nq8ARODiWzhurU,8278
 atomicshop/mitm/message.py,sha256=CDhhm4BTuZE7oNZCjvIZ4BuPOW4MuIzQLOg91hJaxDI,3065
@@ -285,7 +285,7 @@ atomicshop/wrappers/playwrightw/javascript.py,sha256=_bW7CAtm0Y8IHYrAalg5HpPFnk6
 atomicshop/wrappers/playwrightw/keyboard.py,sha256=zN3YddGO-qUkn6C0CRVFejP4cTuaUwXLDNFhFREjERY,422
 atomicshop/wrappers/playwrightw/locators.py,sha256=6wsLywZxDuii7mwv-zQsRbqQC8r7j96Bma5b5_7ZoVo,2411
 atomicshop/wrappers/playwrightw/mouse.py,sha256=-2FZbQtjgH7tdXWld6ZPGqlKFUdf5in0ujN0hewxa50,656
-atomicshop/wrappers/playwrightw/scenarios.py,sha256=FkdzyvefzQCrCnSiPVjxDlY8x14W8jo_xUQQmHad6Iw,11636
+atomicshop/wrappers/playwrightw/scenarios.py,sha256=0t7007v461HYF6TEeXxHoqxvf3jwu7dOnrwdvffe3bE,11629
 atomicshop/wrappers/playwrightw/waits.py,sha256=PBFdz_PoM7Fo7O8hLqMrxNPzBEYgPoXwZceFFCGGeu8,7182
 atomicshop/wrappers/psutilw/cpus.py,sha256=w6LPBMINqS-T_X8vzdYkLS2Wzuve28Ydp_GafTCngrc,236
 atomicshop/wrappers/psutilw/disks.py,sha256=3ZSVoommKH1TWo37j_83frB-NqXF4Nf5q5mBCX8G4jE,9221
@@ -330,8 +330,8 @@ atomicshop/wrappers/socketw/statistics_csv.py,sha256=WcNyaqEZ82S5-f3kzqi1nllNT2N
 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.20.1.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-2.20.1.dist-info/METADATA,sha256=uMkPC6Yuv8XR4at2BPfs8myE_eNqq3C3iyZkvOfmbTk,10630
-atomicshop-2.20.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-2.20.1.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-2.20.1.dist-info/RECORD,,
+atomicshop-2.20.3.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-2.20.3.dist-info/METADATA,sha256=EIraBjAqtxnXnhDD7G-mdiXYggN0Fn99egvpmtoPrC4,10630
+atomicshop-2.20.3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+atomicshop-2.20.3.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-2.20.3.dist-info/RECORD,,