Compare commits

...

13 Commits

Author SHA1 Message Date
a08dbfe270 feat(hydra-cleaner): clean authentication_session table 2025-08-21 14:17:25 +02:00
930ff42495 Merge pull request 'chore(hydra-sql) #57 : bump symfony to version 6.4 and php version to 8.4' (#75) from issue-57-hydra-sql into unstable
Reviewed-on: #75
2025-07-30 13:46:37 +02:00
494f6d7fc7 chore(hydra-sql) #57 : bump symfony to version 6.4 and php version to 8.4 2025-07-30 13:31:34 +02:00
5c0a0b43a1 Merge pull request 'feat(caddy) #27-SC : update oidc, sql and dispatcher caddy images' (#74) from issue-27-sc-caddy-logs into unstable
Reviewed-on: #74
2025-07-30 12:00:36 +02:00
bf338d0a32 feat(caddy) #27-SC : update oidc, sql and dispatcher caddy images 2025-06-13 13:52:47 +02:00
a50f2e50c3 Merge pull request 'Sprint-6 : Update for compatibility with new symfony containers' (#51) from rm-default-configs into unstable
Reviewed-on: #51
Reviewed-by: vfebvre <vfebvre@cadoles.com>
2025-05-12 13:26:29 +02:00
7134e53584 fix(security): bump alpine version to fix vulnerabilities 2025-05-12 13:25:39 +02:00
41afa90886 feat : add emptyDir on /tmp for symfony containers based containers 2025-05-12 13:25:39 +02:00
f8b1dae1f2 feat : update image refs 2025-05-12 13:25:37 +02:00
3c9b5ec22a Remove sql default config 2025-05-12 13:24:54 +02:00
39438b0778 Remove dispatcher default config 2025-05-12 13:24:54 +02:00
905a2aaa0d Merge pull request 'feat(FC2) : update hydra-oidc for fc2 compatibility' (#71) from fc2 into unstable
Reviewed-on: #71
2025-04-29 11:31:52 +02:00
d2dfc4a5f8 feat(FC2) : update hydra-oidc for fc2 compatibility 2025-04-29 11:31:52 +02:00
8 changed files with 77 additions and 54 deletions

View File

@ -16,10 +16,12 @@ set -o nounset
# -> delete "cascade" on table "flow" cleans access, code, oidc, pkce and refresh tables.
# For table authentication_session, a simple delete on this table should be enough.
DSN="${DSN:-postgresql://${HYDRA_DATABASE_USER}:${HYDRA_DATABASE_PASSWORD}@${HYDRA_DATABASE_SERVICE_NAME}:${HYDRA_DATABASE_SERVICE_PORT:-5432}/hydra?sslmode=disable}"
RETENTION_HOURS="${RETENTION_HOURS:-48}"
BATCH_SIZE="${BATCH_SIZE:-50}"
BATCH_SIZE_ORIG="${BATCH_SIZE}"
LIMIT="${LIMIT:-1000}"
BEFORE_DATE="$(date +'%Y-%m-%d %H:%M:%S' --date=@$(($(date +%s) - RETENTION_HOURS * 3600)))"
@ -86,7 +88,43 @@ EOF
log "${OUTPUT}"
if ! [[ "${OUTPUT}" =~ '^DELETE ' ]] ; then
log "Output doesn't seems OK..."
log "Output doesn't seem OK..."
break
fi
OUTPUT_NB=$(echo "${OUTPUT}" | cut -d' ' -f 2)
if [ "${OUTPUT_NB}" -lt "${BATCH_SIZE}" ]; then
break
fi
REMAINING_ELMTS=$((REMAINING_ELMTS - BATCH_SIZE))
if [ "${REMAINING_ELMTS}" -lt "${BATCH_SIZE}" ]; then
BATCH_SIZE="${REMAINING_ELMTS}"
fi
done
BATCH_SIZE="${BATCH_SIZE_ORIG}"
REMAINING_ELMTS="${LIMIT}"
while [ "${REMAINING_ELMTS}" -gt 0 ]; do
OUTPUT=$(psql "${DSN}" <<EOF
DELETE
FROM hydra_oauth2_authentication_session
WHERE id = ANY (
array(
SELECT id
FROM hydra_oauth2_authentication_session
WHERE authenticated_at < '${BEFORE_DATE}'
LIMIT ${BATCH_SIZE}
)
);
EOF
)
log "${OUTPUT}"
if ! [[ "${OUTPUT}" =~ '^DELETE ' ]] ; then
log "Output doesn't seem OK..."
break
fi
OUTPUT_NB=$(echo "${OUTPUT}" | cut -d' ' -f 2)

View File

@ -18,7 +18,7 @@ spec:
spec:
containers:
- name: hydra-oidc-php-fpm
image: reg.cadoles.com/cadoles/hydra-oidc-base:2024.4.2-develop.1349.c4711f6
image: reg.cadoles.com/cadoles/hydra-oidc-base:2025.6.13-develop.1333.aa5c382
imagePullPolicy: IfNotPresent
args: ["/usr/sbin/php-fpm81", "-F", "-e"]
readinessProbe:
@ -45,6 +45,9 @@ spec:
envFrom:
- configMapRef:
name: hydra-oidc-env
volumeMounts:
- name: oidc-tmp
mountPath: /tmp
resources: {}
securityContext:
runAsNonRoot: true
@ -52,7 +55,7 @@ spec:
runAsUser: 1000
- name: hydra-oidc-caddy
image: reg.cadoles.com/cadoles/hydra-oidc-base:2024.4.2-develop.1349.c4711f6
image: reg.cadoles.com/cadoles/hydra-oidc-base:2025.6.13-develop.1333.aa5c382
imagePullPolicy: IfNotPresent
args:
[
@ -94,9 +97,17 @@ spec:
value: "/tmp/caddy"
- name: CADDY_APP_ROOT_PUBLIC
value: "/app/public/"
- name: CADDY_LOG_FILTER
value: healthy|metrics
- name: CADDY_LOG_SKIP
value: "true"
resources: {}
securityContext:
runAsNonRoot: true
runAsGroup: 1000
runAsUser: 1000
restartPolicy: Always
volumes:
- name: oidc-tmp
emptyDir:
medium: Memory

View File

@ -1,7 +0,0 @@
sql_login:
login_column_name: mail
password_column_name: password
salt_column_name: salt
table_name: user
data_to_fetch:
- mail

View File

@ -27,9 +27,6 @@ configMapGenerator:
- ALTCHA_HOST=http://altcha:3333
- ALTCHA_BASE_URL=/altcha
- ALTCHA_ENABLED=true
- name: sql-login-config
files:
- ./files/sql_login.yaml
- name: hydra-sql-php-ini
files:
- ./files/03_base.ini

View File

@ -21,15 +21,15 @@ spec:
spec:
containers:
- name: hydra-sql-fpm
image: reg.cadoles.com/cadoles/hydra-sql-base:2025.4.15-develop.1007.945a558
image: reg.cadoles.com/cadoles/hydra-sql-base:2025.7.30-develop.1146.5f2654c
imagePullPolicy: IfNotPresent
args: ["/usr/sbin/php-fpm81", "-F", "-e"]
args: ["/usr/sbin/php-fpm84", "-F", "-e"]
readinessProbe:
exec:
command:
- sh
- -c
- test -f /etc/php81/php-fpm.d/www.conf
- test -f /etc/php84/php-fpm.d/www.conf
livenessProbe:
exec:
command:
@ -60,15 +60,14 @@ spec:
- name: OPCACHE_REVALIDATE_FREQ
value: "0"
volumeMounts:
- name: sql-login-config
mountPath: "/app/config/sql_login_configuration/sql_login.yaml"
subPath: "sql_login.yaml"
- name: hydra-sql-php-ini
mountPath: /etc/php81/conf.d/03_base.ini
mountPath: /etc/php84/conf.d/03_base.ini
subPath: 03_base.ini
- name: sql-tmp
mountPath: /tmp
- name: hydra-sql-caddy
image: reg.cadoles.com/cadoles/hydra-sql-base:2025.4.15-develop.1007.945a558
image: reg.cadoles.com/cadoles/hydra-sql-base:2025.7.30-develop.1146.5f2654c
imagePullPolicy: IfNotPresent
args: ["/usr/sbin/caddy", "run", "--adapter", "caddyfile", "--config", "/etc/caddy/Caddyfile"]
readinessProbe:
@ -99,6 +98,10 @@ spec:
value: "/tmp/caddy"
- name: CADDY_APP_ROOT_PUBLIC
value: "/app/public/"
- name: CADDY_LOG_FILTER
value: health|metrics
- name: CADDY_LOG_SKIP
value: "true"
resources: {}
securityContext:
runAsNonRoot: true
@ -107,16 +110,12 @@ spec:
ports:
- containerPort: 8080
name: http
volumeMounts:
- name: sql-login-config
mountPath: "/app/config/sql_login_configuration/sql_login.yaml"
subPath: "sql_login.yaml"
volumes:
- name: sql-login-config
configMap:
name: sql-login-config
- name: hydra-sql-php-ini
configMap:
name: hydra-sql-php-ini
- name: sql-tmp
emptyDir:
medium: Memory
restartPolicy: Always

View File

@ -1,16 +0,0 @@
parameters:
env(HYDRA_DISPATCHER_WEBHOOK_ENABLED): false
env(HYDRA_DISPATCHER_WEBHOOK_API_URL): ""
env(HYDRA_DISPATCHER_WEBHOOK_API_KEY): ""
env(HYDRA_DISPATCHER_WEBHOOK_API_METHOD): POST
env(HYDRA_DISPATCHER_FIREWALL_ADDITIONAL_PROPERTIES): true
hydra:
apps: []
webhook:
enabled: "%env(bool:HYDRA_DISPATCHER_WEBHOOK_ENABLED)%"
api_url: "%env(string:HYDRA_DISPATCHER_WEBHOOK_API_URL)%"
api_key: "%env(string:HYDRA_DISPATCHER_WEBHOOK_API_KEY)%"
api_method: "%env(string:HYDRA_DISPATCHER_WEBHOOK_API_METHOD)%"
webhook_post_login:
enabled: false

View File

@ -26,9 +26,6 @@ configMapGenerator:
- DEFAULT_LOCALE=fr
- APP_LOCALES=fr,en
- REDIS_DSN="redis://redis:6379"
- name: hydra-dispatcher-apps
files:
- apps.yaml=./files/hydra/default.yaml
- name: hydra-dispatcher-php-ini
files:
- ./files/03_base.ini

View File

@ -19,7 +19,7 @@ spec:
spec:
containers:
- name: hydra-dispatcher-php-fpm
image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2025.3.18-develop.1401.4646fbb
image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2025.6.13-develop.1332.c8d277f
args: ["/usr/sbin/php-fpm81", "-F", "-e"]
readinessProbe:
exec:
@ -50,18 +50,18 @@ spec:
- configMapRef:
name: hydra-dispatcher-env
volumeMounts:
- mountPath: /app/config/hydra
name: hydra-dispatcher-apps
- name: hydra-dispatcher-php-ini
mountPath: /etc/php81/conf.d/03_base.ini
subPath: 03_base.ini
- name: dispatcher-tmp
mountPath: /tmp
resources: {}
securityContext:
runAsNonRoot: true
runAsGroup: 1000
runAsUser: 1000
- name: hydra-dispatcher-caddy
image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2025.3.18-develop.1401.4646fbb
image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2025.6.13-develop.1332.c8d277f
imagePullPolicy: IfNotPresent
args:
[
@ -100,6 +100,10 @@ spec:
value: "/tmp/caddy"
- name: CADDY_APP_ROOT_PUBLIC
value: "/app/public/"
- name: CADDY_LOG_FILTER
value: health|metrics
- name: CADDY_LOG_SKIP
value: "true"
ports:
- containerPort: 8080
name: http
@ -110,9 +114,9 @@ spec:
runAsUser: 1000
restartPolicy: Always
volumes:
- name: hydra-dispatcher-apps
configMap:
name: hydra-dispatcher-apps
- name: hydra-dispatcher-php-ini
configMap:
name: hydra-dispatcher-php-ini
- name: dispatcher-tmp
emptyDir:
medium: Memory