pylookyloo 1.27.0__py3-none-any.whl → 1.28.0__py3-none-any.whl

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):
@@ -46,6 +69,7 @@ class CaptureSettings(TypedDict, total=False):
     locale: str | None
     color_scheme: str | None
     java_script_enabled: bool
+    headless: bool
     viewport: dict[str, int] | None
     referer: str | None
 
@@ -77,7 +101,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)
@@ -154,6 +178,7 @@ class Lookyloo():
                locale: str | None=None,
                color_scheme: str | None=None,
                java_script_enabled: bool=True,
+               headless: bool=True,
                viewport: dict[str, int] | None=None,
                referer: str | None=None,
                listing: bool | None=None,
@@ -177,6 +202,7 @@ class Lookyloo():
                locale: str | None=None,
                color_scheme: str | None=None,
                java_script_enabled: bool | None=None,
+               headless: bool=True,
                viewport: dict[str, int] | None=None,
                referer: str | None=None,
                listing: bool | None=None,
@@ -204,6 +230,7 @@ class Lookyloo():
         :param locale: The locale of the browser
         :param color_scheme: The prefered color scheme of the browser (light or dark)
         :param java_script_enabled: If False, no JS will run during the capture.
+        :param headless: If False, the browser will be headed, it requires the capture to be done on a desktop.
         :param viewport: The viewport of the browser used for capturing
         :param referer: The referer URL for the capture
         :param listing: If False, the capture will be not be on the publicly accessible index page of lookyloo
@@ -257,6 +284,8 @@ class Lookyloo():
                 to_send['color_scheme'] = color_scheme
             if java_script_enabled is not None:
                 to_send['java_script_enabled'] = java_script_enabled
+            if headless is not None:
+                to_send['headless'] = headless
             if viewport:
                 to_send['viewport'] = viewport
             if referer:
@@ -539,6 +568,14 @@ class Lookyloo():
         r = self.session.get(url)
         return r.json()
 
+    def push_from_lacus(self, capture: dict[str, Any]) -> dict[str, Any]:
+        '''Push a capture from Lacus to Lookyloo
+
+        :param capture: The capture to push from Lacus
+        '''
+        r = self.session.post(urljoin(self.root_url, str(PurePosixPath('json', 'upload'))), json=capture)
+        return r.json()
+
     @overload
     def upload_capture(self, *, quiet: Literal[True],
                        listing: bool = False,

{pylookyloo-1.27.0.dist-info → pylookyloo-1.28.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pylookyloo
-Version: 1.27.0
+Version: 1.28.0
 Summary: Python CLI and module for Lookyloo
 License: BSD-3-Clause
 Author: Raphaël Vinot
@@ -22,7 +22,9 @@ Classifier: Programming Language :: Python :: 3.13
 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: requests (>=2.32.3)
 Project-URL: Documentation, https://pylookyloo.readthedocs.io/en/latest/
 Project-URL: Repository, https://github.com/lookyloo/PyLookyloo

pylookyloo-1.28.0.dist-info/RECORD

@@ -0,0 +1,8 @@
+pylookyloo/__init__.py,sha256=_JYXwXHL7ShZkeruvGd8qDTpxNRfuDjvV65SOMMU6yc,1922
+pylookyloo/api.py,sha256=h6v4hf4HtxUD-pf4uEKSurMw_QYnpcgYUBk3dv7v1Nc,30733
+pylookyloo/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pylookyloo-1.28.0.dist-info/LICENSE,sha256=4C4hLYrIkUD96Ggk-y_Go1Qf7PBZrEm9PSeTGe2nd4s,1516
+pylookyloo-1.28.0.dist-info/METADATA,sha256=mG1xvmCC10QP-yBYZ4PkfI8NVLiZe9f8HOAHLeydKrY,2347
+pylookyloo-1.28.0.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+pylookyloo-1.28.0.dist-info/entry_points.txt,sha256=y2c0Ujg8co6Xyf7MoxStVU-fLQMZBSGAg-KFidmsha4,44
+pylookyloo-1.28.0.dist-info/RECORD,,

{pylookyloo-1.27.0.dist-info → pylookyloo-1.28.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.0.1
+Generator: poetry-core 2.1.1
 Root-Is-Purelib: true
 Tag: py3-none-any

pylookyloo-1.27.0.dist-info/RECORD

@@ -1,8 +0,0 @@
-pylookyloo/__init__.py,sha256=_JYXwXHL7ShZkeruvGd8qDTpxNRfuDjvV65SOMMU6yc,1922
-pylookyloo/api.py,sha256=b9pzLGap2hCMZgdmOQ4-9JErU6aTTF4WQPJih24BoxU,28921
-pylookyloo/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pylookyloo-1.27.0.dist-info/LICENSE,sha256=4C4hLYrIkUD96Ggk-y_Go1Qf7PBZrEm9PSeTGe2nd4s,1516
-pylookyloo-1.27.0.dist-info/METADATA,sha256=sTFungmhlKsMWBp6ObbZl4BnUk6cQJe60O0UDHH2-_k,2266
-pylookyloo-1.27.0.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-pylookyloo-1.27.0.dist-info/entry_points.txt,sha256=y2c0Ujg8co6Xyf7MoxStVU-fLQMZBSGAg-KFidmsha4,44
-pylookyloo-1.27.0.dist-info/RECORD,,