Merge branch 'main' into 1004-mandatory-service-types

Author: mbuechse

.zuul.d/secure.yaml

@@ -458,96 +458,95 @@
           /Lt6+yMJMB7AUVpwXkI7cMmf+QXbDnnE6eX0UBosTM6MjdA/zhkjJ6PK9E0FnngW4HRDZ
           eAiVSQiN4CSa9bylrwLhvarAEhR+5avRv4yTurgAYe6I6Gh05pBPCgTXmCNxPU=
       scaleup_api_server: !encrypted/pkcs1-oaep
-        - v63/tgLM+/LQM7oBUdNe+Hu5hOEookTlnlDgUJD6navX6kRDqFOGsu7dgPsP7mXPrZiTo
-          jHNVHLMQ6T8w/wmgB3eqAtFCqiY9WJ9kcynOvVVXEOaVPgyi/mc19Rop0fba5042PfyuF
-          66MsPHimxpnABDlyXq3/oAE/gh3RUWKLrjK4xtNHaaIDHQwRtnrBziQ6EQ7pqw06mT/1h
-          37jkTciWH1QXiiu8U4kBsKvGs2S2cOm9WNiCosqOJiKWph5HMgffTOUXFlPKGbt+yxI2z
-          03XPMwILIwlbnPCQLytX+MX2p73SL3RBftGuDjSdcR9gEgY5geUBOQQOQONMoshi0YSyU
-          So24GOfCWsSeudAOXt95DPeSRER6Uj3Sz7HNnNFXUvHySZ5N3JBlj3mT7amwgoisyqiQt
-          nfctHhNjJW2u2Yg3vjAWO9utydXV7yq2YW+Tdelx5XbGDbOQXeQ5jFkAbG8eYVIpS3B9f
-          zXkFarM5tMQ+C9svjSayiawhqpbiddv0snAl48tX/U9mraM6lW6exLJKZ+ANmx7rtW++J
-          K2xIz/U0fWRE7KWm7WyyBkgXif0iqak593ETYG9bZGtPOsviFZOPBKAdIzmKqYTdg+e9R
-          6Rpqu63pFt5XAMqbfos3LRlEfAoYXoWLhjSj8JXnuIxONN/8w+7C7JpseKBCPw=
+        - H4F/zi6Lp/CbkHPG4tEzhFVRprH6uxVqoOirUZNKOg1pDI33ilXG4K99O/CH9dCqbFiV0
+          GnI4p8b0Csho6S63DEuMikjXBLfNWsd2BncQ4gu4bGhHef3bkCjEmybk3AmEyA789vRNS
+          o6xjZUAJB0ZEQeuWudSo28fJDGxGOVcVW0Sda+OSk0K3qftucg047KZdJ5bWZmHTPvOha
+          4R2+nsbnecAQJtMDWVERPYTD62pF4CAHD6XVf9mUuZNnLYibl5uQz0t6JZQANu83pFYDZ
+          C5Z7T4/UJxKlyBpL2XtF/cHuKavEP41cheD/ihG1EI9Yf3InFCRllbIGzMj8fq8d4bZKV
+          tC1iui2RrL3s38GrOyyGE7odyHlvl08zbrJTkWb5UcI20jPxBCxHAvlqIWjl+9Ite7OuM
+          nXq62IgXUqVWWgrGWRINyJlvRgcQPxCVq7ty3OMB1Vp4R0ldDRWWR9+PozmK86fRXYatE
+          cgRi579JMBvKjbP9hKcZOkb12PVyZTTOLmyepfMAqZVpBULtpNza26ysCl5Wu14+0o3bh
+          d6Kst5qeZz4P8QjJe2UQU67B8JcX88zbpNYM1uxLhtXlAk0/8Hd8KWm+KiU/NfNzgr7jd
+          jxRhMEdHUuMOKHaSR/hwJs7kWp1RVR6l7L+SXv02VrYgzysGCiGqXhV9FwrEQw=
       scaleup_ca_data: !encrypted/pkcs1-oaep
-        - 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
+        - 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
       scaleup_token: !encrypted/pkcs1-oaep
