analytics-platform 0.3.9__tar.gz → 0.3.10__tar.gz

{analytics_platform-0.3.9 → analytics_platform-0.3.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: analytics-platform
-Version: 0.3.9
+Version: 0.3.10
 Summary: Firewall, error monitoring and server analytics for your Python server, run from your analytics dashboard.
 Author: steviec87
 License-Expression: MIT

{analytics_platform-0.3.9 → analytics_platform-0.3.10}/analytics_platform/core.py

@@ -23,7 +23,7 @@ import urllib.error
 import urllib.parse
 import urllib.request
 
-VERSION = "0.3.9"
+VERSION = "0.3.10"
 TIMEOUT = 5
 MIN_SYNC = 30
 RETRY = 60
@@ -447,6 +447,23 @@ def header(headers, name):
 _PATH_SAFE = "/:@!$&'()*+,;=-._~"
 
 
+_ABSOLUTE = re.compile(r"^[a-zA-Z][a-zA-Z0-9+.-]*://[^/?#]*")
+
+
+def origin_form(target):
+    """The request target as the app routes it: an absolute-form one ("GET
+    http://host/admin", sent as if to a proxy) is routed by its path, so it is
+    cut to "/admin"; matched as written it began "http:" and missed every rule
+    on "/admin". "*" and a target already "/..." are kept as they are."""
+    text = str(target or "")
+    if not text or text.startswith("/") or text == "*":
+        return text
+    rest, count = _ABSOLUTE.subn("", text, count=1)
+    if not count:
+        return text
+    return rest if rest.startswith("/") else "/" + rest
+
+
 def request_target(path, query="", raw=None):
     """The request target as the visitor sent it, query string and all, which
     is what the request rules match (sdk/protocols/firewall.md): the Node and

{analytics_platform-0.3.9 → analytics_platform-0.3.10}/analytics_platform/firewall.py

@@ -19,7 +19,7 @@ import time
 from datetime import datetime, timezone
 
 from . import challenge as browser_check
-from .core import Periodic, RETRY, header
+from .core import Periodic, RETRY, header, origin_form
 from .request_rules import MAX_TEXT, _decode_once, compile_limits, compile_rules, match_limits, match_request, normalize_target, prepare
 
 PROTOCOL = 1
@@ -572,6 +572,7 @@ class Firewall:
         request's headers) are for the browser check: rule "challenge",
         status 503, answered with challenge_page()."""
         allow = {"action": "allow", "rule": "", "status": 200}
+        path = origin_form(path)
         rules = self.rules
         if not rules or not rules["enabled"]:
             return allow
@@ -694,6 +695,7 @@ class Firewall:
         beacons are never rate-limited, checked or matched against request
         rules. -> the same shape as check()."""
         allow = {"action": "allow", "rule": "", "status": 200}
+        path = origin_form(path)
         rules = self.rules
         if not rules or not rules["enabled"]:
             return allow

{analytics_platform-0.3.9 → analytics_platform-0.3.10}/analytics_platform.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: analytics-platform
-Version: 0.3.9
+Version: 0.3.10
 Summary: Firewall, error monitoring and server analytics for your Python server, run from your analytics dashboard.
 Author: steviec87
 License-Expression: MIT

{analytics_platform-0.3.9 → analytics_platform-0.3.10}/pyproject.toml

@@ -10,7 +10,7 @@ Security = "https://sitegoose.com/security"
 
 [project]
 name = "analytics-platform"
-version = "0.3.9"
+version = "0.3.10"
 description = "Firewall, error monitoring and server analytics for your Python server, run from your analytics dashboard."
 readme = "README.md"
 requires-python = ">=3.8"