Compare commits
5 Commits
f/clean_au
...
38ac3065e9
Author | SHA1 | Date | |
---|---|---|---|
38ac3065e9 | |||
2a6802aa56 | |||
027784e8f5 | |||
4c4abd6deb | |||
15c784fc33 |
@@ -16,13 +16,10 @@ 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 is enough.
|
||||
# Delete all rows without reference from table flow (foreign key)
|
||||
|
||||
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)))"
|
||||
|
||||
@@ -69,9 +66,6 @@ where table_schema = 'public'
|
||||
order by 4 desc;
|
||||
EOF
|
||||
|
||||
### Flow table
|
||||
|
||||
log "Cleaning flow table..."
|
||||
|
||||
REMAINING_ELMTS="${LIMIT}"
|
||||
while [ "${REMAINING_ELMTS}" -gt 0 ]; do
|
||||
@@ -92,7 +86,7 @@ EOF
|
||||
log "${OUTPUT}"
|
||||
|
||||
if ! [[ "${OUTPUT}" =~ '^DELETE ' ]] ; then
|
||||
log "Output doesn't seem OK..."
|
||||
log "Output doesn't seems OK..."
|
||||
break
|
||||
fi
|
||||
OUTPUT_NB=$(echo "${OUTPUT}" | cut -d' ' -f 2)
|
||||
@@ -107,75 +101,6 @@ EOF
|
||||
fi
|
||||
done
|
||||
|
||||
### Authentication session table
|
||||
|
||||
log "Cleaning authentication_session table..."
|
||||
|
||||
BATCH_SIZE="${BATCH_SIZE_ORIG}"
|
||||
REMAINING_ELMTS="${LIMIT}"
|
||||
|
||||
OUTPUT=$(psql "${DSN}" <<EOF
|
||||
DO \$\$
|
||||
BEGIN
|
||||
DROP TABLE IF EXISTS hydra_cleaner.hydra_childless_auth_session;
|
||||
DROP SCHEMA IF EXISTS hydra_cleaner;
|
||||
CREATE SCHEMA hydra_cleaner;
|
||||
CREATE TABLE hydra_cleaner.hydra_childless_auth_session AS
|
||||
SELECT id
|
||||
FROM hydra_oauth2_authentication_session
|
||||
WHERE NOT EXISTS (
|
||||
SELECT 1
|
||||
FROM hydra_oauth2_flow
|
||||
WHERE hydra_oauth2_authentication_session.id = hydra_oauth2_flow.login_session_id
|
||||
)
|
||||
LIMIT ${REMAINING_ELMTS};
|
||||
END \$\$;
|
||||
EOF
|
||||
)
|
||||
|
||||
log "${OUTPUT}"
|
||||
|
||||
while [ "${REMAINING_ELMTS}" -gt 0 ]; do
|
||||
|
||||
OUTPUT=$(psql "${DSN}" <<EOF
|
||||
WITH childless_auth_session_batch AS (
|
||||
SELECT id
|
||||
FROM hydra_cleaner.hydra_childless_auth_session
|
||||
LIMIT ${BATCH_SIZE}
|
||||
),
|
||||
auth_session_deleted AS (
|
||||
DELETE
|
||||
FROM hydra_oauth2_authentication_session
|
||||
WHERE hydra_oauth2_authentication_session.id IN (SELECT * FROM childless_auth_session_batch)
|
||||
AND NOT EXISTS (
|
||||
SELECT 1
|
||||
FROM hydra_oauth2_flow
|
||||
WHERE hydra_oauth2_authentication_session.id = hydra_oauth2_flow.login_session_id
|
||||
)
|
||||
)
|
||||
DELETE
|
||||
FROM hydra_cleaner.hydra_childless_auth_session
|
||||
WHERE hydra_cleaner.hydra_childless_auth_session.id IN (SELECT * FROM childless_auth_session_batch);
|
||||
EOF
|
||||
)
|
||||
|
||||
log "${OUTPUT}"
|
||||
|
||||
if ! [[ "${OUTPUT}" =~ '^DELETE ' ]] ; then
|
||||
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
|
||||
|
||||
log "Final estimated size:"
|
||||
psql "${DSN}" <<EOF
|
||||
|
@@ -18,7 +18,7 @@ spec:
|
||||
spec:
|
||||
containers:
|
||||
- name: hydra-oidc-php-fpm
|
||||
image: reg.cadoles.com/cadoles/hydra-oidc-base:2025.6.13-develop.1333.aa5c382
|
||||
image: reg.cadoles.com/cadoles/hydra-oidc-base:2025.5.2-symfonycontainerupdate.1649.313cb84
|
||||
imagePullPolicy: IfNotPresent
|
||||
args: ["/usr/sbin/php-fpm81", "-F", "-e"]
|
||||
readinessProbe:
|
||||
@@ -55,7 +55,7 @@ spec:
|
||||
runAsUser: 1000
|
||||
|
||||
- name: hydra-oidc-caddy
|
||||
image: reg.cadoles.com/cadoles/hydra-oidc-base:2025.6.13-develop.1333.aa5c382
|
||||
image: reg.cadoles.com/cadoles/hydra-oidc-base:2025.5.2-symfonycontainerupdate.1649.313cb84
|
||||
imagePullPolicy: IfNotPresent
|
||||
args:
|
||||
[
|
||||
@@ -97,10 +97,6 @@ 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
|
||||
|
@@ -21,15 +21,15 @@ spec:
|
||||
spec:
|
||||
containers:
|
||||
- name: hydra-sql-fpm
|
||||
image: reg.cadoles.com/cadoles/hydra-sql-base:2025.7.30-develop.1146.5f2654c
|
||||
image: reg.cadoles.com/cadoles/hydra-sql-base:2025.5.2-symfonycontainerupdate.1627.222206a
|
||||
imagePullPolicy: IfNotPresent
|
||||
args: ["/usr/sbin/php-fpm84", "-F", "-e"]
|
||||
args: ["/usr/sbin/php-fpm81", "-F", "-e"]
|
||||
readinessProbe:
|
||||
exec:
|
||||
command:
|
||||
- sh
|
||||
- -c
|
||||
- test -f /etc/php84/php-fpm.d/www.conf
|
||||
- test -f /etc/php81/php-fpm.d/www.conf
|
||||
livenessProbe:
|
||||
exec:
|
||||
command:
|
||||
@@ -61,13 +61,13 @@ spec:
|
||||
value: "0"
|
||||
volumeMounts:
|
||||
- name: hydra-sql-php-ini
|
||||
mountPath: /etc/php84/conf.d/03_base.ini
|
||||
mountPath: /etc/php81/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.7.30-develop.1146.5f2654c
|
||||
image: reg.cadoles.com/cadoles/hydra-sql-base:2025.5.2-symfonycontainerupdate.1627.222206a
|
||||
imagePullPolicy: IfNotPresent
|
||||
args: ["/usr/sbin/caddy", "run", "--adapter", "caddyfile", "--config", "/etc/caddy/Caddyfile"]
|
||||
readinessProbe:
|
||||
@@ -98,10 +98,6 @@ 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
|
||||
|
@@ -19,14 +19,14 @@ spec:
|
||||
spec:
|
||||
containers:
|
||||
- name: hydra-dispatcher-php-fpm
|
||||
image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2025.8.28-develop.1505.75881cb
|
||||
args: ["/usr/sbin/php-fpm84", "-F", "-e"]
|
||||
image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2025.5.2-symfonycontainerupdate.1656.b9fc5d8
|
||||
args: ["/usr/sbin/php-fpm81", "-F", "-e"]
|
||||
readinessProbe:
|
||||
exec:
|
||||
command:
|
||||
- sh
|
||||
- -c
|
||||
- test -f /etc/php84/php-fpm.d/www.conf
|
||||
- test -f /etc/php81/php-fpm.d/www.conf
|
||||
livenessProbe:
|
||||
exec:
|
||||
command:
|
||||
@@ -51,7 +51,7 @@ spec:
|
||||
name: hydra-dispatcher-env
|
||||
volumeMounts:
|
||||
- name: hydra-dispatcher-php-ini
|
||||
mountPath: /etc/php84/conf.d/03_base.ini
|
||||
mountPath: /etc/php81/conf.d/03_base.ini
|
||||
subPath: 03_base.ini
|
||||
- name: dispatcher-tmp
|
||||
mountPath: /tmp
|
||||
@@ -61,7 +61,7 @@ spec:
|
||||
runAsGroup: 1000
|
||||
runAsUser: 1000
|
||||
- name: hydra-dispatcher-caddy
|
||||
image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2025.8.28-develop.1505.75881cb
|
||||
image: reg.cadoles.com/cadoles/hydra-dispatcher-base:2025.5.2-symfonycontainerupdate.1656.b9fc5d8
|
||||
imagePullPolicy: IfNotPresent
|
||||
args:
|
||||
[
|
||||
@@ -100,10 +100,6 @@ 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
|
||||
|
Reference in New Issue
Block a user