-        - 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
+        - Zddiaw8Jx0Hqlx9I5vIBMeDAORMM5we9vTYa1p1n4nJM7Uxu5C3yLPjY0ubI1oFNkEWKz
+          2/V/ySJ3X1A1PV38G6C2EeZEq7dnuUuWNe6U/bOBvtbnyBQFMIXVVKsl0+gVvJQonF8r1
+          0vjFFTKgAcnqK5gp5rzDrD4odMs1H5sZ8ySLkXvwQeQOMHiF9bZChWFMXazTBLAarn9ZX
+          gznZsm7BZgmZIu2oBBww5ZPGpOrMM0OkquGQljiuiyeA0sED7V2RhQgm/hzaKc2CVAi5S
+          8nrc8lHZFHgqtzwk1bCVWqKM8p0zm1mRcUHBNxYRn7G0fdilQ9TIhG5W9xBTaP9AEjiPY
+          fwjqI0w86yWee9lzHm0fhh3EvhR7fhdir7rQDzXRXl2c6nU4vu5VDo8hM384Hg8wMGHWA
+          99lIEpJ03q3eu8XtbmLB4kGLu9iCWi3H3c9LEyHlfi1lMcrGpHWYNCxH7T2Sq4uVUDThF
+          eRbACDjg62MlgnQY1YVXKN+RyPFlhiw+gpOJgBRy9m/jJsMYsgkPE9UYAysTDR8S8GuWi
+          1ukg16qoDvlXH2ts0XM0UOMy4nrSCjq4Yj8hOi6Cno0jFWtV+1wKvHDNiBek7k38ixh1q
+          NrXhQWmgpHxFE6csPz8wzpaYxtlcmNM9QqZm1jdHO39cb53JZ+YFFV25kFEjB4=
+        - pekcvbpmLrxjtsqxk5deFM2vC9oSt7azBn3U5XUG40vNLg7tzQbU3SHgHvIOFpqjyGqhW
+          UxdyoMxwpVtcRokryaGGsRkaCB4yQf3e38E8uFMdpffTdTxVOATt+FEoTKea4tpYWIoyk
+          udABOASbQ4EiqUV1je28+xEONt6MtD3PkQ+8BtmDOC1G+IBCHTnMLz3UlH2d2lMCyDiOC
+          TiKuGc5bDzOWyQtuqmaMm3+gZkHsCd0CI+jeYmhVqwpdFUIbYUNNjv/xWagfhVvFcdAed
+          IB0DuWKChaKE4RhzxLeHPZwFN5wXp5RyplhmKEp7dLj3pbWwWiGBvH7G4zJVXKiH0eJT3
+          G0rU+Kt1Dh80LtRoJsPhzHybndbVbprk2Xi6RwpT0U8mR8KiHvfgedNAqAebJCbWdb6vC
+          RVKu67c6Q83uzLjgyebNQ+ZATfQNRk4E0JWU6N0/464mAxE/HDiUf8tuN5bA/ns6BlaCn
+          P2aJZl/hMvLHY+h6eyYzMcLOuMJy/1kRW5L/VmS1H5wmB73BjqPT9wJ7LhJ1Cvm5JO3UV
+          loIuZUX6COGXPovsDrMoAVMkFKmEyRhzkD/+B1Z8ZhQwKVgwMKCZaWrqiYL0IpkZETxDJ
+          J6AdjeDcDvkrRsHGh5ZiFGWoGbSb2bq9ZfkVuk2Yf5XecWnU3TGUzBk283Wv54=
+        - tcY9Nn1/N/+WoJSXduloZ9b4OL5nPh5UfXZWtnz6BfV6hfdqt2AwsBK2D89QSVYZt21LS
+          mPWO6+u2brMbOOBmP+I5OTejkoWZPozidbkDr8+QQ2ELw7k2oI5S0jx6lPKJQZUvN5pKS
+          vIv79bLdrdMWHc1z9F0POA1UTNzvfDLvnkO31OXYlH0dO8Jr+d0DMeTr+POFNm+QYAJ20
+          96MFwKgBoTlJbPskelg0Q0tQfTMI0PA7xl8PfojcvIE/dlzLvg3f5J0c0jOx8bQRguq5N
+          /jSUn9lmk0xl9c6/xrRrCj4q21p0o4KfDYUSIU7XHRN1yTLTjsI3sQCiivQIbYmmOi3mi
+          md6q/YNkwRmwGDuxB4l3Zq9PEN4UjLEUVeFLubryrw2m1bU5MlAIQqfAPIYcqK76CDoZS
+          teb56lXqOj3+NHPim/+nHfHuU+8qc//JdKLkklGbMMgqodKq+7AZrC3aPZl5ddp1yhKbj
+          E5livQmER4Tpzd4f566cFOqTB03g8aC77I+w4rlrCK/wVElQn5cVyWCcl3k4sSUbStS71
+          lEzcKtyRvZUM1NIvFNXk6+frB9o+lY2/gxz9DtARZWQREuF38DHKcHvZ201hKUMtyILAR
+          KNQUxVOw5pdkDRSuPV7IRrKWyqDRwWEKv5G/ReS03ldBw4nhJ27is4VSgq61EM=

compliance-monitor/Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-FROM python:3.10
+FROM python:3.12
 RUN useradd -g users  -u 1001 -m -s /bin/bash runuser
 USER 1001
 WORKDIR /code

compliance-monitor/docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   reverse-proxy:
     image: traefik:v2.11
@@ -30,10 +28,10 @@ services:
       - SCM_DB_HOST=postgres
       - SCM_DB_PORT=5432
       - SCM_DB_PASSWORD_FILE=/run/secrets/db_password
-      # pass the following two from the shell or put them into .env
+      # pass the following from the shell or put them into .env
       - SCM_HC_USER
       - SCM_HC_PASSWORD
-      - SCM_BASE_URL=https://compliance.sovereignit.cloud/
+      - SCM_BASE_URL
     volumes:
       - ../Tests:/Tests
       - ./bootstrap.yaml:/code/bootstrap.yaml

compliance-monitor/monitor.py

