mirror of
https://github.com/blakeblackshear/frigate.git
synced 2026-11-19 03:53:03 +03:00
Update nginx and backport module changes (#25009)
* update nginx to 1.30.7 and backport nginx module changes from dev nginx 1.27.4 was vulnerable to CVE-2026-123007 (HTTP/2 flow control heap overflow) and CVE-2026-123633 (HTTP/2 use-after-free), both reachable before auth on the internal and external ports because http2 is on for the whole server block. Kaltura also deleted the nginx-vod-module and nginx-secure-token-module repos, so the build could no longer download either module. - Update nginx to 1.30.7 - Backport the switch to the maintained dio-az nginx-vod-module fork (#24123) - Backport the nginx-secure-token-module removal (#24893) * bump playwright to 1.65.0 for ubuntu 26.04 runners
This commit is contained in:
@@ -2,9 +2,8 @@
|
|||||||
|
|
||||||
set -euxo pipefail
|
set -euxo pipefail
|
||||||
|
|
||||||
NGINX_VERSION="1.27.4"
|
NGINX_VERSION="1.30.7"
|
||||||
VOD_MODULE_VERSION="1.31"
|
VOD_MODULE_VERSION="v1.9.1"
|
||||||
SECURE_TOKEN_MODULE_VERSION="1.5"
|
|
||||||
SET_MISC_MODULE_VERSION="v0.33"
|
SET_MISC_MODULE_VERSION="v0.33"
|
||||||
NGX_DEVEL_KIT_VERSION="v0.3.3"
|
NGX_DEVEL_KIT_VERSION="v0.3.3"
|
||||||
|
|
||||||
@@ -31,32 +30,27 @@ wget -nv https://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz
|
|||||||
tar -zxf nginx-${NGINX_VERSION}.tar.gz -C /tmp/nginx --strip-components=1
|
tar -zxf nginx-${NGINX_VERSION}.tar.gz -C /tmp/nginx --strip-components=1
|
||||||
rm nginx-${NGINX_VERSION}.tar.gz
|
rm nginx-${NGINX_VERSION}.tar.gz
|
||||||
mkdir /tmp/nginx-vod-module
|
mkdir /tmp/nginx-vod-module
|
||||||
wget -nv https://github.com/kaltura/nginx-vod-module/archive/refs/tags/${VOD_MODULE_VERSION}.tar.gz
|
wget -nv https://github.com/dio-az/nginx-vod-module/archive/refs/tags/${VOD_MODULE_VERSION}.tar.gz
|
||||||
tar -zxf ${VOD_MODULE_VERSION}.tar.gz -C /tmp/nginx-vod-module --strip-components=1
|
tar -zxf ${VOD_MODULE_VERSION}.tar.gz -C /tmp/nginx-vod-module --strip-components=1
|
||||||
rm ${VOD_MODULE_VERSION}.tar.gz
|
rm ${VOD_MODULE_VERSION}.tar.gz
|
||||||
# Patch MAX_CLIPS to allow more clips to be added than the default 128
|
# Patch MAX_CLIPS to allow more clips to be added than the default 128
|
||||||
sed -i 's/MAX_CLIPS (128)/MAX_CLIPS (1080)/g' /tmp/nginx-vod-module/vod/media_set.h
|
sed -i 's/MAX_CLIPS (128)/MAX_CLIPS (1080)/g' /tmp/nginx-vod-module/vod/media_set.h
|
||||||
patch -d /tmp/nginx-vod-module/ -p1 << 'EOF'
|
patch -d /tmp/nginx-vod-module/ -p1 << 'EOF'
|
||||||
--- a/vod/avc_hevc_parser.c 2022-06-27 11:38:10.000000000 +0000
|
--- a/vod/avc_hevc_parser.c
|
||||||
+++ b/vod/avc_hevc_parser.c 2023-01-16 11:25:10.900521298 +0000
|
+++ b/vod/avc_hevc_parser.c
|
||||||
@@ -3,6 +3,9 @@
|
@@ -2,6 +2,9 @@
|
||||||
|
|
||||||
bool_t
|
bool_t
|
||||||
avc_hevc_parser_rbsp_trailing_bits(bit_reader_state_t* reader)
|
avc_hevc_parser_rbsp_trailing_bits(bit_reader_state_t* reader) {
|
||||||
{
|
|
||||||
+ // https://github.com/blakeblackshear/frigate/issues/4572
|
+ // https://github.com/blakeblackshear/frigate/issues/4572
|
||||||
+ return TRUE;
|
+ return TRUE;
|
||||||
+
|
+
|
||||||
uint32_t one_bit;
|
uint32_t one_bit;
|
||||||
|
|
||||||
if (reader->stream.eof_reached)
|
if (reader->stream.eof_reached) {
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
|
|
||||||
mkdir /tmp/nginx-secure-token-module
|
|
||||||
wget https://github.com/kaltura/nginx-secure-token-module/archive/refs/tags/${SECURE_TOKEN_MODULE_VERSION}.tar.gz
|
|
||||||
tar -zxf ${SECURE_TOKEN_MODULE_VERSION}.tar.gz -C /tmp/nginx-secure-token-module --strip-components=1
|
|
||||||
rm ${SECURE_TOKEN_MODULE_VERSION}.tar.gz
|
|
||||||
|
|
||||||
mkdir /tmp/ngx_devel_kit
|
mkdir /tmp/ngx_devel_kit
|
||||||
wget https://github.com/vision5/ngx_devel_kit/archive/refs/tags/${NGX_DEVEL_KIT_VERSION}.tar.gz
|
wget https://github.com/vision5/ngx_devel_kit/archive/refs/tags/${NGX_DEVEL_KIT_VERSION}.tar.gz
|
||||||
tar -zxf ${NGX_DEVEL_KIT_VERSION}.tar.gz -C /tmp/ngx_devel_kit --strip-components=1
|
tar -zxf ${NGX_DEVEL_KIT_VERSION}.tar.gz -C /tmp/ngx_devel_kit --strip-components=1
|
||||||
@@ -80,7 +74,6 @@ cd /tmp/nginx
|
|||||||
--add-module=../ngx_devel_kit \
|
--add-module=../ngx_devel_kit \
|
||||||
--add-module=../nginx-set-misc-module \
|
--add-module=../nginx-set-misc-module \
|
||||||
--add-module=../nginx-vod-module \
|
--add-module=../nginx-vod-module \
|
||||||
--add-module=../nginx-secure-token-module \
|
|
||||||
--with-cc-opt="-O3 -Wno-error=implicit-fallthrough"
|
--with-cc-opt="-O3 -Wno-error=implicit-fallthrough"
|
||||||
|
|
||||||
make CC="ccache gcc" -j$(nproc) && make install
|
make CC="ccache gcc" -j$(nproc) && make install
|
||||||
|
|||||||
@@ -114,21 +114,23 @@ http {
|
|||||||
# Smaller segments, faster generation, better browser compatibility
|
# Smaller segments, faster generation, better browser compatibility
|
||||||
vod_hls_container_format fmp4;
|
vod_hls_container_format fmp4;
|
||||||
|
|
||||||
secure_token $args;
|
# fMP4 playlists use EXT-X-MAP, which requires HLS protocol
|
||||||
secure_token_types application/vnd.apple.mpegurl;
|
# version 6 (RFC 8216 section 7); the module default is 4
|
||||||
|
vod_hls_version 6;
|
||||||
|
|
||||||
|
# Pass the playlist's query args (e.g. Home Assistant's authSig) on
|
||||||
|
# to every URL in it. These match the only URL endings vod writes
|
||||||
|
# with fmp4 and no subtitles.
|
||||||
|
sub_filter_types application/vnd.apple.mpegurl;
|
||||||
|
sub_filter_once off;
|
||||||
|
sub_filter '.m3u8' '.m3u8$is_args$args';
|
||||||
|
sub_filter '.m4s' '.m4s$is_args$args';
|
||||||
|
sub_filter '.mp4"' '.mp4$is_args$args"';
|
||||||
|
|
||||||
add_header Cache-Control "no-store";
|
add_header Cache-Control "no-store";
|
||||||
expires off;
|
expires off;
|
||||||
|
|
||||||
keepalive_disable safari;
|
keepalive_disable safari;
|
||||||
|
|
||||||
# vod module returns 502 for non-existent media
|
|
||||||
# https://github.com/kaltura/nginx-vod-module/issues/468
|
|
||||||
error_page 502 =404 /vod-not-found;
|
|
||||||
}
|
|
||||||
|
|
||||||
location = /vod-not-found {
|
|
||||||
return 404;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
location /stream/ {
|
location /stream/ {
|
||||||
|
|||||||
Generated
+14
-32
@@ -1487,19 +1487,19 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@playwright/test": {
|
"node_modules/@playwright/test": {
|
||||||
"version": "1.59.1",
|
"version": "1.65.0",
|
||||||
"resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.59.1.tgz",
|
"resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.65.0.tgz",
|
||||||
"integrity": "sha512-PG6q63nQg5c9rIi4/Z5lR5IVF7yU5MqmKaPOe0HSc0O2cX1fPi96sUQu5j7eo4gKCkB2AnNGoWt7y4/Xx3Kcqg==",
|
"integrity": "sha512-iGURLGuKDLakSEl7Pgfv8h7f+XLT+V861Wfhz0zlEl5nyFuKUopdkFBPKqTllTUp06aOwPuH8iuUEb3yp3MpbQ==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"playwright": "1.59.1"
|
"playwright": "1.65.0"
|
||||||
},
|
},
|
||||||
"bin": {
|
"bin": {
|
||||||
"playwright": "cli.js"
|
"playwright": "cli.js"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=18"
|
"node": ">=20"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@radix-ui/number": {
|
"node_modules/@radix-ui/number": {
|
||||||
@@ -11558,50 +11558,32 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/playwright": {
|
"node_modules/playwright": {
|
||||||
"version": "1.59.1",
|
"version": "1.65.0",
|
||||||
"resolved": "https://registry.npmjs.org/playwright/-/playwright-1.59.1.tgz",
|
"resolved": "https://registry.npmjs.org/playwright/-/playwright-1.65.0.tgz",
|
||||||
"integrity": "sha512-C8oWjPR3F81yljW9o5OxcWzfh6avkVwDD2VYdwIGqTkl+OGFISgypqzfu7dOe4QNLL2aqcWBmI3PMtLIK233lw==",
|
"integrity": "sha512-F3AMWcR44qMBt4kq+6Kb6mX7bjGXshktKFOPULd7reED6ZJWevjbNRqysP7q+AATE9kdPEZBibex1BYsvpVoeA==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"playwright-core": "1.59.1"
|
"playwright-core": "1.65.0"
|
||||||
},
|
},
|
||||||
"bin": {
|
"bin": {
|
||||||
"playwright": "cli.js"
|
"playwright": "cli.js"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=18"
|
"node": ">=20"
|
||||||
},
|
|
||||||
"optionalDependencies": {
|
|
||||||
"fsevents": "2.3.2"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/playwright-core": {
|
"node_modules/playwright-core": {
|
||||||
"version": "1.59.1",
|
"version": "1.65.0",
|
||||||
"resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.59.1.tgz",
|
"resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.65.0.tgz",
|
||||||
"integrity": "sha512-HBV/RJg81z5BiiZ9yPzIiClYV/QMsDCKUyogwH9p3MCP6IYjUFu/MActgYAvK0oWyV9NlwM3GLBjADyWgydVyg==",
|
"integrity": "sha512-vNSKgH6YqtN7cdT/L334zo0a+YwkrpicyrHJlWWPIm/Q+Nn2SWInil01oT0mbu96U4GgoRtCYQD9CzJQgju+lA==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"bin": {
|
"bin": {
|
||||||
"playwright-core": "cli.js"
|
"playwright-core": "cli.js"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=18"
|
"node": ">=20"
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/playwright/node_modules/fsevents": {
|
|
||||||
"version": "2.3.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
|
|
||||||
"integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
|
|
||||||
"dev": true,
|
|
||||||
"hasInstallScript": true,
|
|
||||||
"license": "MIT",
|
|
||||||
"optional": true,
|
|
||||||
"os": [
|
|
||||||
"darwin"
|
|
||||||
],
|
|
||||||
"engines": {
|
|
||||||
"node": "^8.16.0 || ^10.6.0 || >=11.0.0"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/postcss": {
|
"node_modules/postcss": {
|
||||||
|
|||||||
@@ -32,8 +32,8 @@ export function GenericVideoPlayer({
|
|||||||
const checkSourceExists = async (url: string) => {
|
const checkSourceExists = async (url: string) => {
|
||||||
try {
|
try {
|
||||||
const response = await fetch(url, { method: "HEAD" });
|
const response = await fetch(url, { method: "HEAD" });
|
||||||
// nginx vod module returns 502 for non existent media
|
// missing media is a 404; 502 still covers a failed or
|
||||||
// https://github.com/kaltura/nginx-vod-module/issues/468
|
// unreachable mapping request, which is equally unplayable
|
||||||
setSourceExists(response.status !== 502 && response.status !== 404);
|
setSourceExists(response.status !== 502 && response.status !== 404);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
setSourceExists(false);
|
setSourceExists(false);
|
||||||
|
|||||||
Reference in New Issue
Block a user