Merge branch 'main' into fix/default-organiztion-member-for-superusers

.pre-commit-config.yaml

@@ -86,11 +86,12 @@ repos:
       requirements-.*.txt$ |
       retirejs.json$ |
       ^boefjes/boefjes/plugins/kat_fierce/lists |
+      ^boefjes/tests/examples/inputs/cve-result-without-cvss.json |
       ^boefjes/tests/examples |
       ^keiko/glossaries |
       ^keiko/templates/.*/template.tex$ |
       ^rocky/assets/js/vendor |
-      ^rocky/assets/src/bundles/app/css/themes/soft/fonts/tabler-icons/tabler-icons.scss$ |
+      ^rocky/assets/css/themes/soft/fonts/tabler-icons/tabler-icons.scss$ |
       ^rocky/tests/stubs |
       ^docs/source/_static
       )
@@ -104,15 +105,15 @@ repos:
   - id: djlint-django
     files: '^rocky/.*/templates/.*$'
 
-# - repo: https://github.com/thibaudcolas/pre-commit-stylelint
-#   rev: v15.4.0
-#   hooks:
-#     - id: stylelint
-#       args: [--fix]
-#       additional_dependencies:
-#              - stylelint@15.4.0
-#              - stylelint-config-standard-scss@8.0.0
-#       files:  "^(rocky\/assets\/src\/|docs\/source\/).*.(css|scss|sass)$"
+- repo: https://github.com/thibaudcolas/pre-commit-stylelint
+  rev: v15.10.1
+  hooks:
+    - id: stylelint
+      args: [ --fix ]
+      additional_dependencies:
+        - stylelint@15.10.1
+        - stylelint-config-standard-scss@10.0.0
+      files: "^(rocky\/assets\/css\/|docs\/source\/).*.(css|scss|sass)$"
 
 - repo: https://github.com/shellcheck-py/shellcheck-py
   rev: v0.9.0.5

.stylelintrc.json

@@ -1,5 +1,6 @@
 {
   "extends": "stylelint-config-standard-scss",
+  "ignoreFiles": ["rocky/assets/css/themes/soft/fonts/tabler-icons/tabler-icons.scss"],
   "rules": {
     "number-max-precision": 5,
     "color-hex-length": "long",
@@ -8,7 +9,9 @@
       true,
       {
         "ignoreFontFamilies": [
-          "RO Icons"
+          "RO Icons",
+          "tabler-icons",
+          "kat-icons"
         ]
       }
     ]

Makefile

@@ -52,6 +52,7 @@ down:
 # Remove containers and all volumes (data loss!)
 clean:
 	-docker-compose down --timeout 0 --volumes --remove-orphans
+	-rm -Rf rocky/node_modules rocky/assets/dist rocky/.parcel-cache
 
 # Fetch the latest changes from the Git remote
 fetch:

boefjes/packaging/deb/data/etc/kat/katalogus.gunicorn.conf.py

@@ -1,4 +1,2 @@
-import multiprocessing
-
-workers = multiprocessing.cpu_count() * 2 + 1
+workers = 3
 bind = ["127.0.0.1:8003"]

boefjes/tests/test_tasks.py

@@ -197,6 +197,13 @@ def test_correct_local_runner_hash(self) -> None:
         # This boefje has a __pycache__ folder with *.pyc files, which should be ignored
         boefje_resource_3 = local_repository.by_id("dummy_boefje_environment_with_pycache")
 
+        # Sanity check to make sure the .pyc files are actually there
+        path = Path(__file__).parent / "modules" / "dummy_boefje_environment_with_pycache"
+        assert Path(path / "some_subdir/cache.pyc").is_file()
+        assert Path(path / "some_subdir/__init__.py").is_file()
+        assert Path(path / "__pycache__/pytest__init__.cpython-311.pyc").is_file()
+        assert Path(path / "__pycache__/pytest_main.cpython-311.pyc").is_file()
+
         assert boefje_resource_1.runnable_hash == "b07a0ecbb24e49843188a24e5298b9d614535c0ec1761e76366b6d8747515e7a"
         assert boefje_resource_2.runnable_hash == "1d97b303499cc7ea79c4bb419a79bd5eea750c6430ddd759b7af22383e873a7e"
         assert boefje_resource_3.runnable_hash == "67f956d89b2e2c5948f2090ac52eb752e2e65393df207180d8c24a6dea13b555"

bytes/packaging/deb/data/etc/kat/bytes.gunicorn.conf.py

@@ -1,4 +1,2 @@
-import multiprocessing
-
-workers = multiprocessing.cpu_count() * 2 + 1
+workers = 3
 bind = ["127.0.0.1:8002"]

bytes/sql_migrations/0017_09a2929108d9_add_signing_provider_model.sql

@@ -1,8 +1,8 @@
 CREATE TABLE signing_provider (
-                                  id SERIAL NOT NULL,
-                                  url VARCHAR(256) NOT NULL,
-                                  PRIMARY KEY (id),
-                                  UNIQUE (url)
+    id SERIAL NOT NULL,
+    url VARCHAR(256) NOT NULL,
+    PRIMARY KEY (id),
+    UNIQUE (url)
 );
 
 ALTER TABLE raw_file ADD COLUMN signing_provider_id INTEGER;

bytes/sql_migrations/0018_d216ad75177d_add_environment_and_runnable_hash.sql

@@ -0,0 +1,2 @@
+ALTER TABLE boefje_meta ADD COLUMN environment JSON;
+ALTER TABLE boefje_meta ADD COLUMN runnable_hash VARCHAR(64);

keiko/packaging/deb/data/etc/kat/keiko.gunicorn.conf.py

@@ -1,5 +1,2 @@
-"""Keiko gunicorn configuration file."""
-import multiprocessing
-
-workers = multiprocessing.cpu_count() * 2 + 1
+workers = 2
 bind = ["127.0.0.1:8005"]

octopoes/packaging/deb/data/etc/kat/octopoes.gunicorn.conf.py

@@ -1,4 +1,2 @@
-import multiprocessing
-
-workers = multiprocessing.cpu_count() * 2 + 1
+workers = 4
 bind = ["127.0.0.1:8001"]

rocky/.prettierignore

@@ -1,4 +1,4 @@
 *.html
 *.min.js
 assets/dist/
-assets/js/vendor/
+assets/vendors/

rocky/assets/css/abstracts/alert-colors.scss

@@ -0,0 +1,14 @@
+// Alert colors
+
+$grey: #cccccc;
+$offwhite: #fafafa;
+$lightgrey: #f0f0f0;
+$pink: #ca005d;
+$blue: #01689b;
+
+:root {
+  --color-alert-informative: #006fb3;
+  --color-alert-warning: #7d6900;
+  --color-alert-positive: #157b31;
+  --color-alert-negative: #c3372c;
+}

rocky/assets/src/bundles/app/css/abstracts/mixins.scss → rocky/assets/css/abstracts/mixins.scss

@@ -43,6 +43,7 @@
     height: auto;
     list-style: none;
   }
