From d65b388b9f914ed0f6aa5ecee0002e2a00d27dad Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 21 Oct 2021 07:17:38 +0200 Subject: [PATCH 1/4] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index b5db8ed..ea4a0a4 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,6 +1,6 @@ alpine-baselayout-3.2.0-r16 alpine-keys-2.3-r1 -apache2-utils-2.4.50-r0 +apache2-utils-2.4.51-r0 apk-tools-2.12.7-r0 apr-1.7.0-r0 apr-util-1.6.1-r7 From 537c47f29348e177fd1a4a2d30b10431645ba3a8 Mon Sep 17 00:00:00 2001 From: aptalca Date: Sat, 23 Oct 2021 14:04:11 -0400 Subject: [PATCH 2/4] fix HE dns validation --- README.md | 1 + readme-vars.yml | 1 + root/etc/cont-init.d/50-config | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 300ebb0..c540444 100644 --- a/README.md +++ b/README.md @@ -332,6 +332,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **23.10.21:** - Fix Hurricane Electric (HE) DNS validation. * **12.10.21:** - Fix deprecated LE root cert check to fix failures when using `STAGING=true`, and failures in revoking. * **06.10.21:** - Added support for Hurricane Electric (HE) DNS validation. Added lxml build deps. * **01.10.21:** - Check if the cert uses the old LE root cert, revoke and regenerate if necessary. [Here's more info](https://twitter.com/letsencrypt/status/1443621997288767491) on LE root cert expiration diff --git a/readme-vars.yml b/readme-vars.yml index 6e177dd..45bb5cb 100755 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -155,6 +155,7 @@ app_setup_nginx_reverse_proxy_block: "" # changelog changelogs: + - { date: "23.10.21:", desc: "Fix Hurricane Electric (HE) DNS validation." } - { date: "12.10.21:", desc: "Fix deprecated LE root cert check to fix failures when using `STAGING=true`, and failures in revoking." } - { date: "06.10.21:", desc: "Added support for Hurricane Electric (HE) DNS validation. Added lxml build deps." } - { date: "01.10.21:", desc: "Check if the cert uses the old LE root cert, revoke and regenerate if necessary. [Here's more info](https://twitter.com/letsencrypt/status/1443621997288767491) on LE root cert expiration" } diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index 0f0621c..471cf59 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -122,7 +122,7 @@ if ! grep -q 'PARAMETERS' "/config/nginx/dhparams.pem"; then fi # check to make sure DNSPLUGIN is selected if dns validation is used -[[ "$VALIDATION" = "dns" ]] && [[ ! "$DNSPLUGIN" =~ ^(aliyun|cloudflare|cloudxns|cpanel|digitalocean|directadmin|dnsimple|dnsmadeeasy|domeneshop|gandi|gehirn|google|hetzner|inwx|ionos|linode|luadns|netcup|njalla|nsone|ovh|rfc2136|route53|sakuracloud|transip|vultr)$ ]] && \ +[[ "$VALIDATION" = "dns" ]] && [[ ! "$DNSPLUGIN" =~ ^(aliyun|cloudflare|cloudxns|cpanel|digitalocean|directadmin|dnsimple|dnsmadeeasy|domeneshop|gandi|gehirn|google|he|hetzner|inwx|ionos|linode|luadns|netcup|njalla|nsone|ovh|rfc2136|route53|sakuracloud|transip|vultr)$ ]] && \ echo "Please set the DNSPLUGIN variable to a valid plugin name. See docker info for more details." && \ sleep infinity From c40c2bd6e540caa7de1d0fbd6263866d1a1d8e53 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 24 Oct 2021 01:20:35 +0200 Subject: [PATCH 3/4] Bot Updating Package Versions --- package_versions.txt | 86 ++++++++++++++++++++++---------------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index ea4a0a4..03ca91c 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,5 +1,5 @@ alpine-baselayout-3.2.0-r16 -alpine-keys-2.3-r1 +alpine-keys-2.4-r0 apache2-utils-2.4.51-r0 apk-tools-2.12.7-r0 apr-1.7.0-r0 @@ -125,57 +125,57 @@ pcre2-10.36-r0 perl-5.32.1-r0 perl-error-0.17029-r1 perl-git-2.32.0-r0 -php7-7.4.24-r0 -php7-bcmath-7.4.24-r0 -php7-bz2-7.4.24-r0 -php7-common-7.4.24-r0 -php7-ctype-7.4.24-r0 -php7-curl-7.4.24-r0 -php7-dom-7.4.24-r0 -php7-exif-7.4.24-r0 +php7-7.4.25-r0 +php7-bcmath-7.4.25-r0 +php7-bz2-7.4.25-r0 +php7-common-7.4.25-r0 +php7-ctype-7.4.25-r0 +php7-curl-7.4.25-r0 +php7-dom-7.4.25-r0 +php7-exif-7.4.25-r0 php7-fileinfo-7.4.24-r0 php7-fpm-7.4.24-r0 -php7-ftp-7.4.24-r0 -php7-gd-7.4.24-r0 -php7-gmp-7.4.24-r0 -php7-iconv-7.4.24-r0 -php7-imap-7.4.24-r0 -php7-intl-7.4.24-r0 -php7-json-7.4.24-r0 -php7-ldap-7.4.24-r0 -php7-mbstring-7.4.24-r0 -php7-mysqli-7.4.24-r0 -php7-mysqlnd-7.4.24-r0 -php7-opcache-7.4.24-r0 -php7-openssl-7.4.24-r0 -php7-pdo-7.4.24-r0 -php7-pdo_mysql-7.4.24-r0 -php7-pdo_odbc-7.4.24-r0 -php7-pdo_pgsql-7.4.24-r0 -php7-pdo_sqlite-7.4.24-r0 -php7-pear-7.4.24-r0 +php7-ftp-7.4.25-r0 +php7-gd-7.4.25-r0 +php7-gmp-7.4.25-r0 +php7-iconv-7.4.25-r0 +php7-imap-7.4.25-r0 +php7-intl-7.4.25-r0 +php7-json-7.4.25-r0 +php7-ldap-7.4.25-r0 +php7-mbstring-7.4.25-r0 +php7-mysqli-7.4.25-r0 +php7-mysqlnd-7.4.25-r0 +php7-opcache-7.4.25-r0 +php7-openssl-7.4.25-r0 +php7-pdo-7.4.25-r0 +php7-pdo_mysql-7.4.25-r0 +php7-pdo_odbc-7.4.25-r0 +php7-pdo_pgsql-7.4.25-r0 +php7-pdo_sqlite-7.4.25-r0 +php7-pear-7.4.25-r0 php7-pecl-apcu-5.1.21-r0 php7-pecl-igbinary-3.2.6-r0 php7-pecl-mailparse-3.1.1-r1 php7-pecl-mcrypt-1.0.4-r0 php7-pecl-memcached-3.1.5-r2 php7-pecl-redis-5.3.4-r0 -php7-pgsql-7.4.24-r0 -php7-phar-7.4.24-r0 -php7-posix-7.4.24-r0 -php7-session-7.4.24-r0 +php7-pgsql-7.4.25-r0 +php7-phar-7.4.25-r0 +php7-posix-7.4.25-r0 +php7-session-7.4.25-r0 php7-simplexml-7.4.24-r0 -php7-soap-7.4.24-r0 -php7-sockets-7.4.24-r0 -php7-sodium-7.4.24-r0 -php7-sqlite3-7.4.24-r0 -php7-tokenizer-7.4.24-r0 -php7-xml-7.4.24-r0 -php7-xmlreader-7.4.24-r0 -php7-xmlrpc-7.4.24-r0 +php7-soap-7.4.25-r0 +php7-sockets-7.4.25-r0 +php7-sodium-7.4.25-r0 +php7-sqlite3-7.4.25-r0 +php7-tokenizer-7.4.25-r0 +php7-xml-7.4.25-r0 +php7-xmlreader-7.4.25-r0 +php7-xmlrpc-7.4.25-r0 php7-xmlwriter-7.4.24-r0 -php7-xsl-7.4.24-r0 -php7-zip-7.4.24-r0 +php7-xsl-7.4.25-r0 +php7-zip-7.4.25-r0 pinentry-1.1.1-r0 popt-1.18-r0 procps-3.3.17-r0 @@ -217,7 +217,7 @@ shadow-4.8.1-r0 skalibs-2.10.0.3-r0 sqlite-libs-3.35.5-r0 ssl_client-1.33.1-r3 -tzdata-2021c-r0 +tzdata-2021d-r0 unixodbc-2.3.9-r1 utmps-0.1.0.2-r0 whois-5.5.10-r0 From 66a4c1203b5fd04580a44a94738c3c655213f665 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Tue, 26 Oct 2021 08:33:36 -0500 Subject: [PATCH 4/4] Mitigate https://httpoxy.org/ vulnerabilities. Ref: https://www.nginx.com/blog/mitigating-the-httpoxy-vulnerability-with-nginx#Defeating-the-Attack-using-NGINX-and-NGINX-Plus --- README.md | 1 + readme-vars.yml | 1 + root/defaults/proxy.conf | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c540444..9bb0c10 100644 --- a/README.md +++ b/README.md @@ -332,6 +332,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **26.10.21:** - [Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) proxy.conf - Mitigate https://httpoxy.org/ vulnerabilities. Ref: https://www.nginx.com/blog/mitigating-the-httpoxy-vulnerability-with-nginx#Defeating-the-Attack-using-NGINX-and-NGINX-Plus * **23.10.21:** - Fix Hurricane Electric (HE) DNS validation. * **12.10.21:** - Fix deprecated LE root cert check to fix failures when using `STAGING=true`, and failures in revoking. * **06.10.21:** - Added support for Hurricane Electric (HE) DNS validation. Added lxml build deps. diff --git a/readme-vars.yml b/readme-vars.yml index 45bb5cb..087cd4d 100755 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -155,6 +155,7 @@ app_setup_nginx_reverse_proxy_block: "" # changelog changelogs: + - { date: "26.10.21:", desc: "[Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) proxy.conf - Mitigate https://httpoxy.org/ vulnerabilities. Ref: https://www.nginx.com/blog/mitigating-the-httpoxy-vulnerability-with-nginx#Defeating-the-Attack-using-NGINX-and-NGINX-Plus" } - { date: "23.10.21:", desc: "Fix Hurricane Electric (HE) DNS validation." } - { date: "12.10.21:", desc: "Fix deprecated LE root cert check to fix failures when using `STAGING=true`, and failures in revoking." } - { date: "06.10.21:", desc: "Added support for Hurricane Electric (HE) DNS validation. Added lxml build deps." } diff --git a/root/defaults/proxy.conf b/root/defaults/proxy.conf index b621b4a..f536be0 100644 --- a/root/defaults/proxy.conf +++ b/root/defaults/proxy.conf @@ -1,4 +1,4 @@ -## Version 2021/04/27 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/proxy.conf +## Version 2021/10/26 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/proxy.conf # Timeout if the real server is dead proxy_next_upstream error timeout invalid_header http_500 http_502 http_503; @@ -22,6 +22,7 @@ proxy_no_cache $cookie_session; proxy_set_header Connection $connection_upgrade; proxy_set_header Early-Data $ssl_early_data; proxy_set_header Host $host; +proxy_set_header Proxy ""; proxy_set_header Upgrade $http_upgrade; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Host $host;