authcaptureproxy 1.3.7__tar.gz → 1.3.9__tar.gz

{authcaptureproxy-1.3.7 → authcaptureproxy-1.3.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: authcaptureproxy
-Version: 1.3.7
+Version: 1.3.9
 Summary: A Python project to create a proxy to capture authentication information from a webpage. This is useful to capture oauth login details without access to a third-party oauth.
 License-Expression: Apache-2.0
 License-File: LICENSE.txt
@@ -8,12 +8,14 @@ Author: Alan D. Tse
 Author-email: alandtse@gmail.com
 Maintainer: Alan D. Tse
 Maintainer-email: alandtse@gmail.com
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 Classifier: Development Status :: 3 - Alpha
 Classifier: Natural Language :: English
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Intended Audience :: Developers
 Classifier: Operating System :: OS Independent
 Classifier: Environment :: Console

{authcaptureproxy-1.3.7 → authcaptureproxy-1.3.9}/authcaptureproxy/__init__.py

@@ -4,9 +4,10 @@
 from __future__ import annotations
 
 import logging
-from pathlib import Path
 from email.message import Message
-from importlib.metadata import PackageNotFoundError, metadata as __load
+from importlib.metadata import PackageNotFoundError
+from importlib.metadata import metadata as __load
+from pathlib import Path
 from typing import cast
 
 from authcaptureproxy import const
@@ -36,7 +37,7 @@ metadata: Message | None = None
 
 try:
     md = cast(Message, __load(pkg))  # typed as Message so .get() is valid
-    metadata = md                    # keep public handle for cli.py
+    metadata = md  # keep public handle for cli.py
 
     __uri__ = md.get("Home-page") or md.get("Home-Page") or ""
     __title__ = md.get("Name") or ""
@@ -45,12 +46,7 @@ try:
     __version__ = md.get("Version") or ""
     __author__ = md.get("Author") or ""
     __maintainer__ = md.get("Maintainer") or ""
-    __contact__ = (
-        md.get("Author-email")
-        or md.get("Maintainer-email")
-        or md.get("Maintainer")
-        or ""
-    )
+    __contact__ = md.get("Author-email") or md.get("Maintainer-email") or md.get("Maintainer") or ""
 
 except PackageNotFoundError:  # pragma: no cover
     logger.error("Could not load package metadata for %s. Is it installed?", pkg)

{authcaptureproxy-1.3.7 → authcaptureproxy-1.3.9}/authcaptureproxy/auth_capture_proxy.py

@@ -1,12 +1,13 @@
 #  SPDX-License-Identifier: Apache-2.0
 """Python Package for auth capture proxy."""
+
 import asyncio
 import logging
-import posixpath
 import re
 from functools import partial
+from html import escape, unescape
 from json import JSONDecodeError
-from ssl import SSLContext, create_default_context
+from ssl import SSLContext
 from typing import Any, Callable, Dict, List, Optional, Set, Text, Tuple, Union
 
 import httpx
@@ -31,9 +32,6 @@ from authcaptureproxy.helper import (
 from authcaptureproxy.interceptor import BaseInterceptor, InterceptContext
 from authcaptureproxy.stackoverflow import get_open_port
 
-# Pre-configure SSL context
-ssl_context = create_default_context()
-
 _LOGGER = logging.getLogger(__name__)
 
 
@@ -62,7 +60,7 @@ class AuthCaptureProxy:
         """
         self._preserve_headers = preserve_headers
         self.session_factory: Callable[[], httpx.AsyncClient] = session_factory or (
-            lambda: httpx.AsyncClient(verify=ssl_context)
+            lambda: httpx.AsyncClient(verify=True)
         )
         self.session: httpx.AsyncClient = session if session else self.session_factory()
         self._proxy_url: URL = proxy_url
@@ -686,7 +684,6 @@ class AuthCaptureProxy:
             # Resolve relative form actions BEFORE modifiers run.
             if text and content_type == "text/html" and resp and resp.url:
                 _resp_url = URL(str(resp.url))
-                _resp_dir = _resp_url.path.rsplit("/", 1)[0] + "/" if "/" in _resp_url.path else "/"
 
                 def _resolve_form_action(form_match):
                     """Resolve relative action URLs only inside <form> tags."""
@@ -698,10 +695,13 @@ class AuthCaptureProxy:
                     if action and not action.startswith(
                         ("http://", "https://", "//", "#", "javascript:", "/")
                     ):
-                        resolved_path = posixpath.normpath(_resp_dir + action)
+                        resolved_url = _resp_url.join(URL(unescape(action)))
                         _proxy_base = self.access_url().path.rstrip("/")
                         abs_url = str(
-                            self.access_url().with_path(_proxy_base + resolved_path).with_query({})
+                            self.access_url()
+                            .with_path(_proxy_base + resolved_url.path)
+                            .with_query(resolved_url.query)
+                            .with_fragment(resolved_url.fragment)
                         )
                         _LOGGER.debug(
                             "Resolved relative form action '%s' -> '%s' (page: %s)",
@@ -709,7 +709,11 @@ class AuthCaptureProxy:
                             abs_url,
                             _resp_url.path,
                         )
-                        return form_tag[: action_m.start(2)] + abs_url + form_tag[action_m.end(2) :]
+                        return (
+                            form_tag[: action_m.start(2)]
+                            + escape(abs_url, quote=True)
+                            + form_tag[action_m.end(2) :]
+                        )
                     return form_tag
 
                 text = re.sub(
@@ -754,9 +758,11 @@ class AuthCaptureProxy:
         # pass through non parsed content
         _LOGGER.debug(
             "Passing through %s as %s",
-            URL(str(request.url)).name
-            if URL(str(request.url)).name
-            else URL(str(request.url)).path,
+            (
+                URL(str(request.url)).name
+                if URL(str(request.url)).name
+                else URL(str(request.url)).path
+            ),
             content_type,
         )
         return await self._build_response(resp, body=resp.content, content_type=content_type)
@@ -893,18 +899,25 @@ class AuthCaptureProxy:
             result["Referer"] = self._swap_proxy_and_host(
                 result.get("Referer", ""), domain_only=True
             )
-        for item in [
-            "Content-Length",
-            "X-Forwarded-For",
-            "X-Forwarded-Host",
-            "X-Forwarded-Port",
-            "X-Forwarded-Proto",
-            "X-Forwarded-Scheme",
-            "X-Forwarded-Server",
-            "X-Real-IP",
-        ]:
-            # remove proxy headers
-            if result.get(item):
+        # Remove hop-by-hop and reverse-proxy/CDN headers that must not be forwarded
+        # upstream. Besides leaking client info, these can carry non-ASCII values (e.g.
+        # Cloudflare's "cf-ipcity: Mérida") that break httpx header encoding. Matching is
+        # case-insensitive because HTTP/2 front-ends (e.g. Cloudflare) lowercase header
+        # names, so exact-case matching would silently miss them.
+        proxy_headers = {
+            "content-length",
+            "x-forwarded-for",
+            "x-forwarded-host",
+            "x-forwarded-port",
+            "x-forwarded-proto",
+            "x-forwarded-scheme",
+            "x-forwarded-server",
+            "x-real-ip",
+            "cdn-loop",
+        }
+        for item in list(result):
+            lowered = item.lower()
+            if lowered in proxy_headers or lowered.startswith("cf-"):
                 result.pop(item)
         result.update(self.headers if self.headers else {})
         _LOGGER.debug("Final headers %s", result)

{authcaptureproxy-1.3.7 → authcaptureproxy-1.3.9}/authcaptureproxy/cli.py

@@ -119,7 +119,7 @@ async def proxy_example(
                 "autofill": partial(
                     autofill,
                     {
-                        "password": "CHANGEME",
+                        "password": "CHANGEME",  # nosec B105: Example autofill placeholder.
                     },
                 )
             }

{authcaptureproxy-1.3.7 → authcaptureproxy-1.3.9}/authcaptureproxy/const.py

@@ -4,4 +4,5 @@ Python Package for auth capture proxy.
 
 Constants
 """
+
 SKIP_AUTO_HEADERS = "_skip_auto_headers_"

{authcaptureproxy-1.3.7 → authcaptureproxy-1.3.9}/authcaptureproxy/examples/amazon_waf.py

@@ -10,6 +10,7 @@ This interceptor handles:
 - P shim and jQuery shim injection for Amazon's A-framework in AJAX responses
 - Submit blocker and AJAX proxy injection for CVF full-page navigations
 """
+
 import base64
 import json as _json
 import logging

{authcaptureproxy-1.3.7 → authcaptureproxy-1.3.9}/authcaptureproxy/examples/modifiers.py

@@ -4,10 +4,11 @@ Python Package for auth capture proxy.
 
 Example modifiers.
 """
+
 import logging
 import re
 from functools import partial
-from typing import Callable, Dict, List, Optional, Text
+from typing import Callable, Dict, List, Optional, Text, cast
 
 from bs4 import BeautifulSoup  # type: ignore[import]
 from yarl import URL
@@ -207,7 +208,7 @@ async def find_urls_bs4(
                 # this currently only handles background-image as the first attribute
                 # TODO: Rewrite regex to handle general case
                 pattern = r"(?<=style=[\"']background-image:url\([\"']).*(?=[\"']\))"
-                attribute_value = html_tag.get(attribute)
+                attribute_value = cast(str, html_tag.get(attribute))
                 url: Optional[URL] = URL(str(re.search(pattern, attribute_value)))
                 if url is not None and url not in exceptions.get(tag, []):
                     new_value = re.sub(
@@ -224,7 +225,11 @@ async def find_urls_bs4(
                             html_tag[attribute],
                         )
             else:
-                url = URL(html_tag.get(attribute)) if html_tag.get(attribute) is not None else None
+                url = (
+                    URL(cast(str, html_tag.get(attribute)))
+                    if html_tag.get(attribute) is not None
+                    else None
+                )
                 if (
                     url is not None
                     and not str(url).startswith("data:")

{authcaptureproxy-1.3.7 → authcaptureproxy-1.3.9}/authcaptureproxy/helper.py

@@ -5,7 +5,6 @@ Python Package for auth capture proxy.
 Helper files.
 """
 
-import ast
 import json
 import logging
 import re
@@ -39,11 +38,11 @@ def print_resp(resp: Union[httpx.Response, ClientResponse]) -> None:
     method = resp.request.method
     status = resp.status_code
     reason = resp.reason_phrase
-    headers = ast.literal_eval(str(resp.request.headers)[8:-1])
+    headers: Dict[str, Any] = dict(resp.request.headers)
     cookies = {}
     if headers.get("cookie"):
         cookie: SimpleCookie = SimpleCookie()
-        cookie.load(headers.get("cookie"))
+        cookie.load(headers["cookie"])
         for key, morsel in cookie.items():
             cookies[key] = morsel.value
         headers["cookie"] = cookies
@@ -74,13 +73,11 @@ def print_resp_aiohttp(resp: ClientResponse) -> None:
     method = resp.request_info.method
     status = resp.status
     reason = resp.reason
-    headers = ast.literal_eval(
-        str(resp.request_info.headers).replace("<CIMultiDictProxy(", "{").replace(")>", "}")
-    )
+    headers: Dict[str, Any] = dict(resp.request_info.headers)
     cookies = {}
     if headers.get("Cookie"):
         cookie: SimpleCookie = SimpleCookie()
-        cookie.load(headers.get("Cookie"))
+        cookie.load(headers["Cookie"])
         for key, morsel in cookie.items():
             cookies[key] = morsel.value
         headers["Cookie"] = cookies

{authcaptureproxy-1.3.7 → authcaptureproxy-1.3.9}/authcaptureproxy/interceptor.py

@@ -4,6 +4,7 @@ Python Package for auth capture proxy.
 
 Interceptor base classes for extending the proxy pipeline.
 """
+
 from dataclasses import dataclass
 from typing import Any, Dict, Optional, Text
 

{authcaptureproxy-1.3.7 → authcaptureproxy-1.3.9}/authcaptureproxy/stackoverflow.py

@@ -4,6 +4,7 @@ Python Package auth capture proxy.
 
 This is code borrowed from stack overflow.
 """
+
 import socket
 from typing import Text
 

{authcaptureproxy-1.3.7 → authcaptureproxy-1.3.9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [project]
 name = "authcaptureproxy"
-version = "1.3.7"
+version = "1.3.9"
 description = "A Python project to create a proxy to capture authentication information from a webpage. This is useful to capture oauth login details without access to a third-party oauth."
 readme = "README.md"
 authors = [
@@ -18,15 +18,17 @@ classifiers = [
     "Development Status :: 3 - Alpha",
     "Natural Language :: English",
     "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.8",
-    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Intended Audience :: Developers",
     "Operating System :: OS Independent",
     "Environment :: Console",
     "Topic :: Software Development :: Libraries :: Python Modules",
 ]
 keywords = [""]
-requires-python = ">=3.10"
+requires-python = ">=3.11"
 dependencies = [
     "typer>=0.3, <1.0",
     "aiohttp>=3.0.0, <4.0.0",
@@ -58,7 +60,7 @@ coverage = { extras = ["toml"], version = "^5" }
 flake8 = ">=3.9, <8.0"
 flake8-bugbear = ">=20.11, <25.0"
 flake8-docstrings = "^1"
-pre-commit = ">=3.2, <4.0"
+pre-commit = ">=3.5.0"
 pre-commit-hooks = ">=3.4, <4.0"
 pytest = "^7"
 pytest-cov = "^2"
@@ -88,7 +90,7 @@ align = true
 [tool.tyrannosaurus.sources]
 pycompatversions = "project.dependencies"
 pytoxversions = "project.dependencies"
-pymetaversion = "'3.9'"
+pymetaversion = "'3.11'"
 metavm = "'ubuntu-latest'"
 devdeps = "tool.poetry.group.dev.dependencies"
 status = "'Development'"
@@ -145,10 +147,16 @@ filename = "NEWS.md"
 [tool.semantic_release]
 version_toml = ["pyproject.toml:project.version"]
 major_on_zero = true
-branch = "main"
-upload_to_pypi = true
-upload_to_release = true
-build_command = "pip install poetry && poetry build"
+assets = ["poetry.lock"]
+build_command = "pip install poetry && poetry lock && poetry build"
+
+[tool.semantic_release.publish]
+upload_to_vcs_release = true
+
+[tool.semantic_release.branches.main]
+match = "(main|master)"
+prerelease_token = "rc"
+prerelease = false
 
 [tool.coverage.paths]
 source = ["authcaptureproxy"]
@@ -162,7 +170,7 @@ show_missing = true
 
 [tool.black]
 line-length = 100
-target-version = ["py38"]
+target-version = ["py311"]
 
 [tool.isort]
 line_length = 100