diff --git a/clients/quadraticserver/degoog.nix b/clients/quadraticserver/degoog.nix index af40868..f0e80f6 100644 --- a/clients/quadraticserver/degoog.nix +++ b/clients/quadraticserver/degoog.nix @@ -1,16 +1,95 @@ -{ inputs, config, ... }: { +{ inputs, config, ... }: +{ imports = [ inputs.degoog.nixosModules.default ]; - services = { - degoog = { - enable = true; - configurePostgres = true; + services = + let + domain = "search.federated.nexus"; + client = "search"; + proxySocket = "/run/oauth2-proxy/socket"; + proxy = "unix/${proxySocket}"; + in + { + degoog = { + enable = true; + configurePostgres = true; - environment.DEGOOG_UNIX_SOCKET = "/var/run/degoog/degoog.sock"; + environment.DEGOOG_UNIX_SOCKET = "/var/run/degoog/degoog.sock"; + }; + + kanidm.provision.systems.oauth2.${client} = { + displayName = "Search"; + originUrl = "https://${domain}/oauth2/callback"; + originLanding = "https://${domain}"; + basicSecretFile = "/var/lib/kanidm-oauth2-secrets/${client}"; + preferShortUsername = true; + scopeMaps.idm_all_persons = [ + "openid" + "email" + "profile" + ]; + }; + + oauth2-proxy = { + enable = true; + provider = "oidc"; + clientID = client; + clientSecretFile = config.services.kanidm.provision.systems.oauth2.${client}.basicSecretFile; + oidcIssuerUrl = "${config.services.kanidm.server.settings.origin}/oauth2/openid/${client}"; + httpAddress = "unix://${proxySocket},mode=0660"; + reverseProxy = true; + trustedProxyIP = [ "127.0.0.1/32" ]; + + email.domains = [ "*" ]; + cookie.secretFile = config.age.secrets."cookieSecret.age".path; + extraConfig = { + code-challenge-method = "S256"; + skip-provider-button = true; + whitelist-domain = domain; + }; + }; + + caddy.virtualHosts.${domain}.extraConfig = '' + handle /oauth2/* { + reverse_proxy ${proxy} { + header_up X-Real-IP {remote_host} + header_up X-Forwarded-Uri {uri} + } + } + + handle { + forward_auth ${proxy} { + uri /oauth2/auth + header_up X-Real-IP {remote_host} + + @unauthenticated status 401 + handle_response @unauthenticated { + redir * /oauth2/start?rd={scheme}://{host}{uri} 302 + } + } + + reverse_proxy unix/${config.services.degoog.environment.DEGOOG_UNIX_SOCKET} + } + ''; }; - caddy.authedHosts."search.federated.nexus" = - "reverse_proxy unix/${config.services.degoog.environment.DEGOOG_UNIX_SOCKET}"; - }; + systemd.services = { + caddy.serviceConfig.SupplementaryGroups = [ + "degoog" + "oauth2-proxy" + ]; - systemd.services.caddy.serviceConfig.SupplementaryGroups = [ "degoog" ]; + oauth2-proxy = { + requires = [ "kanidm.service" ]; + after = [ + "kanidm.service" + "caddy.service" + ]; + serviceConfig = { + Restart = "always"; + RestartSec = 10; + RuntimeDirectory = "oauth2-proxy"; + RuntimeDirectoryMode = "0750"; + }; + }; + }; } diff --git a/clients/quadraticserver/forgejo.nix b/clients/quadraticserver/forgejo.nix index f98ff81..0a4ac14 100644 --- a/clients/quadraticserver/forgejo.nix +++ b/clients/quadraticserver/forgejo.nix @@ -1,8 +1,14 @@ { pkgs, config, + lib, ... }: +let + client = "forgejo"; + sourceName = "Federated Nexus"; + cfg = config.services.forgejo; +in { networking.firewall.allowedTCPPorts = [ 22 ]; services = @@ -11,6 +17,19 @@ socket = "/run/forgejo/socket"; in { + kanidm.provision.systems.oauth2.${client} = { + displayName = "Forgejo"; + originUrl = "https://${domain}/user/oauth2/${lib.escapeURL sourceName}/callback"; + originLanding = "https://${domain}"; + basicSecretFile = "/var/lib/kanidm-oauth2-secrets/${client}"; + preferShortUsername = true; + scopeMaps.idm_all_persons = [ + "openid" + "email" + "profile" + ]; + }; + forgejo = { enable = true; package = pkgs.forgejo; # Not LTS @@ -63,9 +82,41 @@ }; systemd = { - services.forgejo.serviceConfig = { - MemoryHigh = "500M"; - MemoryMax = "600M"; + services = { + forgejo = { + requires = [ "kanidm-oauth2-secrets.service" ]; + after = [ "kanidm-oauth2-secrets.service" ]; + serviceConfig = { + MemoryHigh = "500M"; + MemoryMax = "600M"; + LoadCredential = "secret:${ + config.services.kanidm.provision.systems.oauth2.${client}.basicSecretFile + }"; + }; + + preStart = lib.mkAfter '' + # So a failed list stops here, rather than adding a duplicate source + set -o pipefail + forgejo() { ${lib.getExe cfg.package} --config ${cfg.customDir}/conf/app.ini "$@"; } + + args=( + --name ${lib.escapeShellArg sourceName} + --provider openidConnect + --key ${client} + --secret "$(< "$CREDENTIALS_DIRECTORY/secret")" + --auto-discover-url ${config.services.kanidm.server.settings.origin}/oauth2/openid/${client}/.well-known/openid-configuration + --scopes openid --scopes email --scopes profile + ) + + # Columns are separated by tabs + id=$(forgejo admin auth list | ${lib.getExe pkgs.gawk} -F '\t+' -v name=${lib.escapeShellArg sourceName} '$2 == name { print $1 }') + if [ -n "$id" ]; then + forgejo admin auth update-oauth --id "$id" "''${args[@]}" + else + forgejo admin auth add-oauth "''${args[@]}" + fi + ''; + }; }; sockets.forgejo = { requiredBy = [ "forgejo.service" ]; diff --git a/clients/quadraticserver/kanidm/default.nix b/clients/quadraticserver/kanidm/default.nix index 9666bc1..1e6ca49 100644 --- a/clients/quadraticserver/kanidm/default.nix +++ b/clients/quadraticserver/kanidm/default.nix @@ -1,6 +1,7 @@ { config, pkgs, + lib, ... }: let @@ -37,6 +38,9 @@ let mailSenderToken = "${bootstrapDir}/mail-sender-token"; migrateToken = "${bootstrapDir}/migrate-token"; + secretsDir = "/var/lib/kanidm-oauth2-secrets"; + oauth2Clients = builtins.attrNames config.services.kanidm.provision.systems.oauth2; + mailSenderConfig = (pkgs.formats.toml { }).generate "kanidm-mail-sender.toml" { instance_display_name = "Federated Nexus"; instance_url = "https://${domain}"; @@ -138,6 +142,26 @@ in ]; }; + "02-large-searches" = { + id = "5d0c3b1e-6f4a-4c8e-9b2d-7a1e8f3c6d40"; + assertions = [ + { + state = "present"; + id = "8e2f4a6c-1b3d-4e5f-a7c9-0d2e4f6a8b1c"; + class = [ + "group" + "account_policy" + ]; + name = "large-searches"; + description = "Members may search for more entries at once"; + member = [ "idm_admin" ]; + limit_search_max_results = 100000; + limit_search_max_filter_test = 100000; + entry_managed_by = "idm_admins"; + } + ]; + }; + # Existing built-in entries: class is omitted, as asserting it would # replace the entry's classes "10-builtin" = { @@ -154,6 +178,12 @@ in }; }; + provision = { + enable = true; + instanceUrl = "https://${address}"; + acceptInvalidCerts = true; + }; + client = { enable = true; settings.uri = "https://${domain}"; @@ -224,6 +254,36 @@ in ''; }; + kanidm-oauth2-secrets = { + description = "Generate Kanidm's OAuth2 client secrets"; + requiredBy = [ "kanidm.service" ]; + before = [ "kanidm.service" ]; + path = [ pkgs.openssl ]; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + User = "kanidm"; + Group = "kanidm"; + StateDirectory = "kanidm-oauth2-secrets"; + StateDirectoryMode = "0700"; + }; + script = '' + umask 077 + for client in ${lib.escapeShellArgs oauth2Clients}; do + file=${secretsDir}/$client + if [ -s "$file" ]; then + # Strip newline if there is one, like the older version of the script made + secret=$(< "$file") + else + secret=$(openssl rand -hex 32) + fi + printf %s "$secret" > "$file.tmp" + chmod 0400 "$file.tmp" + mv "$file.tmp" "$file" + done + ''; + }; + # Settings that Kanidm's migrations and provisioning can't express. Logs in # by resetting the admin accounts' passwords through kanidmd's local admin # socket, like the NixOS provisioning does, so no admin passwords are stored. diff --git a/clients/quadraticserver/lasuite-docs/default.nix b/clients/quadraticserver/lasuite-docs/default.nix index 0386aa0..067070d 100644 --- a/clients/quadraticserver/lasuite-docs/default.nix +++ b/clients/quadraticserver/lasuite-docs/default.nix @@ -9,7 +9,9 @@ let secrets = config.age.secrets; domain = "docs.federated.nexus"; - authDomain = "auth.federated.nexus"; + kanidm = config.services.kanidm.server.settings.origin; + oidcClient = "docs"; + oidcEnv = "/run/lasuite-docs-oidc/env"; socket = "/run/lasuite-docs-gunicorn/socket"; # Attachments are stored in VersityGW, on the storage box like the continuwuity media @@ -23,6 +25,7 @@ let secrets."lasuiteSecrets.age".path secrets."lasuiteYProviderKey.age".path secrets."versityCredentials.age".path + oidcEnv ]; in { @@ -45,6 +48,33 @@ in ]; systemd.services = { + lasuite-docs-oidc = { + description = "Write lasuite-docs' Kanidm client secret to an environment file"; + requires = [ "kanidm-oauth2-secrets.service" ]; + after = [ "kanidm-oauth2-secrets.service" ]; + before = [ + "lasuite-docs.service" + "lasuite-docs-celery.service" + ]; + requiredBy = [ + "lasuite-docs.service" + "lasuite-docs-celery.service" + ]; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + RuntimeDirectory = "lasuite-docs-oidc"; + RuntimeDirectoryMode = "0700"; + RuntimeDirectoryPreserve = true; + }; + script = '' + umask 077 + printf 'OIDC_RP_CLIENT_SECRET=%s\n' "$(< ${ + config.services.kanidm.provision.systems.oauth2.${oidcClient}.basicSecretFile + })" > ${oidcEnv} + ''; + }; + lasuite-docs.serviceConfig = { EnvironmentFile = lib.mkForce backendEnvironmentFiles; Restart = "always"; @@ -159,6 +189,19 @@ in }; services = { + kanidm.provision.systems.oauth2.${oidcClient} = { + displayName = "Docs"; + originUrl = "https://${domain}/api/v1.0/callback/"; + originLanding = "https://${domain}"; + basicSecretFile = "/var/lib/kanidm-oauth2-secrets/${oidcClient}"; + preferShortUsername = true; + scopeMaps.idm_all_persons = [ + "openid" + "email" + "profile" + ]; + }; + lasuite-docs = { enable = true; enableNginx = false; @@ -176,10 +219,16 @@ in yhub.settings.SOFT_MIGRATION = false; settings = { - OIDC_OP_AUTHORIZATION_ENDPOINT = "https://federated.nexus/login"; - OIDC_OP_TOKEN_ENDPOINT = "https://${authDomain}/token"; - OIDC_OP_USER_ENDPOINT = "https://${authDomain}/userinfo"; - OIDC_RP_SIGN_ALGO = "HS256"; + OIDC_RP_CLIENT_ID = oidcClient; + OIDC_OP_AUTHORIZATION_ENDPOINT = "${kanidm}/ui/oauth2"; + OIDC_OP_TOKEN_ENDPOINT = "${kanidm}/oauth2/token"; + OIDC_OP_USER_ENDPOINT = "${kanidm}/oauth2/openid/${oidcClient}/userinfo"; + OIDC_OP_JWKS_ENDPOINT = "${kanidm}/oauth2/openid/${oidcClient}/public_key.jwk"; + OIDC_RP_SIGN_ALGO = "ES256"; + OIDC_RP_SCOPES = "openid email profile"; + OIDC_USE_PKCE = true; + OIDC_USERINFO_FULLNAME_FIELDS = "name"; + OIDC_USERINFO_SHORTNAME_FIELD = "name"; LOGIN_REDIRECT_URL = "https://${domain}"; diff --git a/modules/server/caddy.nix b/modules/server/caddy.nix index 5574570..9bd6449 100644 --- a/modules/server/caddy.nix +++ b/modules/server/caddy.nix @@ -1,15 +1,5 @@ +{ lib, ... }: { - config, - pkgs, - lib, - ... -}: -{ - options.services.caddy.authedHosts = lib.mkOption { - type = lib.types.attrsOf lib.types.lines; - default = { }; - }; - config = { systemd = { services = { @@ -48,42 +38,11 @@ services.caddy = { enable = true; email = "henry@henryhiles.com"; - environmentFile = config.age.secrets."base64JwtSecret.age".path; - package = pkgs.caddy.withPlugins { - plugins = [ - "github.com/ggicci/caddy-jwt@v1.3.0" - ]; - hash = "sha256-35MdO6F5hZ/0tUAnMWwMfMy/4yPBNuMzHZP3SBlxz+8="; - }; - globalConfig = '' metrics { per_host } ''; - - virtualHosts = lib.mapAttrs (domain: host: { - extraConfig = - let - auth = "https://auth.federated.nexus"; - in - '' - handle_errors 401 { - redir https://federated.nexus/login?redirect_uri=${auth}/bridge?redirect_uri=https://${domain}{uri} 302 - } - - route { - jwtauth { - from_cookies id_token - sign_key {$JWK_SECRET} - issuer_whitelist ${auth} - audience_whitelist proxy - } - - ${host} - } - ''; - }) config.services.caddy.authedHosts; }; }; } diff --git a/secrets/cookieSecret.age b/secrets/cookieSecret.age index 2caf0ce..829986d 100644 --- a/secrets/cookieSecret.age +++ b/secrets/cookieSecret.age @@ -1,9 +1,5 @@ ------BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFZLUVVkUSBXVC9Y -ejZDRVFXa0dHeXpaVTFPaTlRUkNkR29WTkpuRGhSS2RCZmlMN0E0CkU4WFQwN0RL -Z2VMM29waDRDMi95bVpHNnk0ZVB4RlZLOUxzUlJHSE9JdlUKLT4gPC1ncmVhc2Ug -SzZzN3tJPyBmVVdJWApudwotLS0gTnZYRGdzQmpYM2VhZW1tWFo3V21LKzVSRXBV -cXZSYkQwVEhLOGlWcnJKawomBD/OVJ+bpe4aczYDXDRMYNdLrVbOVBTjUajac4rZ -kzd+VOjYYk319QbmrsPGX3D6I15YcCGdY+tfXjiO5UnTm+wUx5IqiSxCBMQVgDAC -h3X5aRXBELvC8iwoR/gy ------END AGE ENCRYPTED FILE----- +age-encryption.org/v1 +-> ssh-ed25519 VKQUdQ CQ5R7XtGBhsZs3vfYenGwMsmjg7+D3/mdf7oY2j/RW8 +dUDVPjkI/bxS+gQvf/bh92rLzosrotc1INABU1jkBNo +--- 3SJIwhjGtRqGb58QvD/SM2uaJAvoau+uE6nGkn0MpTw +èõºÉÙí¹¥ø¿:`LÎh~½Ô™š—wÑôixŸ«A$šÛßÓr¯Aùòn¥Æ•q¥eÿƒÜ‘e´v¡Æ \ No newline at end of file diff --git a/secrets/lasuiteSecrets.age b/secrets/lasuiteSecrets.age index 1ea597d..5ef50bd 100644 --- a/secrets/lasuiteSecrets.age +++ b/secrets/lasuiteSecrets.age @@ -1,14 +1,12 @@ -----BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFZLUVVkUSBVNjRa -WjJzTGJvNUpzNG5kclR5UmR3d0NyQkNOMUdoaFJnV1lRL2pqTkdVCjFGSUkxWms3 -QUlNU21Zb29YNkJuWjg5eERlUTJUSXlvNmVLaUhzWXNlNXMKLT4gJC1ncmVhc2Ug -VickMVk8RSB8QXRFKVJiWwpoTjdkcktFMkxLTTdVamd5OFVNUkQwdE1zK0ZXMjVu -TlRwVzZ1bnN6d1BTdDJ3YzZITHR3aHZTSzNsYlN4Z0xjCkoyM3Y4M3M1T0pTRkZ1 -aUhtMGJxcmN3Ci0tLSBzUEMvRjZBQnc3Q0N0REg2N0VwRHVyT3lSaWxpY3pVN2tN -SXdtbHV5UEwwCoXmcuKhAs/6MykLif+AOYRRxZNef+j3tqmZcBQuu0/hJ8oG8tWy -9Tm3PfGq3UVt5gj+FNCsXVsEoHHlJRWt8hP1zzinW59CYNVYDY80wEIqrxhWeGgW -fUzxZH/6wvBzZ4EysiXGKvYgt2pNiwSjcj8y48HNDyOqrYqdaY5T22Ev/BtdBHEX -yeVRmHXaGPm5DAULw0ugIW4NeXgsgsTD9iHxCuVHJhH9TKonLzi6WCu+wtggEMN8 -nfYmm2g3BSO2O+2UIwc2UVKTDQeJ6hIkrq6upPMqPH+HmIabv/Cu89YAbn1qinEr -1FpWNSmnsXu7mzo1qZE= +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFZLUVVkUSBXTStS +YWxqNFFYbHJPeCt4NURsZDhBcUhDclB5NjBGWUplV1BqS0xXSlJvCjY1dGZWTTRX +TlNOZ1FWMnMxUnk4M1loc21ubmNVaEdyaldTZUhmdXNyTW8KLT4gUixQLWdyZWFz +ZQpqdmxBQ25uMUdIZFhWbDMxSHNSd04rUCtTV1NxaGxjWHdPWXRCT2NXMkdwNTdE +bkE1ci9kRmFPWTBaQzQ1ZFNWCmh6cnRaRFZicE4xNUEvWStYM2dFak1KRms2VnVV +eVE1Y2x3Ci0tLSBvN0lycG9wN1J4SWdyV2srU1ExdHpEM3R5WnFZYTgrVzdER2VP +cmREMkRrCtwK7Sb6LVo8gr9XxZacS2TABj95NcuJC/FcY4nMpsoDigw5FMmPxXsb +qZORokzqVTFkI7wyk3UnY8ghR8V/4xCWp6RBXSwAde12SaHPPTxq4TYCzIgbkuWN +8pKjJ9zTUTg8xaWoORXQrNYpFzzWvkC+gCo1209vyq8xUT3f2H2t1M+lvSM8BJJE +yC2HFnEz1dwLQ+/5dQh944a3 -----END AGE ENCRYPTED FILE-----