From 58b254f9cb923d5d0dfe53df4bca8a0f00bbcf0b Mon Sep 17 00:00:00 2001 From: Aaron Schif Date: Mon, 12 Jun 2023 03:22:46 -0500 Subject: Add OpenID Connect (#5351) * Add OIDC * Update documentation. * Update apache conf adding IfModule * Use IfDefine for OIDC in apache conf * Fix non-oidc support * Fix typing * Use IfDefine to enable OIDC * Add OIDC support to all dockerfiles * Re add apache Require option * Fixes and documentation * A few more fixes * A bit more doc * Change type of environment variable * Update readme * Correct apache config for OIDC support. * Fix README formatting * Update oidc control path * Fix oidc endpoint being cached * A bit more review * Simplify ExpiresActive * Add session refresh and improve caching * Allow more different setups * A bit more documentation * A bit more readme --------- Co-authored-by: Aaron Schif Co-authored-by: Alexandre Alapetite Co-authored-by: maTh --- Docker/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Docker/Dockerfile') diff --git a/Docker/Dockerfile b/Docker/Dockerfile index 211df9aaa..b205b9d9c 100644 --- a/Docker/Dockerfile +++ b/Docker/Dockerfile @@ -8,6 +8,7 @@ RUN apt-get update && \ apt-get install --no-install-recommends -y \ ca-certificates cron \ apache2 libapache2-mod-php \ + libapache2-mod-auth-openidc \ php-curl php-gmp php-intl php-mbstring php-xml php-zip \ php-sqlite3 php-mysql php-pgsql && \ rm -rf /var/lib/apt/lists/* @@ -55,6 +56,7 @@ ENV CRON_MIN '' ENV DATA_PATH '' ENV FRESHRSS_ENV '' ENV LISTEN '' +ENV OIDC_ENABLED '' ENTRYPOINT ["./Docker/entrypoint.sh"] @@ -62,4 +64,4 @@ EXPOSE 80 # hadolint ignore=DL3025 CMD ([ -z "$CRON_MIN" ] || cron) && \ . /etc/apache2/envvars && \ - exec apache2 -D FOREGROUND + exec apache2 -D FOREGROUND $([ -n "$OIDC_ENABLED" ] && [ "$OIDC_ENABLED" -ne 0 ] && echo '-D OIDC_ENABLED') -- cgit v1.2.3