Merge branch 'main' into make-httpx-timeout-configurable

minvws · Nov 4, 2024 · 954aed8 · 954aed8
2 parents 8abcb03 + 5439599
commit 954aed8
Show file tree

Hide file tree

Showing 28 changed files with 375 additions and 293 deletions.
diff --git a/README.rst b/README.rst
@@ -79,4 +79,4 @@ An OpenKAT installation requires user accounts for users to be able to log in. T
 Security
 ========
 
-OpenKAT is designed to be secure by default in its production setup. In the development setup some debugging flags are enabled by default and it will not include TLS out of the box. To set up a secure production OpenKAT install, please follow the `Production setup guidelines <https://docs.openkat.nl/installation_and_deployment/install.html#production-environments>`_ and `Hardening guidelines <https://docs.openkat.nl/installation_and_deployment/hardening.html>`_.
+OpenKAT is designed to be secure by default in its production setup. In the development setup some debugging flags are enabled by default and it will not include TLS out of the box. To set up a secure production OpenKAT install, please follow the `Production setup guidelines <https://docs.openkat.nl/installation-and-deployment/install.html#production-environments>`_ and `Hardening guidelines <https://docs.openkat.nl/installation-and-deployment/hardening.html>`_.
diff --git a/boefjes/poetry.lock b/boefjes/poetry.lock
diff --git a/boefjes/pyproject.toml b/boefjes/pyproject.toml
@@ -74,7 +74,7 @@ fastapi-slim = "^0.115.2"
 structlog = "^24.2.0"
 # required by kat_maxmind_geoip
 maxminddb = "^2.6.2"
-croniter = "^3.0.3"
+croniter = "^5.0.1"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^8.2.0"

diff --git a/boefjes/requirements-dev.txt b/boefjes/requirements-dev.txt
@@ -376,9 +376,9 @@ coverage[toml]==7.6.1 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:f5796e664fe802da4f57a168c85359a8fbf3eab5e55cd4e4569fbacecc903959 \
     --hash=sha256:fc5a77d0c516700ebad189b587de289a20a78324bc54baee03dd486f0855d234 \
     --hash=sha256:fd21f6ae3f08b41004dfb433fa895d858f3f5979e7762d052b12aef444e29afc
-croniter==3.0.3 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:34117ec1741f10a7bd0ec3ad7d8f0eb8fa457a2feb9be32e6a2250e158957668 \
-    --hash=sha256:b3bd11f270dc54ccd1f2397b813436015a86d30ffc5a7a9438eec1ed916f2101
+croniter==5.0.1 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:7d9b1ef25b10eece48fdf29d8ac52f9b6252abff983ac614ade4f3276294019e \
+    --hash=sha256:eb28439742291f6c10b181df1a5ecf421208b1fc62ef44501daec1780a0b09e9
 cryptography==43.0.1 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:014f58110f53237ace6a408b5beb6c427b64e084eb451ef25a28308270086494 \
     --hash=sha256:1bbcce1a551e262dfbafb6e6252f1ae36a248e615ca44ba302df077a846a8806 \

diff --git a/boefjes/requirements.txt b/boefjes/requirements.txt
@@ -303,9 +303,9 @@ colorama==0.4.6 ; python_version >= "3.10" and python_version < "4.0" \
 configparser==7.0.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:af3c618a67aaaedc4d689fd7317d238f566b9aa03cae50102e92d7f0dfe78ba0 \
     --hash=sha256:f46d52a12811c637104c6bb8eb33693be0038ab6bf01d69aae009c39ec8c2017
-croniter==3.0.3 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:34117ec1741f10a7bd0ec3ad7d8f0eb8fa457a2feb9be32e6a2250e158957668 \
-    --hash=sha256:b3bd11f270dc54ccd1f2397b813436015a86d30ffc5a7a9438eec1ed916f2101
+croniter==5.0.1 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:7d9b1ef25b10eece48fdf29d8ac52f9b6252abff983ac614ade4f3276294019e \
+    --hash=sha256:eb28439742291f6c10b181df1a5ecf421208b1fc62ef44501daec1780a0b09e9
 cryptography==43.0.1 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:014f58110f53237ace6a408b5beb6c427b64e084eb451ef25a28308270086494 \
     --hash=sha256:1bbcce1a551e262dfbafb6e6252f1ae36a248e615ca44ba302df077a846a8806 \

diff --git a/mula/poetry.lock b/mula/poetry.lock
diff --git a/mula/pyproject.toml b/mula/pyproject.toml
@@ -8,7 +8,7 @@ license = "EUPL"
 [tool.poetry.dependencies]
 python = "^3.10"
 alembic = "^1.12.1"
-croniter = "^3.0.3"
+croniter = "^5.0.1"
 mmh3 = "^4.0.1"
 pika = "^1.3.2"
 prometheus-client = "^0.19.0"

