Bot Updating Package Versions

Mitigate https://httpoxy.org/ vulnerabilities.

Dockerfile

@@ -18,6 +18,8 @@ RUN \
     g++ \
     gcc \
     libffi-dev \
+    libxml2-dev \
+    libxslt-dev \
     openssl-dev \
     python3-dev && \
   echo "**** install runtime packages ****" && \
@@ -108,6 +110,7 @@ RUN \
     certbot-dns-dnsmadeeasy \
     certbot-dns-domeneshop \
     certbot-dns-google \
+    certbot-dns-he \
     certbot-dns-hetzner \
     certbot-dns-inwx \
     certbot-dns-ionos \

Dockerfile.aarch64

@@ -18,6 +18,8 @@ RUN \
     g++ \
     gcc \
     libffi-dev \
+    libxml2-dev \
+    libxslt-dev \
     openssl-dev \
     python3-dev && \
   echo "**** install runtime packages ****" && \
@@ -108,6 +110,7 @@ RUN \
     certbot-dns-dnsmadeeasy \
     certbot-dns-domeneshop \
     certbot-dns-google \
+    certbot-dns-he \
     certbot-dns-hetzner \
     certbot-dns-inwx \
     certbot-dns-ionos \

Dockerfile.armhf

@@ -18,6 +18,8 @@ RUN \
     g++ \
     gcc \
     libffi-dev \
+    libxml2-dev \
+    libxslt-dev \
     openssl-dev \
     python3-dev && \
   echo "**** install runtime packages ****" && \
@@ -108,6 +110,7 @@ RUN \
     certbot-dns-dnsmadeeasy \
     certbot-dns-domeneshop \
     certbot-dns-google \
+    certbot-dns-he \
     certbot-dns-hetzner \
     certbot-dns-inwx \
     certbot-dns-ionos \

README.md

