diff --git a/ct/nginxproxymanager.sh b/ct/nginxproxymanager.sh index ceb8619c6..bdf5c9fbc 100644 --- a/ct/nginxproxymanager.sh +++ b/ct/nginxproxymanager.sh @@ -61,11 +61,17 @@ function update_script() { fi $STD apt install -y build-essential "$pcre_pkg" libssl-dev zlib1g-dev - OPENRESTY_VERSION="1.29.2.5" + OPENRESTY_VERSION="1.31.8.1" if [[ "$(cat ~/.openresty 2>/dev/null)" != "$OPENRESTY_VERSION" ]]; then CLEAN_INSTALL=1 fetch_and_deploy_from_url "https://openresty.org/download/openresty-${OPENRESTY_VERSION}.tar.gz" "/opt/openresty" || CLEAN_INSTALL=1 fetch_and_deploy_from_url "https://distfiles.alpinelinux.org/distfiles/edge/openresty-${OPENRESTY_VERSION}.tar.gz" "/opt/openresty" + msg_info "Patching nginx HTTP/2 (CVE-2026-123007, CVE-2026-123633)" + for commit in 61031503dc8087c2c17cd2142c9b4b19062f90c4 2df48a501d0fb8212b7d39dffeeff5876332ba59 e27f5fa84fe6e98505e70bc543b748747dad0a3b; do + curl_with_retry "https://github.com/nginx/nginx/commit/${commit}.patch" "-" | patch -d /opt/openresty/bundle/nginx-1.31.8 -p1 --forward -s + done + msg_ok "Patched nginx HTTP/2" + msg_info "Building OpenResty" cd /opt/openresty $STD ./configure \ diff --git a/install/nginxproxymanager-install.sh b/install/nginxproxymanager-install.sh index b67dc628d..102230443 100644 --- a/install/nginxproxymanager-install.sh +++ b/install/nginxproxymanager-install.sh @@ -36,10 +36,16 @@ $STD /opt/certbot/bin/pip install certbot certbot-dns-cloudflare ln -sf /opt/certbot/bin/certbot /usr/local/bin/certbot msg_ok "Set up Certbot" -OPENRESTY_VERSION="1.29.2.5" +OPENRESTY_VERSION="1.31.8.1" fetch_and_deploy_from_url "https://openresty.org/download/openresty-${OPENRESTY_VERSION}.tar.gz" "/opt/openresty" || fetch_and_deploy_from_url "https://distfiles.alpinelinux.org/distfiles/edge/openresty-${OPENRESTY_VERSION}.tar.gz" "/opt/openresty" +msg_info "Patching nginx HTTP/2 (CVE-2026-123007, CVE-2026-123633)" +for commit in 61031503dc8087c2c17cd2142c9b4b19062f90c4 2df48a501d0fb8212b7d39dffeeff5876332ba59 e27f5fa84fe6e98505e70bc543b748747dad0a3b; do + curl_with_retry "https://github.com/nginx/nginx/commit/${commit}.patch" "-" | patch -d /opt/openresty/bundle/nginx-1.31.8 -p1 --forward -s +done +msg_ok "Patched nginx HTTP/2" + msg_info "Building OpenResty" cd /opt/openresty $STD ./configure \