@@ -28,7 +28,7 @@
 from fastapi import Depends, FastAPI, HTTPException, Request, Response, status
 from fastapi.responses import RedirectResponse
 from fastapi.security import HTTPBasic, HTTPBasicCredentials
-from jinja2 import Environment
+from jinja2 import Environment, pass_context
 from markdown import markdown
 from passlib.context import CryptContext
 import psycopg2
@@ -42,7 +42,7 @@
     db_get_keys, db_insert_report, db_get_recent_results2, db_patch_approval2, db_get_report,
     db_ensure_schema, db_get_apikeys, db_update_apikey, db_filter_apikeys, db_clear_delegates,
     db_find_subjects, db_insert_result2, db_get_relevant_results2, db_add_delegate, db_get_group,
-    db_filter_accounts,
+    db_filter_accounts, db_get_groups,
 )
 
 
@@ -94,6 +94,10 @@ def __init__(self):
 # to achieve this!
 SEP = "-----END SSH SIGNATURE-----\n&"
 ASTERISK_LOOKUP = {'effective': '', 'draft': '*', 'warn': '†', 'deprecated': '††'}
+SCOPE_ALIASES = {
+    'scs-compatible-iaas': '50393e6f-2ae1-4c5c-a62c-3b75f2abef3f',
+    'scs-compatible-kaas': '1fffebe6-fd4b-44d3-a36c-fc58b4bb0180',
+}
 
 
 class ViewType(Enum):
@@ -651,6 +655,17 @@ def _resolve_group(cur, subject, prefix=GROUP_PREFIX):
     return None, [subject]
 
 
+def _resolve_group_locally(groups, subject, prefix=GROUP_PREFIX):
+    group = subject.removeprefix(prefix)
+    if subject != group:
+        return group, list(groups[group])
+    return None, [subject]
+
+
+def _resolve_scope(scopeuuid):
+    return SCOPE_ALIASES.get(scopeuuid, scopeuuid)
+
+
 @app.get("/{view_type}/detail/{subject}/{scopeuuid}")
 async def get_detail(
     request: Request,
@@ -659,6 +674,7 @@ async def get_detail(
     subject: str,
     scopeuuid: str,
 ):
+    scopeuuid = _resolve_scope(scopeuuid)
     with conn.cursor() as cur:
         group, subjects = _resolve_group(cur, subject)
         rows2 = []
@@ -683,6 +699,7 @@ async def get_detail_full(
     subject: str,
     scopeuuid: str,
 ):
+    scopeuuid = _resolve_scope(scopeuuid)
     with conn.cursor() as cur:
         group, subjects = _resolve_group(cur, subject)
         rows2 = []
@@ -706,11 +723,12 @@ async def get_table(
     view_type: ViewType,
 ):
     with conn.cursor() as cur:
+        groups = db_get_groups(cur)
         rows2 = db_get_relevant_results2(cur, approved_only=True)
     results2 = convert_result_rows_to_dict2(rows2, get_scopes(), grace_period_days=GRACE_PERIOD_DAYS)
     return render_view(
         VIEW_TABLE, view_type, results=results2, base_url=settings.base_url, detail_page='detail',
-        title="SCS compliance overview",
+        title="SCS compliance overview", groups=groups,
     )
 
 
@@ -721,11 +739,12 @@ async def get_table_full(
     view_type: ViewType,
 ):
     with conn.cursor() as cur:
+        groups = db_get_groups(cur)
         rows2 = db_get_relevant_results2(cur, approved_only=False)
     results2 = convert_result_rows_to_dict2(rows2, get_scopes(), include_drafts=True)
     return render_view(
         VIEW_TABLE, view_type, results=results2, base_url=settings.base_url, detail_page='detail_full',
-        title="SCS compliance overview (incl. unverified results)", unverified=True,
+        title="SCS compliance overview (incl. unverified results)", unverified=True, groups=groups,
     )
 
 
@@ -736,6 +755,7 @@ async def get_scope(
     view_type: ViewType,
     scopeuuid: str,
 ):
+    scopeuuid = _resolve_scope(scopeuuid)
     spec = get_scopes()[scopeuuid]
     versions = spec['versions']
     # sort by name, and all drafts after all non-drafts
@@ -814,14 +834,18 @@ async def get_healthz(request: Request):
     return Response()  # empty response with status 200
 
 
-def pick_filter(results, scope, *subjects):
+@pass_context
+def pick_filter(ctx, results, scopeuuid, *subjects):
     """Jinja filter to pick scope results from `results` for given `subject` and `scope`"""
+    scopeuuid = _resolve_scope(scopeuuid)
     # simple case (backwards compatible): precisely one subject
     if len(subjects) == 1:
-        return results.get(subjects[0], {}).get(scope, {})
+        group, subjects = _resolve_group_locally(ctx['groups'], subjects[0])
+        if not group:
+            return results.get(subjects[0], {}).get(scopeuuid, {})
     # generalized case: multiple subjects
     # in this case, drop None
-    rs = [results.get(subject, {}).get(scope, {}) for subject in subjects]
+    rs = [results.get(subject, {}).get(scopeuuid, {}) for subject in subjects]
     return [r for r in rs if r is not None]