pylookyloo 1.27.1__tar.gz → 1.28.1__tar.gz

{pylookyloo-1.27.1 → pylookyloo-1.28.1}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.3
 Name: pylookyloo
-Version: 1.27.1
+Version: 1.28.1
 Summary: Python CLI and module for Lookyloo
-License: BSD-3-Clause
+License: GPL-2.0-or-later
 Author: Raphaël Vinot
 Author-email: raphael.vinot@circl.lu
 Requires-Python: >=3.9
@@ -11,7 +11,7 @@ Classifier: Environment :: Console
 Classifier: Intended Audience :: Information Technology
 Classifier: Intended Audience :: Science/Research
 Classifier: Intended Audience :: Telecommunications Industry
-Classifier: License :: OSI Approved :: BSD License
+Classifier: License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
@@ -23,8 +23,8 @@ Classifier: Topic :: Internet
 Classifier: Topic :: Security
 Provides-Extra: docs
 Provides-Extra: examples
-Requires-Dist: Sphinx (>=8.1.3) ; (python_version >= "3.10") and (extra == "docs")
-Requires-Dist: pylacus (>=1.12.1) ; extra == "examples"
+Requires-Dist: Sphinx (>=8.2.3) ; (python_version >= "3.11") and (extra == "docs")
+Requires-Dist: pylacus (>=1.13.2) ; extra == "examples"
 Requires-Dist: requests (>=2.32.3)
 Project-URL: Documentation, https://pylookyloo.readthedocs.io/en/latest/
 Project-URL: Repository, https://github.com/lookyloo/PyLookyloo

{pylookyloo-1.27.1 → pylookyloo-1.28.1}/pylookyloo/api.py

@@ -17,6 +17,29 @@ import requests
 
 from urllib3.util import Retry
 from requests.adapters import HTTPAdapter
+from requests.sessions import Session
+from requests.status_codes import codes
+
+
+class SafeRedirectRePOSTSession(Session):
+
+    def rebuild_method(self, prepared_request: requests.PreparedRequest, response: requests.Response) -> None:
+        # This method will resubmit a POST when we have a http -> https redirect
+        if response.status_code == codes.moved and prepared_request.method == 'POST':
+            # make sure it is just a redirect http->https and we're not going to a different host
+            prec_url = urlparse(response.url)
+            next_url = urlparse(prepared_request.url)
+
+            if (prec_url.netloc != next_url.netloc or prec_url.scheme != 'http'
+                    or next_url.scheme != 'https'):
+                super().rebuild_method(prepared_request, response)
+            else:
+                # For surely good reasons, requests force-remove the body of the redirected requests unless the statuscode is either 307 or 308
+                # https://github.com/psf/requests/issues/1084
+                # Doing that makes sure we keep it
+                response.status_code = 307
+        else:
+            super().rebuild_method(prepared_request, response)
 
 
 class PyLookylooError(Exception):
@@ -39,6 +62,7 @@ class CaptureSettings(TypedDict, total=False):
     proxy: str | dict[str, str] | None
     general_timeout_in_sec: int | None
     cookies: list[dict[str, Any]] | None
+    storage: str | dict[str, Any] | None
     headers: str | dict[str, str] | None
     http_credentials: dict[str, int] | None
     geolocation: dict[str, float] | None
@@ -78,7 +102,7 @@ class Lookyloo():
             self.root_url = 'http://' + self.root_url
         if not self.root_url.endswith('/'):
             self.root_url += '/'
-        self.session = requests.session()
+        self.session = SafeRedirectRePOSTSession()
         self.session.headers['user-agent'] = useragent if useragent else f'PyLookyloo / {version("pylookyloo")}'
         if proxies:
             self.session.proxies.update(proxies)
@@ -148,6 +172,7 @@ class Lookyloo():
                proxy: str | dict[str, str] | None=None,
                general_timeout_in_sec: int | None=None,
                cookies: list[dict[str, Any]] | None=None,
+               storage: str | dict[str, Any] | None=None,
                headers: str | dict[str, str] | None=None,
                http_credentials: dict[str, int] | None=None,
                geolocation: dict[str, float] | None=None,
@@ -172,6 +197,7 @@ class Lookyloo():
                proxy: str | dict[str, str] | None=None,
                general_timeout_in_sec: int | None=None,
                cookies: list[dict[str, Any]] | None=None,
+               storage: str | dict[str, Any] | None=None,
                headers: str | dict[str, str] | None=None,
                http_credentials: dict[str, int] | None=None,
                geolocation: dict[str, float] | None=None,
@@ -247,6 +273,8 @@ class Lookyloo():
                 to_send['general_timeout_in_sec'] = general_timeout_in_sec
             if cookies:
                 to_send['cookies'] = cookies
+            if storage:
+                to_send['storage'] = storage
             if headers:
                 to_send['headers'] = headers
             if http_credentials:
@@ -402,6 +430,14 @@ class Lookyloo():
         r = self.session.get(urljoin(self.root_url, str(PurePosixPath('json', capture_uuid, 'cookies'))))
         return r.json()
 
+    def get_storage(self, capture_uuid: str) -> dict[str, Any]:
+        '''Returns the complete storage state.
+
+        :param capture_uuid: UUID of the capture
+        '''
+        r = self.session.get(urljoin(self.root_url, str(PurePosixPath('json', capture_uuid, 'storage'))))
+        return r.json()
+
     def get_html(self, capture_uuid: str) -> StringIO:
         '''Returns the rendered HTML as it would be in the browser after the page loaded.
 

{pylookyloo-1.27.1 → pylookyloo-1.28.1}/pyproject.toml

@@ -1,11 +1,11 @@
 [project]
 name = "pylookyloo"
-version = "1.27.1"
+version = "1.28.1"
 description = "Python CLI and module for Lookyloo"
 authors = [
     {name="Raphaël Vinot", email="raphael.vinot@circl.lu"}
 ]
-license = "BSD-3-Clause"
+license = "GPL-2.0-or-later"
 readme = "README.md"
 requires-python = ">=3.9"
 
@@ -36,13 +36,13 @@ classifiers = [
 lookyloo = 'pylookyloo:main'
 
 [project.optional-dependencies]
-docs = ["Sphinx (>=8.1.3) ; python_version >= \"3.10\""]
-examples = ["pylacus (>=1.12.1)"]
+docs = ["Sphinx (>=8.2.3) ; python_version >= \"3.11\""]
+examples = ["pylacus (>=1.13.2)"]
 
 [tool.poetry.group.dev.dependencies]
 mypy = "^1.15.0"
-types-requests = "^2.32.0.20241016"
-pytest = "^8.3.4"
+types-requests = "^2.32.0.20250328"
+pytest = "^8.3.5"
 
 [build-system]
 requires = ["poetry-core>=2.0"]