move SSO client secret to Docker secret, gate SSO entrypoint on SSO_ENABLED
This commit is contained in:
@ -23,6 +23,6 @@ LETS_ENCRYPT_ENV=production
|
|||||||
#SSO_PROVIDER_NAME=Authentik
|
#SSO_PROVIDER_NAME=Authentik
|
||||||
#SSO_OIDC_URL=https://authentik.example.com/application/o/cryptpad
|
#SSO_OIDC_URL=https://authentik.example.com/application/o/cryptpad
|
||||||
#SSO_CLIENT_ID=cryptpad
|
#SSO_CLIENT_ID=cryptpad
|
||||||
#SSO_CLIENT_SECRET=
|
#SSO_CLIENT_SECRET_VERSION=v1
|
||||||
#SSO_JWT_ALG=RS256
|
#SSO_JWT_ALG=RS256
|
||||||
#SSO_PLUGIN_VERSION=0.4.0
|
#SSO_PLUGIN_VERSION=0.4.0
|
||||||
|
|||||||
4
abra.sh
4
abra.sh
@ -1,5 +1,5 @@
|
|||||||
export CONFIG_VERSION=v2
|
export CONFIG_VERSION=v2
|
||||||
export CONFIG_JS_VERSION=v2
|
export CONFIG_JS_VERSION=v2
|
||||||
export NGINX_CONF_VERSION=v1
|
export NGINX_CONF_VERSION=v1
|
||||||
export SSO_ENTRYPOINT_VERSION=v4
|
export SSO_ENTRYPOINT_VERSION=v5
|
||||||
export SSO_JS_VERSION=v2
|
export SSO_JS_VERSION=v3
|
||||||
|
|||||||
14
compose.yml
14
compose.yml
@ -4,7 +4,7 @@ version: "3.8"
|
|||||||
services:
|
services:
|
||||||
app:
|
app:
|
||||||
image: cryptpad/cryptpad:version-2026.2.0
|
image: cryptpad/cryptpad:version-2026.2.0
|
||||||
entrypoint: ["/bin/bash", "/sso-entrypoint.sh"]
|
entrypoint: ["/sso-entrypoint.sh", "/cryptpad/docker-entrypoint.sh"]
|
||||||
command: ["npm", "start"]
|
command: ["npm", "start"]
|
||||||
networks:
|
networks:
|
||||||
- backend
|
- backend
|
||||||
@ -19,14 +19,14 @@ services:
|
|||||||
- "CPAD_CONF=/cryptpad/config/config.js"
|
- "CPAD_CONF=/cryptpad/config/config.js"
|
||||||
# SSO plugin
|
# SSO plugin
|
||||||
- SSO_PLUGIN_VERSION
|
- SSO_PLUGIN_VERSION
|
||||||
- SSO_ENABLED
|
- "SSO_ENABLED=${SSO_ENABLED:-false}"
|
||||||
- SSO_ENFORCED
|
- SSO_ENFORCED
|
||||||
- SSO_PROVIDER_NAME
|
- SSO_PROVIDER_NAME
|
||||||
- SSO_OIDC_URL
|
- SSO_OIDC_URL
|
||||||
- SSO_CLIENT_ID
|
- SSO_CLIENT_ID
|
||||||
- SSO_CLIENT_SECRET
|
|
||||||
- SSO_JWT_ALG
|
- SSO_JWT_ALG
|
||||||
|
secrets:
|
||||||
|
- sso_client_s
|
||||||
volumes:
|
volumes:
|
||||||
- cryptpad_blob:/cryptpad/blob
|
- cryptpad_blob:/cryptpad/blob
|
||||||
- cryptpad_block:/cryptpad/block
|
- cryptpad_block:/cryptpad/block
|
||||||
@ -52,7 +52,6 @@ services:
|
|||||||
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
|
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
|
||||||
- "coop-cloud.${STACK_NAME}.version=0.5.0+v2026.2.0"
|
- "coop-cloud.${STACK_NAME}.version=0.5.0+v2026.2.0"
|
||||||
- "backupbot.backup=true"
|
- "backupbot.backup=true"
|
||||||
- "backupbot.backup.volumes.cryptpad_config=false"
|
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD", "curl", "-f", "http://localhost:3000"]
|
test: ["CMD", "curl", "-f", "http://localhost:3000"]
|
||||||
interval: 30s
|
interval: 30s
|
||||||
@ -96,6 +95,11 @@ volumes:
|
|||||||
cryptpad_config:
|
cryptpad_config:
|
||||||
cryptpad_plugins:
|
cryptpad_plugins:
|
||||||
|
|
||||||
|
secrets:
|
||||||
|
sso_client_s:
|
||||||
|
external: true
|
||||||
|
name: ${STACK_NAME}_sso_client_s_${SSO_CLIENT_SECRET_VERSION}
|
||||||
|
|
||||||
configs:
|
configs:
|
||||||
config_js:
|
config_js:
|
||||||
name: ${STACK_NAME}_config_${CONFIG_VERSION}
|
name: ${STACK_NAME}_config_${CONFIG_VERSION}
|
||||||
|
|||||||
@ -3,7 +3,13 @@ set -e
|
|||||||
|
|
||||||
# SSO plugin installer — runs before the original CryptPad entrypoint.
|
# SSO plugin installer — runs before the original CryptPad entrypoint.
|
||||||
# Clones the cryptpad/sso plugin into the plugins volume if not already present
|
# Clones the cryptpad/sso plugin into the plugins volume if not already present
|
||||||
# or if the version has changed, then delegates to the real entrypoint.
|
# or if the version has changed.
|
||||||
|
|
||||||
|
# Skips SSO setup entirely when SSO_ENABLED is not "true".
|
||||||
|
if [ "${SSO_ENABLED}" != "true" ]; then
|
||||||
|
echo "[sso-entrypoint] SSO not enabled, skipping plugin install"
|
||||||
|
exec "$@"
|
||||||
|
fi
|
||||||
|
|
||||||
PLUGIN_DIR="/cryptpad/lib/plugins/sso"
|
PLUGIN_DIR="/cryptpad/lib/plugins/sso"
|
||||||
VERSION_FILE="${PLUGIN_DIR}/.version"
|
VERSION_FILE="${PLUGIN_DIR}/.version"
|
||||||
@ -28,4 +34,4 @@ else
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Hand off to the original CryptPad entrypoint
|
# Hand off to the original CryptPad entrypoint
|
||||||
exec /bin/bash /cryptpad/docker-entrypoint.sh "$@"
|
exec "$@"
|
||||||
|
|||||||
@ -12,7 +12,7 @@ module.exports = {
|
|||||||
type: "oidc",
|
type: "oidc",
|
||||||
url: "{{ env "SSO_OIDC_URL" }}",
|
url: "{{ env "SSO_OIDC_URL" }}",
|
||||||
client_id: "{{ env "SSO_CLIENT_ID" }}",
|
client_id: "{{ env "SSO_CLIENT_ID" }}",
|
||||||
client_secret: "{{ env "SSO_CLIENT_SECRET" }}",
|
client_secret: "{{ secret "sso_client_s" }}",
|
||||||
id_token_alg: "{{ env "SSO_JWT_ALG" }}",
|
id_token_alg: "{{ env "SSO_JWT_ALG" }}",
|
||||||
use_pkce: true,
|
use_pkce: true,
|
||||||
use_nonce: true
|
use_nonce: true
|
||||||
|
|||||||
Reference in New Issue
Block a user