howler-api 3.1.0.dev390__tar.gz → 3.1.0.dev392__tar.gz

{howler_api-3.1.0.dev390 → howler_api-3.1.0.dev392}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: howler-api
-Version: 3.1.0.dev390
+Version: 3.1.0.dev392
 Summary: Howler - API server
 License: MIT
 Keywords: howler,alerting,gc,canada,cse-cst,cse,cst,cyber,cccs

{howler_api-3.1.0.dev390 → howler_api-3.1.0.dev392}/howler/datastore/collection.py

@@ -377,10 +377,10 @@ class ESCollection(Generic[ModelType]):
                 elasticsearch.exceptions.AuthenticationException,
             ) as e:
                 if not isinstance(e, SearchRetryException):
-                    logger.warning(
+                    logger.exception(
                         f"No connection to Elasticsearch server(s): "
                         f"{' | '.join(self.datastore.get_hosts(safe=True))}"
-                        f", because [{e}] retrying {func.__name__}..."
+                        f", because [{str(e)}] retrying {func.__name__}..."  # noqa: TRY401
                     )
 
                 time.sleep(min(retries, self.MAX_RETRY_BACKOFF))

{howler_api-3.1.0.dev390 → howler_api-3.1.0.dev392}/howler/datastore/store.py

@@ -4,18 +4,28 @@ import logging
 import os
 import re
 from os import environ
+from pathlib import Path
 from typing import Any, Optional, cast
 from urllib.parse import urlparse
 
 import elasticsearch
 import elasticsearch.client
 
+from howler.common.logging.format import HWL_DATE_FORMAT, HWL_LOG_FORMAT
 from howler.datastore.collection import ESCollection
 from howler.datastore.exceptions import DataStoreException
 from howler.odm.models.config import Config
 from howler.odm.models.config import config as _config
 
 TRANSPORT_TIMEOUT = int(environ.get("HWL_DATASTORE_TRANSPORT_TIMEOUT", "10"))
+CERTS_PATH = Path(os.environ.get("HWL_CERT_DIRECTORY", "/etc/howler/certs"))
+
+logger = logging.getLogger("howler.datastore.store")
+logger.setLevel(logging.INFO)
+console = logging.StreamHandler()
+console.setLevel(logging.INFO)
+console.setFormatter(logging.Formatter(HWL_LOG_FORMAT, HWL_DATE_FORMAT))
+logger.addHandler(console)
 
 
 class ESStore(object):
@@ -58,9 +68,23 @@ class ESStore(object):
         self._username: Optional[str] = None
         self._password: Optional[str] = None
         self._hosts = []
+        self._cert: str | None = None
 
         for host in config.datastore.hosts:
             self._hosts.append(str(host))
+
+            cert = CERTS_PATH / f"{host.name}.crt"
+            if cert.exists():
+                if self._cert is None:
+                    self._cert = str(cert)
+                    logger.info("Using certificate %s for elasticsearch network traffic", self._cert)
+                else:
+                    logger.error("Only a single certificate path is supported - ignoring additional paths.")
+                    logger.error(
+                        "If you have multiple certificates, bundle them into a single .pem file and specify "
+                        "it for the first host."
+                    )
+
             if os.getenv(f"{host.name.upper()}_HOST_APIKEY_ID", None) is not None:
                 self._apikey = (
                     os.environ[f"{host.name.upper()}_HOST_APIKEY_ID"],
@@ -81,6 +105,7 @@ class ESStore(object):
         if self._apikey is not None:
             self.client = elasticsearch.Elasticsearch(
                 hosts=self._hosts,  # type: ignore
+                ca_certs=self._cert,  # type: ignore
                 api_key=self._apikey,
                 max_retries=0,
                 request_timeout=TRANSPORT_TIMEOUT,
@@ -88,6 +113,7 @@ class ESStore(object):
         elif self._username is not None and self._password is not None:
             self.client = elasticsearch.Elasticsearch(
                 hosts=self._hosts,  # type: ignore
+                ca_certs=self._cert,  # type: ignore
                 basic_auth=(self._username, self._password),
                 max_retries=0,
                 request_timeout=TRANSPORT_TIMEOUT,
@@ -95,6 +121,7 @@ class ESStore(object):
         else:
             self.client = elasticsearch.Elasticsearch(
                 hosts=self._hosts,  # type: ignore
+                ca_certs=self._cert,  # type: ignore
                 max_retries=0,
                 request_timeout=TRANSPORT_TIMEOUT,
             )

{howler_api-3.1.0.dev390 → howler_api-3.1.0.dev392}/pyproject.toml

@@ -148,7 +148,7 @@ suppress-none-returning = true
 [tool.poetry]
 package-mode = true
 name = "howler-api"
-version = "3.1.0.dev390"
+version = "3.1.0.dev392"
 description = "Howler - API server"
 authors = [
     "Canadian Centre for Cyber Security <howler@cyber.gc.ca>",