clue-api 1.0.1.dev76__tar.gz → 1.0.1.dev78__tar.gz

{clue_api-1.0.1.dev76 → clue_api-1.0.1.dev78}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clue-api
-Version: 1.0.1.dev76
+Version: 1.0.1.dev78
 Summary: Clue distributed enrichment service
 License: MIT
 License-File: LICENSE

{clue_api-1.0.1.dev76 → clue_api-1.0.1.dev78}/clue/config.py

@@ -54,7 +54,7 @@ def get_redis():
     """
     from clue.remote.datatypes import get_client
 
-    return get_client(config.core.redis.host, config.core.redis.port, False)
+    return get_client(config.core.redis.host, config.core.redis.port, False, password=config.core.redis.password)
 
 
 cache = forge.cache

{clue_api-1.0.1.dev76 → clue_api-1.0.1.dev78}/clue/remote/datatypes/__init__.py

@@ -89,6 +89,11 @@ def get_client(host, port, private, password=None):
         port = int(port or config.core.redis.port)
         password = config.core.redis.password
 
+    if password:
+        logger.debug("Connecting to redis with password")
+    else:
+        logger.warning("Connecting to redis without authentication.")
+
     ssl_kwargs = {}
 
     # Automatically detect if encryption was enabled
@@ -101,16 +106,20 @@ def get_client(host, port, private, password=None):
         return redis.StrictRedis(host=host, port=port, socket_keepalive=True, password=password, **ssl_kwargs)
     else:
         return redis.StrictRedis(
-            connection_pool=get_pool(host, port, ssl=ssl_kwargs.get("ssl", False)),
+            connection_pool=get_pool(host, port, ssl=ssl_kwargs.get("ssl", False), password=password),
             socket_keepalive=True,
             password=password,
         )
 
 
-def get_pool(host, port, ssl=False):
+def get_pool(host: str, port: int, ssl: bool = False, password: str | None = None):
     key = (host, port)
     connection_class = redis.connection.Connection
     connection_kwargs = {}
+
+    if password:
+        connection_kwargs["password"] = password
+
     if ssl:
         connection_class = redis.connection.SSLConnection  # type: ignore[assignment]
         connection_kwargs = _redis_ssl_kwargs(host)

{clue_api-1.0.1.dev76 → clue_api-1.0.1.dev78}/clue/remote/datatypes/cache.py

@@ -9,8 +9,8 @@ DEFAULT_TTL = 60 * 60  # 1 Hour
 
 
 class RedisCache(object):
-    def __init__(self, prefix="clue_cache", host=None, port=None, ttl=DEFAULT_TTL):
-        self.c = get_client(host, port, False)
+    def __init__(self, prefix="clue_cache", host=None, port=None, ttl=DEFAULT_TTL, password=None):
+        self.c = get_client(host, port, False, password=password)
         self.prefix = prefix
         self.ttl = ttl
 

{clue_api-1.0.1.dev76 → clue_api-1.0.1.dev78}/pyproject.toml

@@ -149,7 +149,7 @@ log_cli_level = "WARN"
 [tool.poetry]
 package-mode = true
 name = "clue-api"
-version = "1.0.1.dev76"
+version = "1.0.1.dev78"
 description = "Clue distributed enrichment service"
 authors = ["Canadian Centre for Cyber Security <contact@cyber.gc.ca>"]
 license = "MIT"