Merge branch 'main' into main

CERT-Polska · Mar 5, 2024 · bbdeedf · bbdeedf
2 parents 294e569 + 991b69f
commit bbdeedf
Show file tree

Hide file tree

Showing 25 changed files with 505 additions and 255 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -30,6 +30,7 @@ repos:
     - prometheus-client==0.17.1
     - pymongo-stubs==0.2.0
     - requests_mock==1.11.0
+    - sqlalchemy-stubs==0.4
     - typer==0.9.0
     - types-beautifulsoup4==4.12.0.6
     - types-Markdown==3.4.2.10

diff --git a/artemis/api.py b/artemis/api.py
@@ -53,7 +53,7 @@ def get_analyses_table(
     start: int = Query(),
     length: int = Query(),
 ) -> Dict[str, Any]:
-    ordering = _get_ordering(request, column_names=["payload.data", "payload_persistent.tag", None, None])
+    ordering = _get_ordering(request, column_names=["target", "tag", None, None])
     search_query = _get_search_query(request)
 
     karton_state = KartonState(backend=KartonBackend(config=KartonConfig()))
@@ -62,16 +62,17 @@ def get_analyses_table(
 
     entries = []
     for entry in result.data:
-        if entry["_id"] in karton_state.analyses:
-            num_active_tasks = len(karton_state.analyses[entry["_id"]].pending_tasks)
+        if entry["id"] in karton_state.analyses:
+            num_active_tasks = len(karton_state.analyses[entry["id"]].pending_tasks)
         else:
             num_active_tasks = 0
 
         entries.append(
             {
-                "payload": entry["payload"],
-                "payload_persistent": entry["payload_persistent"],
-                "id": entry["_id"],
+                "id": entry["id"],
+                "tag": entry["tag"],
+                "payload": entry["task"]["payload"],
+                "payload_persistent": entry["task"]["payload_persistent"],
                 "num_active_tasks": num_active_tasks,
                 "stopped": entry.get("stopped", None),
             }
@@ -96,7 +97,7 @@ def get_task_results_table(
 ) -> Dict[str, Any]:
     ordering = _get_ordering(
         request,
-        column_names=["created_at", "tag", "headers.receiver", "target_string", None, "status_reason"],
+        column_names=["created_at", "tag", "receiver", "target_string", None, "status_reason"],
     )
     search_query = _get_search_query(request)
 

diff --git a/artemis/config.py b/artemis/config.py
@@ -13,14 +13,21 @@ def get_config(name: str, **kwargs) -> Any:  # type: ignore
 
 class Config:
     class Data:
-        DB_CONN_STR: Annotated[str, "Connection string to the MongoDB database."] = get_config("DB_CONN_STR")
-
+        POSTGRES_CONN_STR: Annotated[str, "Connection string to the PostgreSQL database."] = get_config(
+            "POSTGRES_CONN_STR"
+        )
         REDIS_CONN_STR: Annotated[str, "Connection string to Redis."] = get_config("REDIS_CONN_STR")
 
+        LEGACY_MONGODB_CONN_STR: Annotated[
+            str,
+            "Connection string to the MongoDB database. MongoDB is not used anymore - it is present here to seamlessly "
+            "migrate data from older Artemis versions to PostgreSQL.",
+        ] = get_config("DB_CONN_STR")
+
     class Reporting:
         REPORTING_MAX_VULN_AGE_DAYS: Annotated[
             int, "When creating e-mail reports, what is the vulnerability maximum age (in days) for it to be reported."
-        ] = get_config("REPORTING_MAX_VULN_AGE_DAYS", default=50, cast=int)
+        ] = get_config("REPORTING_MAX_VULN_AGE_DAYS", default=60, cast=int)
 
         REPORTING_SEPARATE_INSTITUTIONS: Annotated[
             List[str],