+
   margin: 0;
   padding: 0;
   position: static;

rocky/assets/src/bundles/app/css/components/cat-loader.scss → rocky/assets/css/components/cat-loader.scss

@@ -2,14 +2,17 @@
   0% {
     transform: rotate(-10deg);
   }
+
   100% {
     transform: rotate(10deg);
   }
 }
+
 @keyframes paw {
   0% {
     transform: rotate(20deg);
   }
+
   100% {
     transform: rotate(-40deg);
   }
@@ -20,6 +23,7 @@
   justify-content: center;
   margin: 3rem auto;
 }
+
 .cat-loader {
   height: 13rem;
   position: relative;
@@ -31,13 +35,15 @@
     position: absolute;
     top: 8rem;
   }
+
   .ball {
     animation: ball 1s alternate infinite ease-in-out;
     left: 1.5rem;
     position: absolute;
     top: 9.5rem;
     transform-origin: center bottom;
   }
+
   .head {
     position: absolute;
     top: 1rem;
@@ -50,20 +56,24 @@
     top: 8rem;
     transform-origin: center top;
   }
+
   .line {
     left: 2rem;
     position: absolute;
     top: 11.5rem;
   }
+
   .body {
     display: block;
     position: absolute;
     top: 4rem;
   }
+
   .ear-left {
     left: 0.5rem;
     position: absolute;
   }
+
   .ear-right {
     left: 3rem;
     position: absolute;

rocky/assets/src/bundles/app/css/components/cat-paw-loader.scss → rocky/assets/css/components/cat-paw-loader.scss

@@ -3,6 +3,7 @@
     opacity: 0.1;
   }
 }
+
 .cat-paw-loader {
   display: flex;
   justify-content: flex-start;
@@ -17,15 +18,19 @@
     &:nth-child(2) {
       animation-delay: 250ms;
     }
+
     &:nth-child(3) {
       animation-delay: 500ms;
     }
+
     &:nth-child(4) {
       animation-delay: 750ms;
     }
+
     &:nth-child(5) {
       animation-delay: 1000ms;
     }
+
     &:nth-child(6) {
       animation-delay: 1250ms;
     }

rocky/assets/src/bundles/app/css/components/dropdown-list.scss → rocky/assets/css/components/dropdown-list.scss

@@ -1,7 +1,6 @@
 /* Dropdown listing */
 
 .dropdown-list {
-    -webkit-box-shadow: var(--language-selector-list-box-shadow);
     box-shadow: var(--language-selector-list-box-shadow);
     border-radius: var(--language-selector-list-border-radius);
     border-width: var(--language-selector-list-border-width);

rocky/assets/src/bundles/app/css/components/dropdown.scss → rocky/assets/css/components/dropdown.scss

@@ -21,7 +21,7 @@
   >ul {
     padding: 0;
     display: none;
-    background-color: #fff;
+    background-color: #ffffff;
     list-style-type: disc;
     margin-block-end: 0;
     margin-block-start: 0;
@@ -60,7 +60,7 @@
         }
 
         &[aria-current="true"] {
-          a:before {
+          a::before {
             content: "\ea5e";
             font-family: var(--language-selector-list-button-icon-font-family);
             margin-left: var(--language-selector-list-button-icon-margin-left);

rocky/assets/src/bundles/app/css/components/fmea.scss → rocky/assets/css/components/fmea.scss

@@ -1,6 +1,6 @@
 .affected-objects {
   span:not(:last-child) {
-    &:after {
+    &::after {
       content: "-";
       display: inline-block;
     }