mrok 0.4.0__py3-none-any.whl → 0.4.1__py3-none-any.whl

mrok/master.py

@@ -12,6 +12,7 @@ from uuid import uuid4
 
 import zmq
 import zmq.asyncio
+from uvicorn.importer import import_from_string
 from watchfiles import watch
 from watchfiles.filters import PythonFilter
 from watchfiles.run import CombinedProcess, start_process
@@ -69,6 +70,9 @@ def start_uvicorn_worker(
     import sys
 
     sys.path.insert(0, os.getcwd())
+    if isinstance(app, str):
+        app = import_from_string(app)
+
     setup_logging(get_settings())
     identity = json.load(open(identity_file))
     meta = Meta(**identity["mrok"])
@@ -82,7 +86,6 @@ def start_uvicorn_worker(
     async def status_sender():
         while True:
             snap = await metrics.snapshot()
-            logger.info(f"New metrics snapshot taken: {snap}")
             event = Event(type="status", data=Status(meta=meta, metrics=snap))
             await pub.send_string(event.model_dump_json())
             await asyncio.sleep(metrics_interval)

mrok/proxy/app.py

@@ -38,22 +38,26 @@ class ProxyApp(ForwardAppBase):
             purge_interval=ziti_conn_cache_purge_interval_seconds,
         )
 
-    def get_target_name(self, headers: dict[str, str]) -> str:
-        header_value = headers.get("x-forwarded-for", headers.get("host"))
+    def get_target_from_header(self, name: str, headers: dict[str, str]) -> str:
+        header_value = headers.get(name)
         if not header_value:
             raise ProxyError(
-                "Cannot determine the target OpenZiti service/terminator name, "
-                "neither Host nor X-Forwarded-For headers have been sent in the request.",
+                f"Header {name} not found!",
             )
         if ":" in header_value:
             header_value, _ = header_value.split(":", 1)
         if not header_value.endswith(self._proxy_wildcard_domain):
-            raise ProxyError(
-                f"Unexpected value for Host or X-Forwarded-For header: `{header_value}`."
-            )
+            raise ProxyError(f"Unexpected value for {name} header: `{header_value}`.")
 
         return header_value[: -len(self._proxy_wildcard_domain)]
 
+    def get_target_name(self, headers: dict[str, str]) -> str:
+        try:
+            return self.get_target_from_header("x-forwared-for", headers)
+        except ProxyError as pe:
+            logger.warning(pe)
+            return self.get_target_from_header("host", headers)
+
     async def startup(self):
         setup_logging(get_settings())
         await self._conn_manager.start()

{mrok-0.4.0.dist-info → mrok-0.4.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mrok
-Version: 0.4.0
+Version: 0.4.1
 Summary: MPT Extensions OpenZiti Orchestrator
 Author: SoftwareOne AG
 License:                                  Apache License

{mrok-0.4.0.dist-info → mrok-0.4.1.dist-info}/RECORD

@@ -3,7 +3,7 @@ mrok/conf.py,sha256=_5Z-A5LyojQeY8J7W8C0QidsmrPl99r9qKYEoMf4kcI,840
 mrok/datastructures.py,sha256=gp8KF2JoNOxIRzYStVZLKL_XVDbcIVSIDnmpQo4FNt0,4067
 mrok/errors.py,sha256=ruNMDFr2_0ezCGXuCG1OswCEv-bHOIzMMd02J_0ABcs,37
 mrok/logging.py,sha256=ZMWn0w4fJ-F_g-L37H_GM14BSXAIF2mFF_ougX5S7mg,2856
-mrok/master.py,sha256=6_bUic39mXE37lt0PBf_BtY2D2mBR7KzPj65JP7HWPc,8287
+mrok/master.py,sha256=XuketJZuB1YWdbTs819pjLum7Qfv232F9ZCxdwRztCQ,8340
 mrok/metrics.py,sha256=asweK_7xiV5MtkDkvbEm9Tktqrl2KHM8VflF0AkNGI0,4036
 mrok/agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mrok/agent/ziticorn.py,sha256=marXGcr6CbDdiNi8V3CZJhg8YCUbKw6ySuO3-0-zf8g,900
@@ -71,7 +71,7 @@ mrok/http/server.py,sha256=Mj7C85fc-DXp-WTBWaOd7ag808oliLmFBH5bf-G2FHg,370
 mrok/http/types.py,sha256=XpNrvbfpANKvmjOBYtLF1FmDHoJF3z_MIMQHXoJlvmE,1302
 mrok/http/utils.py,sha256=sOixYu3R9-nNoMFYdifrreYvcFRIHYVtb6AAmtVzaLE,2125
 mrok/proxy/__init__.py,sha256=vWXyImroqM1Eq8e_oFPBup8VJ3reyp8SVjFTbLzRkI8,51
-mrok/proxy/app.py,sha256=MwJZ91MQ1oWkbmsX7-NooZSV9BkLVZPFmUKpNPC4HHQ,2490
+mrok/proxy/app.py,sha256=YP4hM3BIRf_MFw9YNEnsFrrBz76zVegrNFcvcsKTFvI,2579
 mrok/proxy/dataclasses.py,sha256=DtX-Yuma-uOECOPefJnoQJhZMEtT6Za_27cd-lJE9Iw,237
 mrok/proxy/main.py,sha256=ZXpticE6J4FABaslDB_8J5qklPsf3e7xIFSZmcPAAjQ,1588
 mrok/proxy/streams.py,sha256=6TMZwrQPbSyQqpqavsoTeyUmS2O026pJfiCnxLopPqg,3425
@@ -85,8 +85,8 @@ mrok/ziti/errors.py,sha256=yYCbVDwktnR0AYduqtynIjo73K3HOhIrwA_vQimvEd4,368
 mrok/ziti/identities.py,sha256=1BcwfqAJHMBhc3vRaf0aLaIkoHskj5Xe2Lsq2lO9Vs8,6735
 mrok/ziti/pki.py,sha256=o2tySqHC8-7bvFuI2Tqxg9vX6H6ZSxWxfP_9x29e19M,1954
 mrok/ziti/services.py,sha256=zR1PEBYwXVou20iJK4euh0ZZFAo9UB8PZk8f6SDmiUE,3194
-mrok-0.4.0.dist-info/METADATA,sha256=39Su41kvqC4oAsQl1_ZG7b5v1xRr6c2YK6x84XgURi8,15796
-mrok-0.4.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-mrok-0.4.0.dist-info/entry_points.txt,sha256=tloXwvU1uJicBJR2h-8HoVclPgwJWDwuREMHN8Zq-nU,38
-mrok-0.4.0.dist-info/licenses/LICENSE.txt,sha256=6PaICaoA3yNsZKLv5G6OKqSfLSoX7MakYqTDgJoTCBs,11346
-mrok-0.4.0.dist-info/RECORD,,
+mrok-0.4.1.dist-info/METADATA,sha256=PuydR9Z4yuDSDMuJrn1FqWGb18fJTA6TFChAj-LwWZE,15796
+mrok-0.4.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+mrok-0.4.1.dist-info/entry_points.txt,sha256=tloXwvU1uJicBJR2h-8HoVclPgwJWDwuREMHN8Zq-nU,38
+mrok-0.4.1.dist-info/licenses/LICENSE.txt,sha256=6PaICaoA3yNsZKLv5G6OKqSfLSoX7MakYqTDgJoTCBs,11346
+mrok-0.4.1.dist-info/RECORD,,