diff --git a/mula/requirements-dev.txt b/mula/requirements-dev.txt
@@ -92,9 +92,9 @@ coverage[toml]==7.6.1 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:f5796e664fe802da4f57a168c85359a8fbf3eab5e55cd4e4569fbacecc903959 \
     --hash=sha256:fc5a77d0c516700ebad189b587de289a20a78324bc54baee03dd486f0855d234 \
     --hash=sha256:fd21f6ae3f08b41004dfb433fa895d858f3f5979e7762d052b12aef444e29afc
-croniter==3.0.3 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:34117ec1741f10a7bd0ec3ad7d8f0eb8fa457a2feb9be32e6a2250e158957668 \
-    --hash=sha256:b3bd11f270dc54ccd1f2397b813436015a86d30ffc5a7a9438eec1ed916f2101
+croniter==5.0.1 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:7d9b1ef25b10eece48fdf29d8ac52f9b6252abff983ac614ade4f3276294019e \
+    --hash=sha256:eb28439742291f6c10b181df1a5ecf421208b1fc62ef44501daec1780a0b09e9
 decorator==5.1.1 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:637996211036b6385ef91435e4fae22989472f9d571faba8927ba8253acbc330 \
     --hash=sha256:b8c3f85900b9dc423225913c5aace94729fe1fa9763b38939a95226f02d37186

diff --git a/mula/requirements.txt b/mula/requirements.txt
@@ -19,9 +19,9 @@ click==8.1.7 ; python_version >= "3.10" and python_version < "4.0" \
 colorama==0.4.6 ; python_version >= "3.10" and python_version < "4.0" and platform_system == "Windows" \
     --hash=sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44 \
     --hash=sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6
-croniter==3.0.3 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:34117ec1741f10a7bd0ec3ad7d8f0eb8fa457a2feb9be32e6a2250e158957668 \
-    --hash=sha256:b3bd11f270dc54ccd1f2397b813436015a86d30ffc5a7a9438eec1ed916f2101
+croniter==5.0.1 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:7d9b1ef25b10eece48fdf29d8ac52f9b6252abff983ac614ade4f3276294019e \
+    --hash=sha256:eb28439742291f6c10b181df1a5ecf421208b1fc62ef44501daec1780a0b09e9
 decorator==5.1.1 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:637996211036b6385ef91435e4fae22989472f9d571faba8927ba8253acbc330 \
     --hash=sha256:b8c3f85900b9dc423225913c5aace94729fe1fa9763b38939a95226f02d37186

diff --git a/octopoes/octopoes/models/ooi/reports.py b/octopoes/octopoes/models/ooi/reports.py
@@ -58,6 +58,7 @@ class ReportRecipe(OOI):
     subreport_name_format: str | None = None
 
     input_recipe: dict[str, Any]  # can contain a query which maintains a live set of OOIs or manually picked OOIs.
+    parent_report_type: str | None = None
     report_types: list[str]
 
     cron_expression: str

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -111,5 +111,5 @@ settings-doc = "^4.3.1"
 colorama = "0.4.6" # Required on all platforms, not just win32
 autodoc-pydantic = "^2.2.0"
 # Needed for settings-doc and autodoc
-croniter = "^3.0.3"
+croniter = "^5.0.1"
 jsonschema = "^4.17.0"
diff --git a/requirements.txt b/requirements.txt
@@ -112,9 +112,9 @@ click==8.1.7 ; python_version >= "3.10" and python_version < "4.0" \
 colorama==0.4.6 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44 \
     --hash=sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6
-croniter==3.0.3 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:34117ec1741f10a7bd0ec3ad7d8f0eb8fa457a2feb9be32e6a2250e158957668 \
-    --hash=sha256:b3bd11f270dc54ccd1f2397b813436015a86d30ffc5a7a9438eec1ed916f2101
+croniter==5.0.1 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:7d9b1ef25b10eece48fdf29d8ac52f9b6252abff983ac614ade4f3276294019e \
+    --hash=sha256:eb28439742291f6c10b181df1a5ecf421208b1fc62ef44501daec1780a0b09e9
 docutils==0.20.1 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:96f387a2c5562db4476f09f13bbab2192e764cac08ebbf3a34a95d9b1e4a59d6 \
     --hash=sha256:f08a4e276c3a1583a86dce3e34aba3fe04d02bba2dd51ed16106244e8a923e3b

diff --git a/rocky/assets/css/components/dropdown.scss b/rocky/assets/css/components/dropdown.scss
@@ -12,10 +12,12 @@
     overflow: hidden;
     min-width: 0;
     display: flex;