@@ -213,7 +213,7 @@ Container images are configured using parameters passed at runtime (such as thos
 | `-e VALIDATION=http` | Certbot validation method to use, options are `http`, `dns` or `duckdns` (`dns` method also requires `DNSPLUGIN` variable set) (`duckdns` method requires `DUCKDNSTOKEN` variable set, and the `SUBDOMAINS` variable must be either empty or set to `wildcard`). |
 | `-e SUBDOMAINS=www,` | Subdomains you'd like the cert to cover (comma separated, no spaces) ie. `www,ftp,cloud`. For a wildcard cert, set this _exactly_ to `wildcard` (wildcard cert is available via `dns` and `duckdns` validation only) |
 | `-e CERTPROVIDER=` | Optionally define the cert provider. Set to `zerossl` for ZeroSSL certs (requires existing [ZeroSSL account](https://app.zerossl.com/signup) and the e-mail address entered in `EMAIL` env var). Otherwise defaults to Let's Encrypt. |
-| `-e DNSPLUGIN=cloudflare` | Required if `VALIDATION` is set to `dns`. Options are `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` and `vultr`. Also need to enter the credentials into the corresponding ini (or json for some plugins) file under `/config/dns-conf`. |
+| `-e DNSPLUGIN=cloudflare` | Required if `VALIDATION` is set to `dns`. Options are `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` and `vultr`. Also need to enter the credentials into the corresponding ini (or json for some plugins) file under `/config/dns-conf`. |
 | `-e PROPAGATION=` | Optionally override (in seconds) the default propagation time for the dns plugins. |
 | `-e DUCKDNSTOKEN=` | Required if `VALIDATION` is set to `duckdns`. Retrieve your token from https://www.duckdns.org |
 | `-e EMAIL=` | Optional e-mail address used for cert expiration notifications (Required for ZeroSSL). |
@@ -332,6 +332,10 @@ 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.
 * **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
 * **19.09.21:** - Add an optional header to opt out of Google FLoC in `ssl.conf`.
 * **17.09.21:** - Mark `SUBDOMAINS` var as optional.

package_versions.txt

@@ -1,6 +1,6 @@
 alpine-baselayout-3.2.0-r16
-alpine-keys-2.3-r1
-apache2-utils-2.4.49-r0
+alpine-keys-2.4-r0
+apache2-utils-2.4.51-r0
 apk-tools-2.12.7-r0
 apr-1.7.0-r0
 apr-util-1.6.1-r7
@@ -29,7 +29,7 @@ iptables-1.8.7-r1
 libacl-2.2.53-r0
 libassuan-2.5.5-r0
 libattr-2.5.1-r0
-libblkid-2.37-r0
+libblkid-2.37.2-r0
 libbsd-0.11.3-r0
 libbz2-1.0.8-r1
 libc-utils-0.7.2-r3
@@ -55,7 +55,7 @@ libmcrypt-2.5.8-r9
 libmd-1.0.3-r0
 libmemcached-libs-1.0.18-r4
 libmnl-1.0.4-r1
-libmount-2.37-r0
+libmount-2.37.2-r0
 libnftnl-libs-1.2.0-r0
 libpng-1.6.37-r1
 libpq-13.4-r0
@@ -72,7 +72,7 @@ libssl1.1-1.1.1l-r0
 libstdc++-10.3.1_git20210424-r2
 libtasn1-4.17.0-r0
 libunistring-0.9.10-r1
-libuuid-2.37-r0
+libuuid-2.37.2-r0
 libwebp-1.2.0-r2
 libx11-1.7.2-r0
 libxau-1.0.9-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-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-pecl-apcu-5.1.20-r0
-php7-pecl-igbinary-3.2.4-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.25-r0
+php7-fpm-7.4.25-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-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-xmlwriter-7.4.24-r0
-php7-xsl-7.4.24-r0
-php7-zip-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.25-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.25-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-2021b-r0
+tzdata-2021e-r0
 unixodbc-2.3.9-r1
 utmps-0.1.0.2-r0
 whois-5.5.10-r0

readme-vars.yml

@@ -51,7 +51,7 @@ opt_param_usage_include_env: true
 opt_param_env_vars:
   - { env_var: "SUBDOMAINS", env_value: "www,", desc: "Subdomains you'd like the cert to cover (comma separated, no spaces) ie. `www,ftp,cloud`. For a wildcard cert, set this _exactly_ to `wildcard` (wildcard cert is available via `dns` and `duckdns` validation only)" }
   - { env_var: "CERTPROVIDER", env_value: "", desc: "Optionally define the cert provider. Set to `zerossl` for ZeroSSL certs (requires existing [ZeroSSL account](https://app.zerossl.com/signup) and the e-mail address entered in `EMAIL` env var). Otherwise defaults to Let's Encrypt." }
-  - { env_var: "DNSPLUGIN", env_value: "cloudflare", desc: "Required if `VALIDATION` is set to `dns`. Options are `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` and `vultr`. Also need to enter the credentials into the corresponding ini (or json for some plugins) file under `/config/dns-conf`." }
+  - { env_var: "DNSPLUGIN", env_value: "cloudflare", desc: "Required if `VALIDATION` is set to `dns`. Options are `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` and `vultr`. Also need to enter the credentials into the corresponding ini (or json for some plugins) file under `/config/dns-conf`." }
   - { env_var: "PROPAGATION", env_value: "", desc: "Optionally override (in seconds) the default propagation time for the dns plugins." }
   - { env_var: "DUCKDNSTOKEN", env_value: "", desc: "Required if `VALIDATION` is set to `duckdns`. Retrieve your token from https://www.duckdns.org" }
   - { env_var: "EMAIL", env_value: "", desc: "Optional e-mail address used for cert expiration notifications (Required for ZeroSSL)." }
@@ -155,6 +155,10 @@ 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." }
   - { 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" }
   - { date: "19.09.21:", desc: "Add an optional header to opt out of Google FLoC in `ssl.conf`." }
   - { date: "17.09.21:", desc: "Mark `SUBDOMAINS` var as optional." }

root/defaults/dns-conf/he.ini

@@ -0,0 +1,4 @@
+# Instructions: https://github.com/TSaaristo/certbot-dns-he#example-usage
+# Replace with your values
+dns_he_user = Me
+dns_he_pass = my HE password

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;

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
 
@@ -236,7 +236,7 @@ if [ "$VALIDATION" = "dns" ]; then
     elif [[ "$DNSPLUGIN" =~ ^(google)$ ]]; then
         if [ -n "$PROPAGATION" ];then PROPAGATIONPARAM="--dns-${DNSPLUGIN}-propagation-seconds ${PROPAGATION}"; fi
         PREFCHAL="--dns-${DNSPLUGIN} --dns-${DNSPLUGIN}-credentials /config/dns-conf/${DNSPLUGIN}.json ${PROPAGATIONPARAM}"
-    elif [[ "$DNSPLUGIN" =~ ^(aliyun|domeneshop|hetzner|inwx|ionos|netcup|njalla|transip|vultr)$ ]]; then
+    elif [[ "$DNSPLUGIN" =~ ^(aliyun|domeneshop|he|hetzner|inwx|ionos|netcup|njalla|transip|vultr)$ ]]; then
         if [ -n "$PROPAGATION" ];then PROPAGATIONPARAM="--dns-${DNSPLUGIN}-propagation-seconds ${PROPAGATION}"; fi
         PREFCHAL="-a dns-${DNSPLUGIN} --dns-${DNSPLUGIN}-credentials /config/dns-conf/${DNSPLUGIN}.ini ${PROPAGATIONPARAM}"
     elif [[ "$DNSPLUGIN" =~ ^(directadmin)$ ]]; then
@@ -313,8 +313,9 @@ else
 fi
 
 # Check if the cert is using the old LE root cert, revoke and regen if necessary
-if [ -f "/config/keys/letsencrypt/chain.pem" ] && ([ "${CERTPROVIDER}" == "letsencrypt" ] || [ "${CERTPROVIDER}" == "" ]) && ! openssl x509 -in /config/keys/letsencrypt/chain.pem -noout -issuer | grep -q "ISRG Root X"; then
+if [ -f "/config/keys/letsencrypt/chain.pem" ] && ([ "${CERTPROVIDER}" == "letsencrypt" ] || [ "${CERTPROVIDER}" == "" ]) && [ "${STAGING}" != "true" ] && ! openssl x509 -in /config/keys/letsencrypt/chain.pem -noout -issuer | grep -q "ISRG Root X"; then
     echo "The cert seems to be using the old LE root cert, which is no longer valid. Deleting and revoking."
+    REV_ACMESERVER="https://acme-v02.api.letsencrypt.org/directory"
     certbot revoke --non-interactive --cert-path /config/etc/letsencrypt/live/"$ORIGDOMAIN"/fullchain.pem --server $REV_ACMESERVER
     rm -rf /config/etc/letsencrypt
     mkdir -p /config/etc/letsencrypt