Compare commits
2 Commits
feat/2-ope
...
feat/3-key
| Author | SHA1 | Date | |
|---|---|---|---|
| 30d8aecf8c | |||
| 195a76aaf2 |
48
Makefile
48
Makefile
@@ -8,8 +8,13 @@
|
|||||||
SLN := services/bff/Bff.slnx
|
SLN := services/bff/Bff.slnx
|
||||||
COMPOSE := infra/docker-compose.yml
|
COMPOSE := infra/docker-compose.yml
|
||||||
HEALTH_URL := http://localhost:8080/health
|
HEALTH_URL := http://localhost:8080/health
|
||||||
OZ_COMPOSE := infra/openzaak/docker-compose.yml
|
OZ_COMPOSE := infra/openzaak/docker-compose.yml
|
||||||
OZ_BASE := http://localhost:8000
|
OZ_BASE := http://localhost:8000
|
||||||
|
NRC_COMPOSE := infra/opennotificaties/docker-compose.yml
|
||||||
|
NRC_BASE := http://localhost:8001
|
||||||
|
KC_COMPOSE := infra/keycloak/docker-compose.yml
|
||||||
|
KC_BASE := http://localhost:8180
|
||||||
|
STACK_FILES := -f $(OZ_COMPOSE) -f $(NRC_COMPOSE)
|
||||||
|
|
||||||
# On a rootless Podman dev box, point Docker CLI/Compose at the Podman socket —
|
# On a rootless Podman dev box, point Docker CLI/Compose at the Podman socket —
|
||||||
# but only if that socket exists and DOCKER_HOST isn't already set, so real
|
# but only if that socket exists and DOCKER_HOST isn't already set, so real
|
||||||
@@ -21,7 +26,7 @@ export DOCKER_HOST := unix://$(PODMAN_SOCK)
|
|||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
.PHONY: ci lint build unit smoke down changelog openzaak-up openzaak-smoke openzaak-seed openzaak-down help
|
.PHONY: ci lint build unit smoke down changelog openzaak-up openzaak-smoke openzaak-seed openzaak-down stack-up stack-smoke stack-down keycloak-up keycloak-smoke keycloak-down help
|
||||||
|
|
||||||
## ci: run the full pipeline — lint, build, unit, smoke (mirrors Gitea Actions)
|
## ci: run the full pipeline — lint, build, unit, smoke (mirrors Gitea Actions)
|
||||||
ci: lint build unit smoke
|
ci: lint build unit smoke
|
||||||
@@ -82,6 +87,43 @@ openzaak-seed: openzaak-up
|
|||||||
openzaak-down:
|
openzaak-down:
|
||||||
docker compose -f $(OZ_COMPOSE) down --volumes
|
docker compose -f $(OZ_COMPOSE) down --volumes
|
||||||
|
|
||||||
|
## stack-up: start OpenZaak + Open Notificaties together (shared network)
|
||||||
|
stack-up:
|
||||||
|
docker compose $(STACK_FILES) up -d
|
||||||
|
|
||||||
|
## stack-smoke: start both, assert OpenZaak (403/302/200) and NRC (302) are reachable
|
||||||
|
stack-smoke: stack-up
|
||||||
|
@bash -c 'set -e; \
|
||||||
|
echo "waiting for OpenZaak + Open Notificaties..."; \
|
||||||
|
for i in $$(seq 1 60); do \
|
||||||
|
oz=$$(curl -s -o /dev/null -w "%{http_code}" $(OZ_BASE)/admin/ || true); \
|
||||||
|
nrc=$$(curl -s -o /dev/null -w "%{http_code}" $(NRC_BASE)/admin/ || true); \
|
||||||
|
[ "$$oz" = "302" ] && [ "$$nrc" = "302" ] && break; sleep 3; done; \
|
||||||
|
z=$$(curl -s -o /dev/null -w "%{http_code}" $(OZ_BASE)/zaken/api/v1/zaken); \
|
||||||
|
echo "OpenZaak /zaken (unauth) -> $$z (expect 403)"; test "$$z" = "403"; \
|
||||||
|
echo "OpenZaak /admin/ -> $$oz (expect 302)"; test "$$oz" = "302"; \
|
||||||
|
echo "Open Notificaties /admin/-> $$nrc (expect 302)"; test "$$nrc" = "302"; \
|
||||||
|
echo "stack smoke OK"'
|
||||||
|
|
||||||
|
## stack-down: stop and remove both stacks (wipes data)
|
||||||
|
stack-down:
|
||||||
|
docker compose $(STACK_FILES) down --volumes
|
||||||
|
|
||||||
|
## keycloak-up: start Keycloak with the four imported realms
|
||||||
|
keycloak-up:
|
||||||
|
docker compose -f $(KC_COMPOSE) up -d
|
||||||
|
|
||||||
|
## keycloak-smoke: start Keycloak, then verify each realm logs in + returns its claim
|
||||||
|
keycloak-smoke: keycloak-up
|
||||||
|
@bash -c 'for i in $$(seq 1 60); do \
|
||||||
|
c=$$(curl -s -o /dev/null -w "%{http_code}" $(KC_BASE)/realms/digid/.well-known/openid-configuration || true); \
|
||||||
|
[ "$$c" = "200" ] && break; sleep 3; done; echo "Keycloak ready ($$c)"'
|
||||||
|
python3 infra/keycloak/check_realms.py
|
||||||
|
|
||||||
|
## keycloak-down: stop and remove Keycloak
|
||||||
|
keycloak-down:
|
||||||
|
docker compose -f $(KC_COMPOSE) down --volumes
|
||||||
|
|
||||||
## help: list available targets
|
## help: list available targets
|
||||||
help:
|
help:
|
||||||
@grep -E '^## ' $(MAKEFILE_LIST) | sed 's/^## //'
|
@grep -E '^## ' $(MAKEFILE_LIST) | sed 's/^## //'
|
||||||
|
|||||||
37
docs/runbooks/keycloak.md
Normal file
37
docs/runbooks/keycloak.md
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
# Keycloak runbook
|
||||||
|
|
||||||
|
Keycloak (`infra/keycloak/docker-compose.yml`) runs in dev mode with four realms
|
||||||
|
imported at boot from `infra/keycloak/realms/`: **digid**, **eherkenning**, **eidas**,
|
||||||
|
**medewerker**. It mocks the Dutch identity brokers so portals can do real OIDC logins
|
||||||
|
locally. Host port **:8180**.
|
||||||
|
|
||||||
|
## Quick test (`make`)
|
||||||
|
|
||||||
|
```bash
|
||||||
|
make keycloak-up # start Keycloak + import realms (~30-60s first boot)
|
||||||
|
make keycloak-smoke # start + verify every realm logs in and returns its claim
|
||||||
|
make keycloak-down # stop + wipe
|
||||||
|
```
|
||||||
|
|
||||||
|
`make keycloak-smoke` runs `infra/keycloak/check_realms.py`, which does a password-grant
|
||||||
|
login per realm and asserts the identifying claim:
|
||||||
|
|
||||||
|
| Realm | User | Claim asserted |
|
||||||
|
|---|---|---|
|
||||||
|
| digid | jan-burger | `bsn` |
|
||||||
|
| eherkenning | acme-ondernemer | `kvk` |
|
||||||
|
| eidas | pierre-dupont | `eidas_id` |
|
||||||
|
| medewerker | merel-behandelaar | role `behandelaar` |
|
||||||
|
|
||||||
|
All test users / credentials are in [../synthetic-data.md](../synthetic-data.md).
|
||||||
|
|
||||||
|
## Notes
|
||||||
|
|
||||||
|
- **Admin console:** <http://localhost:8180/> — `admin` / `admin` (dev only).
|
||||||
|
- **Client `big-portal`** is public with `standardFlowEnabled` (browser redirect login)
|
||||||
|
*and* `directAccessGrantsEnabled` (password grant, used by the smoke test).
|
||||||
|
- **Dev store:** in-memory H2 via `start-dev`; realms re-import on each boot, so changes
|
||||||
|
made in the admin UI don't persist. Edit the realm JSONs to make durable changes.
|
||||||
|
- **Image** pinned to `quay.io/keycloak/keycloak:26.1`.
|
||||||
|
- Claims are injected by OIDC protocol mappers on `big-portal` (user attribute → token
|
||||||
|
claim); `medewerker` roles come through `realm_access.roles`.
|
||||||
44
docs/runbooks/opennotificaties.md
Normal file
44
docs/runbooks/opennotificaties.md
Normal file
@@ -0,0 +1,44 @@
|
|||||||
|
# Open Notificaties (NRC) runbook
|
||||||
|
|
||||||
|
The Open Notificaties stack (`infra/opennotificaties/docker-compose.yml`) is a lean
|
||||||
|
adaptation of the upstream dev compose: PostGIS db, redis (also the Celery broker), a
|
||||||
|
one-shot migrate-init, the API, and a celery worker. It shares the **`cg`** Docker
|
||||||
|
network with the OpenZaak stack so the two can reach each other by service name.
|
||||||
|
|
||||||
|
NRC is published on host **:8001** (OpenZaak holds :8000).
|
||||||
|
|
||||||
|
## Quick test (`make`) — both platforms together
|
||||||
|
|
||||||
|
```bash
|
||||||
|
make stack-up # OpenZaak + Open Notificaties on the shared network
|
||||||
|
make stack-smoke # start both + assert reachable (OZ 403/302/200, NRC 302)
|
||||||
|
make stack-down # stop + wipe both
|
||||||
|
```
|
||||||
|
|
||||||
|
`make stack-smoke` runs `docker compose -f infra/openzaak/... -f infra/opennotificaties/... up -d`
|
||||||
|
and asserts:
|
||||||
|
|
||||||
|
| Check | Expected |
|
||||||
|
|---|---|
|
||||||
|
| OpenZaak `GET /zaken/api/v1/zaken` (no JWT) | 403 (auth enforced) |
|
||||||
|
| OpenZaak `GET /admin/` | 302 |
|
||||||
|
| Open Notificaties `GET /admin/` | 302 |
|
||||||
|
|
||||||
|
NRC admin UI: <http://localhost:8001/admin/> (dev superuser **admin / admin**).
|
||||||
|
|
||||||
|
## Notification wiring is deferred to S-06
|
||||||
|
|
||||||
|
Both platforms are **up and reachable**, but OpenZaak→NRC notification *delivery* is not
|
||||||
|
wired yet, and OpenZaak still runs with `NOTIFICATIONS_DISABLED=true`. The bidirectional
|
||||||
|
auth wiring (NRC `setup_configuration`: Services + Authorization to OpenZaak's
|
||||||
|
Autorisaties API + JWT secrets + Kanalen + Abonnementen; OpenZaak's NotificationConfig)
|
||||||
|
lands with **S-06 (Event Subscriber)** — the slice that actually consumes events. NRC's
|
||||||
|
`setup_configuration/data.yaml` is intentionally minimal (migrations only) until then.
|
||||||
|
|
||||||
|
This matches S-01's acceptance, which asks only that the platforms *come up in compose*
|
||||||
|
and a health check confirms them reachable.
|
||||||
|
|
||||||
|
## Prerequisites
|
||||||
|
|
||||||
|
Same rootless-Podman setup as the rest of the repo — see [ci.md](ci.md) and
|
||||||
|
[openzaak.md](openzaak.md). `systemctl --user start podman.socket` once per session.
|
||||||
@@ -66,8 +66,9 @@ The Makefile auto-points `DOCKER_HOST` at the Podman socket when it exists, so t
|
|||||||
- **Not in `make ci`.** The OpenZaak smoke is a separate, heavier check (large image
|
- **Not in `make ci`.** The OpenZaak smoke is a separate, heavier check (large image
|
||||||
pull + migrations); it is intentionally kept out of `make ci` so the core gate
|
pull + migrations); it is intentionally kept out of `make ci` so the core gate
|
||||||
stays fast. Run `make openzaak-smoke` when you touch the OpenZaak stack.
|
stays fast. Run `make openzaak-smoke` when you touch the OpenZaak stack.
|
||||||
- **Notifications disabled.** `NOTIFICATIONS_DISABLED=true` until Open Notificaties
|
- **Notifications disabled.** `NOTIFICATIONS_DISABLED=true` — otherwise ZTC writes 500
|
||||||
(NRC) lands in S-01-c — otherwise ZTC writes 500 trying to notify. Re-enable then.
|
trying to notify. Open Notificaties is now up (see [opennotificaties.md](opennotificaties.md)),
|
||||||
|
but OZ→NRC delivery wiring + re-enabling lands with **S-06**.
|
||||||
- **Zaaktype is a concept**, not published (publishing needs roltypen/statustypen/
|
- **Zaaktype is a concept**, not published (publishing needs roltypen/statustypen/
|
||||||
resultaattypen — beyond the lean seed). List with `?status=alles`.
|
resultaattypen — beyond the lean seed). List with `?status=alles`.
|
||||||
- **Image tag.** Currently `openzaak/open-zaak:latest` via `${OPENZAAK_TAG}`; pin to
|
- **Image tag.** Currently `openzaak/open-zaak:latest` via `${OPENZAAK_TAG}`; pin to
|
||||||
|
|||||||
35
docs/synthetic-data.md
Normal file
35
docs/synthetic-data.md
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
# Synthetic data
|
||||||
|
|
||||||
|
All credentials here are **dev-only** synthetic test data — never real personal data,
|
||||||
|
never used outside local development.
|
||||||
|
|
||||||
|
## Keycloak realms (S-02)
|
||||||
|
|
||||||
|
Keycloak runs at <http://localhost:8180> (admin console: **admin / admin**). Four realms
|
||||||
|
are imported at boot from `infra/keycloak/realms/`. Each has a public OIDC client
|
||||||
|
**`big-portal`** (standard flow + direct access grants enabled, redirect URIs `*` for dev).
|
||||||
|
|
||||||
|
All test users share the password **`test123`**.
|
||||||
|
|
||||||
|
| Realm | Mimics | User | Identifying claim |
|
||||||
|
|---|---|---|---|
|
||||||
|
| `digid` | DigiD (burgers) | `jan-burger` | `bsn` = `123456782` |
|
||||||
|
| `eherkenning` | eHerkenning (bedrijven) | `acme-ondernemer` | `kvk` = `12345678` |
|
||||||
|
| `eidas` | eIDAS (EU) | `pierre-dupont` | `eidas_id` = `FR/NL/AB-1234-5678` |
|
||||||
|
| `medewerker` | Internal staff | `merel-behandelaar` | role `behandelaar` |
|
||||||
|
| `medewerker` | Internal staff | `tom-teamlead` | roles `behandelaar`, `teamlead` |
|
||||||
|
|
||||||
|
The identifying claims are injected via OIDC protocol mappers on `big-portal`
|
||||||
|
(user-attribute → token claim); `medewerker` roles appear in `realm_access.roles`.
|
||||||
|
|
||||||
|
## Get a token (for testing)
|
||||||
|
|
||||||
|
```bash
|
||||||
|
curl -s -X POST \
|
||||||
|
http://localhost:8180/realms/digid/protocol/openid-connect/token \
|
||||||
|
-d grant_type=password -d client_id=big-portal \
|
||||||
|
-d username=jan-burger -d password=test123 -d scope=openid | jq -r .access_token
|
||||||
|
```
|
||||||
|
|
||||||
|
Decode the JWT payload to see the `bsn` claim. `make keycloak-smoke` checks every realm
|
||||||
|
automatically.
|
||||||
60
infra/keycloak/check_realms.py
Normal file
60
infra/keycloak/check_realms.py
Normal file
@@ -0,0 +1,60 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
"""Smoke-check the Keycloak realms: each realm's OIDC login works (password grant)
|
||||||
|
and returns its expected identifying claim. Stdlib only. Exits non-zero on failure.
|
||||||
|
"""
|
||||||
|
import base64, json, sys, urllib.error, urllib.parse, urllib.request
|
||||||
|
|
||||||
|
BASE = "http://localhost:8180"
|
||||||
|
CLIENT = "big-portal"
|
||||||
|
PWD = "test123"
|
||||||
|
|
||||||
|
# realm, user, claim ("__roles__" => check realm_access.roles), expected-contains
|
||||||
|
CHECKS = [
|
||||||
|
("digid", "jan-burger", "bsn", "123456782"),
|
||||||
|
("eherkenning", "acme-ondernemer", "kvk", "12345678"),
|
||||||
|
("eidas", "pierre-dupont", "eidas_id", "FR/NL"),
|
||||||
|
("medewerker", "merel-behandelaar", "__roles__", "behandelaar"),
|
||||||
|
]
|
||||||
|
|
||||||
|
|
||||||
|
def decode(jwt):
|
||||||
|
p = jwt.split(".")[1]
|
||||||
|
p += "=" * (-len(p) % 4)
|
||||||
|
return json.loads(base64.urlsafe_b64decode(p))
|
||||||
|
|
||||||
|
|
||||||
|
def grant(realm, user):
|
||||||
|
data = urllib.parse.urlencode({
|
||||||
|
"grant_type": "password", "client_id": CLIENT,
|
||||||
|
"username": user, "password": PWD, "scope": "openid",
|
||||||
|
}).encode()
|
||||||
|
req = urllib.request.Request(
|
||||||
|
f"{BASE}/realms/{realm}/protocol/openid-connect/token", data=data,
|
||||||
|
headers={"Content-Type": "application/x-www-form-urlencoded"})
|
||||||
|
with urllib.request.urlopen(req, timeout=20) as r:
|
||||||
|
return json.loads(r.read())
|
||||||
|
|
||||||
|
|
||||||
|
def main():
|
||||||
|
ok = True
|
||||||
|
for realm, user, claim, expect in CHECKS:
|
||||||
|
try:
|
||||||
|
at = decode(grant(realm, user)["access_token"])
|
||||||
|
if claim == "__roles__":
|
||||||
|
val = at.get("realm_access", {}).get("roles", [])
|
||||||
|
good = expect in val
|
||||||
|
else:
|
||||||
|
val = at.get(claim)
|
||||||
|
good = val is not None and expect in str(val)
|
||||||
|
print(f"{realm:12} {user:18} login OK | {claim} = {val} "
|
||||||
|
f"[{'OK' if good else 'UNEXPECTED'}]")
|
||||||
|
ok = ok and good
|
||||||
|
except urllib.error.HTTPError as e:
|
||||||
|
ok = False
|
||||||
|
print(f"{realm:12} {user:18} LOGIN FAILED {e.code}: {e.read()[:200]!r}")
|
||||||
|
print("keycloak smoke OK" if ok else "keycloak smoke FAILED")
|
||||||
|
sys.exit(0 if ok else 1)
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
main()
|
||||||
29
infra/keycloak/docker-compose.yml
Normal file
29
infra/keycloak/docker-compose.yml
Normal file
@@ -0,0 +1,29 @@
|
|||||||
|
# Keycloak (S-02) with four pre-seeded realms imported at boot:
|
||||||
|
# digid · eherkenning · eidas · medewerker
|
||||||
|
# Dev mode, H2 in-memory store, realm JSONs imported from ./realms.
|
||||||
|
#
|
||||||
|
# docker compose -f infra/keycloak/docker-compose.yml up -d
|
||||||
|
# curl -s -o /dev/null -w '%{http_code}\n' \
|
||||||
|
# http://localhost:8180/realms/digid/.well-known/openid-configuration # -> 200
|
||||||
|
#
|
||||||
|
# Admin console: http://localhost:8180/ (admin / admin — dev only)
|
||||||
|
services:
|
||||||
|
keycloak:
|
||||||
|
image: quay.io/keycloak/keycloak:26.1
|
||||||
|
command: ["start-dev", "--import-realm"]
|
||||||
|
environment:
|
||||||
|
KC_BOOTSTRAP_ADMIN_USERNAME: admin
|
||||||
|
KC_BOOTSTRAP_ADMIN_PASSWORD: admin
|
||||||
|
# Older var names too, harmless on 26.x:
|
||||||
|
KEYCLOAK_ADMIN: admin
|
||||||
|
KEYCLOAK_ADMIN_PASSWORD: admin
|
||||||
|
KC_HEALTH_ENABLED: "true"
|
||||||
|
KC_HTTP_ENABLED: "true"
|
||||||
|
ports:
|
||||||
|
- "8180:8080"
|
||||||
|
volumes:
|
||||||
|
- ./realms:/opt/keycloak/data/import:ro,z
|
||||||
|
networks: [cg]
|
||||||
|
|
||||||
|
networks:
|
||||||
|
cg:
|
||||||
43
infra/keycloak/realms/digid-realm.json
Normal file
43
infra/keycloak/realms/digid-realm.json
Normal file
@@ -0,0 +1,43 @@
|
|||||||
|
{
|
||||||
|
"realm": "digid",
|
||||||
|
"enabled": true,
|
||||||
|
"displayName": "Mock DigiD",
|
||||||
|
"clients": [
|
||||||
|
{
|
||||||
|
"clientId": "big-portal",
|
||||||
|
"enabled": true,
|
||||||
|
"publicClient": true,
|
||||||
|
"standardFlowEnabled": true,
|
||||||
|
"directAccessGrantsEnabled": true,
|
||||||
|
"redirectUris": ["*"],
|
||||||
|
"webOrigins": ["*"],
|
||||||
|
"protocolMappers": [
|
||||||
|
{
|
||||||
|
"name": "bsn",
|
||||||
|
"protocol": "openid-connect",
|
||||||
|
"protocolMapper": "oidc-usermodel-attribute-mapper",
|
||||||
|
"config": {
|
||||||
|
"user.attribute": "bsn",
|
||||||
|
"claim.name": "bsn",
|
||||||
|
"jsonType.label": "String",
|
||||||
|
"id.token.claim": "true",
|
||||||
|
"access.token.claim": "true",
|
||||||
|
"userinfo.token.claim": "true"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"users": [
|
||||||
|
{
|
||||||
|
"username": "jan-burger",
|
||||||
|
"enabled": true,
|
||||||
|
"firstName": "Jan",
|
||||||
|
"lastName": "Burger",
|
||||||
|
"email": "jan.burger@example.nl",
|
||||||
|
"emailVerified": true,
|
||||||
|
"credentials": [{ "type": "password", "value": "test123", "temporary": false }],
|
||||||
|
"attributes": { "bsn": ["123456782"] }
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
43
infra/keycloak/realms/eherkenning-realm.json
Normal file
43
infra/keycloak/realms/eherkenning-realm.json
Normal file
@@ -0,0 +1,43 @@
|
|||||||
|
{
|
||||||
|
"realm": "eherkenning",
|
||||||
|
"enabled": true,
|
||||||
|
"displayName": "Mock eHerkenning",
|
||||||
|
"clients": [
|
||||||
|
{
|
||||||
|
"clientId": "big-portal",
|
||||||
|
"enabled": true,
|
||||||
|
"publicClient": true,
|
||||||
|
"standardFlowEnabled": true,
|
||||||
|
"directAccessGrantsEnabled": true,
|
||||||
|
"redirectUris": ["*"],
|
||||||
|
"webOrigins": ["*"],
|
||||||
|
"protocolMappers": [
|
||||||
|
{
|
||||||
|
"name": "kvk",
|
||||||
|
"protocol": "openid-connect",
|
||||||
|
"protocolMapper": "oidc-usermodel-attribute-mapper",
|
||||||
|
"config": {
|
||||||
|
"user.attribute": "kvk",
|
||||||
|
"claim.name": "kvk",
|
||||||
|
"jsonType.label": "String",
|
||||||
|
"id.token.claim": "true",
|
||||||
|
"access.token.claim": "true",
|
||||||
|
"userinfo.token.claim": "true"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"users": [
|
||||||
|
{
|
||||||
|
"username": "acme-ondernemer",
|
||||||
|
"enabled": true,
|
||||||
|
"firstName": "Anita",
|
||||||
|
"lastName": "Ondernemer",
|
||||||
|
"email": "anita@acme.nl",
|
||||||
|
"emailVerified": true,
|
||||||
|
"credentials": [{ "type": "password", "value": "test123", "temporary": false }],
|
||||||
|
"attributes": { "kvk": ["12345678"] }
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
43
infra/keycloak/realms/eidas-realm.json
Normal file
43
infra/keycloak/realms/eidas-realm.json
Normal file
@@ -0,0 +1,43 @@
|
|||||||
|
{
|
||||||
|
"realm": "eidas",
|
||||||
|
"enabled": true,
|
||||||
|
"displayName": "Mock eIDAS",
|
||||||
|
"clients": [
|
||||||
|
{
|
||||||
|
"clientId": "big-portal",
|
||||||
|
"enabled": true,
|
||||||
|
"publicClient": true,
|
||||||
|
"standardFlowEnabled": true,
|
||||||
|
"directAccessGrantsEnabled": true,
|
||||||
|
"redirectUris": ["*"],
|
||||||
|
"webOrigins": ["*"],
|
||||||
|
"protocolMappers": [
|
||||||
|
{
|
||||||
|
"name": "eidas_id",
|
||||||
|
"protocol": "openid-connect",
|
||||||
|
"protocolMapper": "oidc-usermodel-attribute-mapper",
|
||||||
|
"config": {
|
||||||
|
"user.attribute": "eidas_id",
|
||||||
|
"claim.name": "eidas_id",
|
||||||
|
"jsonType.label": "String",
|
||||||
|
"id.token.claim": "true",
|
||||||
|
"access.token.claim": "true",
|
||||||
|
"userinfo.token.claim": "true"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"users": [
|
||||||
|
{
|
||||||
|
"username": "pierre-dupont",
|
||||||
|
"enabled": true,
|
||||||
|
"firstName": "Pierre",
|
||||||
|
"lastName": "Dupont",
|
||||||
|
"email": "pierre.dupont@example.fr",
|
||||||
|
"emailVerified": true,
|
||||||
|
"credentials": [{ "type": "password", "value": "test123", "temporary": false }],
|
||||||
|
"attributes": { "eidas_id": ["FR/NL/AB-1234-5678"] }
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
44
infra/keycloak/realms/medewerker-realm.json
Normal file
44
infra/keycloak/realms/medewerker-realm.json
Normal file
@@ -0,0 +1,44 @@
|
|||||||
|
{
|
||||||
|
"realm": "medewerker",
|
||||||
|
"enabled": true,
|
||||||
|
"displayName": "Medewerkers",
|
||||||
|
"roles": {
|
||||||
|
"realm": [
|
||||||
|
{ "name": "behandelaar", "description": "Behandelt registratieaanvragen" },
|
||||||
|
{ "name": "teamlead", "description": "Teamleider behandeling" }
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"clients": [
|
||||||
|
{
|
||||||
|
"clientId": "big-portal",
|
||||||
|
"enabled": true,
|
||||||
|
"publicClient": true,
|
||||||
|
"standardFlowEnabled": true,
|
||||||
|
"directAccessGrantsEnabled": true,
|
||||||
|
"redirectUris": ["*"],
|
||||||
|
"webOrigins": ["*"]
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"users": [
|
||||||
|
{
|
||||||
|
"username": "merel-behandelaar",
|
||||||
|
"enabled": true,
|
||||||
|
"firstName": "Merel",
|
||||||
|
"lastName": "Behandelaar",
|
||||||
|
"email": "merel@big.example.nl",
|
||||||
|
"emailVerified": true,
|
||||||
|
"credentials": [{ "type": "password", "value": "test123", "temporary": false }],
|
||||||
|
"realmRoles": ["behandelaar"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"username": "tom-teamlead",
|
||||||
|
"enabled": true,
|
||||||
|
"firstName": "Tom",
|
||||||
|
"lastName": "Teamlead",
|
||||||
|
"email": "tom@big.example.nl",
|
||||||
|
"emailVerified": true,
|
||||||
|
"credentials": [{ "type": "password", "value": "test123", "temporary": false }],
|
||||||
|
"realmRoles": ["behandelaar", "teamlead"]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
91
infra/opennotificaties/docker-compose.yml
Normal file
91
infra/opennotificaties/docker-compose.yml
Normal file
@@ -0,0 +1,91 @@
|
|||||||
|
# Open Notificaties (NRC) stack (S-01-c). Lean adaptation of the upstream dev compose:
|
||||||
|
# db (PostGIS) + redis (also the Celery broker) + migrate-init + the API + a celery worker.
|
||||||
|
#
|
||||||
|
# Shares the `cg` network with the OpenZaak stack so the two can reach each other.
|
||||||
|
# Run BOTH together (NRC needs OpenZaak's Autorisaties API for auth wiring):
|
||||||
|
#
|
||||||
|
# docker compose -f infra/openzaak/docker-compose.yml -f infra/opennotificaties/docker-compose.yml up -d
|
||||||
|
# curl -s -o /dev/null -w '%{http_code}\n' http://localhost:8001/admin/ # -> 302
|
||||||
|
#
|
||||||
|
# NRC is published on host :8001 (OpenZaak holds :8000).
|
||||||
|
services:
|
||||||
|
nrc-db:
|
||||||
|
image: docker.io/postgis/postgis:17-3.5
|
||||||
|
environment:
|
||||||
|
POSTGRES_USER: opennotificaties
|
||||||
|
POSTGRES_PASSWORD: opennotificaties
|
||||||
|
POSTGRES_DB: opennotificaties
|
||||||
|
command: postgres -c max_connections=300
|
||||||
|
volumes:
|
||||||
|
- nrc-db:/var/lib/postgresql/data
|
||||||
|
healthcheck:
|
||||||
|
test: ["CMD-SHELL", "pg_isready -U opennotificaties -d opennotificaties"]
|
||||||
|
interval: 5s
|
||||||
|
timeout: 3s
|
||||||
|
retries: 10
|
||||||
|
networks: [cg]
|
||||||
|
|
||||||
|
nrc-redis:
|
||||||
|
image: docker.io/library/redis:7
|
||||||
|
networks: [cg]
|
||||||
|
|
||||||
|
nrc-init:
|
||||||
|
image: docker.io/openzaak/open-notificaties:${OPENNOTIFICATIES_TAG:-latest}
|
||||||
|
environment: &nrc-env
|
||||||
|
DJANGO_SETTINGS_MODULE: nrc.conf.docker
|
||||||
|
SECRET_KEY: ${NRC_SECRET_KEY:-dev-only-not-for-production}
|
||||||
|
DB_HOST: nrc-db
|
||||||
|
DB_NAME: opennotificaties
|
||||||
|
DB_USER: opennotificaties
|
||||||
|
DB_PASSWORD: opennotificaties
|
||||||
|
IS_HTTPS: "no"
|
||||||
|
ALLOWED_HOSTS: "*"
|
||||||
|
CACHE_DEFAULT: nrc-redis:6379/0
|
||||||
|
CACHE_AXES: nrc-redis:6379/0
|
||||||
|
CELERY_BROKER_URL: redis://nrc-redis:6379/1
|
||||||
|
CELERY_RESULT_BACKEND: redis://nrc-redis:6379/1
|
||||||
|
DISABLE_2FA: "true"
|
||||||
|
OPENNOTIFICATIES_SUPERUSER_USERNAME: admin
|
||||||
|
DJANGO_SUPERUSER_PASSWORD: admin
|
||||||
|
OPENNOTIFICATIES_SUPERUSER_EMAIL: admin@localhost
|
||||||
|
RUN_SETUP_CONFIG: "true"
|
||||||
|
command: /setup_configuration.sh
|
||||||
|
volumes:
|
||||||
|
- ./setup_configuration:/app/setup_configuration:ro,z
|
||||||
|
depends_on:
|
||||||
|
nrc-db:
|
||||||
|
condition: service_healthy
|
||||||
|
nrc-redis:
|
||||||
|
condition: service_started
|
||||||
|
networks: [cg]
|
||||||
|
|
||||||
|
nrc-web:
|
||||||
|
image: docker.io/openzaak/open-notificaties:${OPENNOTIFICATIES_TAG:-latest}
|
||||||
|
environment: *nrc-env
|
||||||
|
healthcheck:
|
||||||
|
test: ["CMD", "python", "-c", "import requests,sys; sys.exit(0 if requests.head('http://localhost:8000/admin/').status_code in (200,302) else 1)"]
|
||||||
|
interval: 10s
|
||||||
|
timeout: 5s
|
||||||
|
retries: 10
|
||||||
|
start_period: 30s
|
||||||
|
ports:
|
||||||
|
- "8001:8000"
|
||||||
|
depends_on:
|
||||||
|
nrc-init:
|
||||||
|
condition: service_completed_successfully
|
||||||
|
networks: [cg]
|
||||||
|
|
||||||
|
nrc-celery:
|
||||||
|
image: docker.io/openzaak/open-notificaties:${OPENNOTIFICATIES_TAG:-latest}
|
||||||
|
environment: *nrc-env
|
||||||
|
command: /celery_worker.sh
|
||||||
|
depends_on:
|
||||||
|
nrc-init:
|
||||||
|
condition: service_completed_successfully
|
||||||
|
networks: [cg]
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
nrc-db:
|
||||||
|
|
||||||
|
networks:
|
||||||
|
cg:
|
||||||
5
infra/opennotificaties/setup_configuration/data.yaml
Normal file
5
infra/opennotificaties/setup_configuration/data.yaml
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
# Open Notificaties setup_configuration.
|
||||||
|
# Stage 1 (this commit): intentionally minimal — the init container runs
|
||||||
|
# migrations; no steps enabled yet. The OpenZaak<->NRC notification wiring
|
||||||
|
# (Services, Authorization, JWT, Kanalen) is added next. See ADR-0002 / S-01-c.
|
||||||
|
{}
|
||||||
@@ -22,11 +22,11 @@ services:
|
|||||||
interval: 5s
|
interval: 5s
|
||||||
timeout: 3s
|
timeout: 3s
|
||||||
retries: 10
|
retries: 10
|
||||||
networks: [oz]
|
networks: [cg]
|
||||||
|
|
||||||
oz-redis:
|
oz-redis:
|
||||||
image: docker.io/library/redis:7
|
image: docker.io/library/redis:7
|
||||||
networks: [oz]
|
networks: [cg]
|
||||||
|
|
||||||
oz-init:
|
oz-init:
|
||||||
image: docker.io/openzaak/open-zaak:${OPENZAAK_TAG:-latest}
|
image: docker.io/openzaak/open-zaak:${OPENZAAK_TAG:-latest}
|
||||||
@@ -61,7 +61,7 @@ services:
|
|||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
oz-redis:
|
oz-redis:
|
||||||
condition: service_started
|
condition: service_started
|
||||||
networks: [oz]
|
networks: [cg]
|
||||||
|
|
||||||
openzaak:
|
openzaak:
|
||||||
image: docker.io/openzaak/open-zaak:${OPENZAAK_TAG:-latest}
|
image: docker.io/openzaak/open-zaak:${OPENZAAK_TAG:-latest}
|
||||||
@@ -77,7 +77,7 @@ services:
|
|||||||
depends_on:
|
depends_on:
|
||||||
oz-init:
|
oz-init:
|
||||||
condition: service_completed_successfully
|
condition: service_completed_successfully
|
||||||
networks: [oz]
|
networks: [cg]
|
||||||
|
|
||||||
oz-celery:
|
oz-celery:
|
||||||
image: docker.io/openzaak/open-zaak:${OPENZAAK_TAG:-latest}
|
image: docker.io/openzaak/open-zaak:${OPENZAAK_TAG:-latest}
|
||||||
@@ -86,10 +86,10 @@ services:
|
|||||||
depends_on:
|
depends_on:
|
||||||
oz-init:
|
oz-init:
|
||||||
condition: service_completed_successfully
|
condition: service_completed_successfully
|
||||||
networks: [oz]
|
networks: [cg]
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
oz-db:
|
oz-db:
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
oz:
|
cg:
|
||||||
|
|||||||
Reference in New Issue
Block a user