+    width: 100%;
   }
 
   .dropdown-list {
     display: none;
+    left: 0;
     position: absolute;
     top: 3.25rem;
     z-index: 2;
@@ -29,112 +31,111 @@
     border: 1px solid var(--colors-grey-200);
     background-color: var(--colors-white);
 
-    &[aria-expanded="true"] {
-      display: flex;
-      flex-direction: column;
-      min-width: 100%;
-
-      > ul {
-        width: 100%;
-        padding: 0;
-        background-color: var(--colors-white);
-        list-style-type: disc;
-        gap: 0;
-        border-radius: var(--border-radius-s);
+    > ul {
+      margin: 0;
+      width: 100%;
+      padding: 0;
+      background-color: var(--colors-white);
+      list-style-type: disc;
+      gap: 0;
+      border-radius: var(--border-radius-s);
+
+      &:not(:last-child) {
+        border-bottom: 1px solid var(--colors-grey-200);
+      }
 
-        &:not(:last-child) {
-          border-bottom: 1px solid var(--colors-grey-200);
-        }
+      li {
+        $icon-width: 1.25rem;
 
-        li {
-          $icon-width: 1.25rem;
+        border-top: 1px $offwhite solid;
+        padding: 0;
+        width: 100%;
 
-          border-top: 1px $offwhite solid;
-          padding: 0;
+        > a {
+          display: flex;
+          flex-direction: row;
+          align-items: center;
+          justify-content: flex-start;
+          gap: var(--spacing-grid-100);
+          color: var(--text-color-dark);
+          margin: 0;
+          min-height: 2.75rem;
+          padding: var(--spacing-grid-150);
+          text-decoration: none;
           width: 100%;
 
-          > a {
+          .icon {
             display: flex;
-            flex-direction: row;
-            align-items: center;
-            justify-content: flex-start;
-            gap: var(--spacing-grid-100);
-            color: var(--text-color-dark);
-            margin: 0;
-            min-height: 2.75rem;
-            padding: var(--spacing-grid-150);
-            text-decoration: none;
-            width: 100%;
-
-            .icon {
-              display: flex;
-              width: $icon-width;
-              max-height: $icon-width;
-
-              &::before {
-                color: var(--text-color-dark);
-              }
-            }
+            width: $icon-width;
+            max-height: $icon-width;
 
-            &:hover {
+            &::before {
               color: var(--text-color-dark);
             }
-
-            /* Styling with subtitle */
-            &:has(> div) {
-              flex-direction: column;
-              align-items: flex-start;
-              gap: var(--spacing-grid-0);
-            }
-
-            > div {
-              display: flex;
-              flex-direction: row;
-              gap: var(--spacing-grid-100);
-              align-items: center;
-            }
-
-            .nota-bene {
-              padding-left: calc($icon-width + var(--spacing-grid-100));
-            }
           }
 
-          &[aria-current="true"] {
-            a::before {
-              content: "\ea5e";
-              font-family: var(
-                --language-selector-list-button-icon-font-family
-              );
-              margin-left: var(
-                --language-selector-list-button-icon-margin-left
-              );
-              font-size: var(--language-selector-list-button-icon-font-size);
-              color: var(--language-selector-list-button-icon-text-color);
-              margin-right: 0.5rem;
-              width: 1.25rem;
-            }
+          &:hover {
+            color: var(--text-color-dark);
           }
 
-          &::marker {
-            content: none;
+          /* Styling with subtitle */
+          &:has(> div) {
+            flex-direction: column;
+            align-items: flex-start;
+            gap: var(--spacing-grid-0);
           }
 
-          &:first-child {
-            border-top: none;
+          > div {
+            display: flex;
+            flex-direction: row;
+            gap: var(--spacing-grid-100);
+            align-items: center;
           }
 
-          &:last-child {
-            // border-top should still inherit
-            border-left: none;
-            border-right: none;
-            border-bottom: none;
+          .nota-bene {
+            padding-left: calc($icon-width + var(--spacing-grid-100));
           }
+        }
 
-          &:hover {
-            background-color: #f2f2f2;
+        &[aria-current="true"] {
+          a::before {
+            content: "\ea5e";
+            font-family: var(--language-selector-list-button-icon-font-family);
+            margin-left: var(--language-selector-list-button-icon-margin-left);
+            font-size: var(--language-selector-list-button-icon-font-size);
+            color: var(--language-selector-list-button-icon-text-color);
+            margin-right: 0.5rem;
+            width: 1.25rem;
           }
         }
+
+        &::marker {
+          content: none;
+        }
+
+        &:first-child {
+          border-top: none;
+        }
+
+        &:last-child {
+          // border-top should still inherit
+          border-left: none;
+          border-right: none;
+          border-bottom: none;
+        }
+
+        &:hover {
+          background-color: #f2f2f2;
+        }
       }
     }
   }
 }
+
+.dropdown-list {
+  [aria-expanded="true"] + & {
+    display: flex;
+    flex-direction: column;
+    min-width: 100%;
+  }
+}