lacuscore 1.12.1__tar.gz → 1.12.3__tar.gz

{lacuscore-1.12.1 → lacuscore-1.12.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lacuscore
-Version: 1.12.1
+Version: 1.12.3
 Summary: Core of Lacus, usable as a module
 Home-page: https://github.com/ail-project/LacusCore
 License: BSD-3-Clause
@@ -29,7 +29,7 @@ Requires-Dist: async-timeout (>=4.0.3,<5.0.0) ; python_version < "3.11"
 Requires-Dist: defang (>=0.5.3,<0.6.0)
 Requires-Dist: dnspython (>=2.7.0,<3.0.0) ; python_version >= "3.9"
 Requires-Dist: eval-type-backport (>=0.2.0,<0.3.0) ; python_version < "3.10"
-Requires-Dist: playwrightcapture[recaptcha] (>=1.27.0,<2.0.0)
+Requires-Dist: playwrightcapture[recaptcha] (>=1.27.1,<2.0.0)
 Requires-Dist: pydantic (>=2.9.2,<3.0.0)
 Requires-Dist: redis[hiredis] (>=5.2.0,<6.0.0)
 Requires-Dist: requests (>=2.32.3,<3.0.0)

{lacuscore-1.12.1 → lacuscore-1.12.3}/lacuscore/lacuscore.py

@@ -82,6 +82,7 @@ class LacusCore():
 
     :param redis_connector: Pre-configured connector to a redis instance.
     :param max_capture_time: If the capture takes more than that time, break (in seconds)
+    :param expire_results: The capture results are stored in redis. Expire them after they are done (in seconds).
     :param tor_proxy: URL to a SOCKS 5 tor proxy. If you have tor installed, this is the default: socks5://127.0.0.1:9050.
     :param only_global_lookups: Discard captures that point to non-public IPs.
     :param max_retries: How many times should we re-try a capture if it failed.
@@ -89,6 +90,7 @@ class LacusCore():
 
     def __init__(self, redis_connector: Redis[bytes], /, *,
                  max_capture_time: int=3600,
+                 expire_results: int=36000,
                  tor_proxy: str | None=None,
                  only_global_lookups: bool=True,
                  max_retries: int=3,
@@ -97,6 +99,7 @@ class LacusCore():
         self.master_logger.setLevel(loglevel)
         self.redis = redis_connector
         self.max_capture_time = max_capture_time
+        self.expire_results = expire_results
         self.tor_proxy = tor_proxy
         self.only_global_lookups = only_global_lookups
         self.max_retries = max_retries
@@ -620,6 +623,8 @@ class LacusCore():
                             self._store_capture_response(p, uuid, result)
                         else:
                             logger.warning('Got no result at all for the capture.')
+                            result = {'error': 'No result at all for the capture, Playwright failed.'}
+                            self._store_capture_response(p, uuid, result)
                         p.delete(f'lacus:capture_settings:{uuid}')
                         p.zrem('lacus:ongoing', uuid)
                         p.execute()
@@ -679,7 +684,7 @@ class LacusCore():
         if hash_to_set:
             pipeline.hset(root_key, mapping=hash_to_set)  # type: ignore[arg-type]
             # Make sure the key expires
-            pipeline.expire(root_key, 36000)
+            pipeline.expire(root_key, self.expire_results)
         else:
             logger.critical(f'Nothing to store (Hash: {hash_to_set}) for {root_key}')
 
@@ -765,7 +770,7 @@ class LacusCore():
                     continue
                 raise e
             except DNSException as e:
-                logger.info(f'No A record for "{hostname}": {e}')
+                logger.debug(f'No A record for "{hostname}": {e}')
             break
 
         _current_retries = 0
@@ -781,6 +786,6 @@ class LacusCore():
                     continue
                 raise e
             except DNSException as e:
-                logger.info(f'No AAAA record for "{hostname}": {e}')
+                logger.debug(f'No AAAA record for "{hostname}": {e}')
             break
         return resolved_ips

{lacuscore-1.12.1 → lacuscore-1.12.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "lacuscore"
-version = "1.12.1"
+version = "1.12.3"
 description = "Core of Lacus, usable as a module"
 authors = ["Raphaël Vinot <raphael.vinot@circl.lu>"]
 license = "BSD-3-Clause"
@@ -34,7 +34,7 @@ Sphinx = [
    {version = "^7.2", python = ">=3.9,<3.10", optional = true},
    {version = "^8", python = ">=3.10", optional = true}
 ]
-playwrightcapture = {extras = ["recaptcha"], version = "^1.27.0"}
+playwrightcapture = {extras = ["recaptcha"], version = "^1.27.1"}
 defang = "^0.5.3"
 ua-parser = "^0.18.0"
 redis = {version = "^5.2.0", extras = ["hiredis"]}