Skip to content

Commit 8cb49b7

Browse files
authored
Merge pull request #88 from linuxserver/fix-httpoxy-3.14-php8
Mitigate https://httpoxy.org/ vulnerabilities.
2 parents de66e00 + 1266ee3 commit 8cb49b7

File tree

4 files changed

+32
-20
lines changed

4 files changed

+32
-20
lines changed

Dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,11 @@ RUN \
2323
php8-xmlwriter \
2424
php8-zlib && \
2525
echo "**** configure nginx ****" && \
26-
echo 'fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;' >> \
26+
echo 'fastcgi_param HTTP_PROXY ""; # https://httpoxy.org/' >> \
27+
/etc/nginx/fastcgi_params && \
28+
echo 'fastcgi_param PATH_INFO $fastcgi_path_info; # http://nginx.org/en/docs/http/ngx_http_fastcgi_module.html#fastcgi_split_path_info' >> \
29+
/etc/nginx/fastcgi_params && \
30+
echo 'fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; # https://www.nginx.com/resources/wiki/start/topics/examples/phpfcgi/#connecting-nginx-to-php-fpm' >> \
2731
/etc/nginx/fastcgi_params && \
2832
rm -f /etc/nginx/http.d/default.conf && \
2933
echo "**** fix logrotate ****" && \

Dockerfile.aarch64

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,11 @@ RUN \
2323
php8-xmlwriter \
2424
php8-zlib && \
2525
echo "**** configure nginx ****" && \
26-
echo 'fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;' >> \
26+
echo 'fastcgi_param HTTP_PROXY ""; # https://httpoxy.org/' >> \
27+
/etc/nginx/fastcgi_params && \
28+
echo 'fastcgi_param PATH_INFO $fastcgi_path_info; # http://nginx.org/en/docs/http/ngx_http_fastcgi_module.html#fastcgi_split_path_info' >> \
29+
/etc/nginx/fastcgi_params && \
30+
echo 'fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; # https://www.nginx.com/resources/wiki/start/topics/examples/phpfcgi/#connecting-nginx-to-php-fpm' >> \
2731
/etc/nginx/fastcgi_params && \
2832
rm -f /etc/nginx/http.d/default.conf && \
2933
echo "**** fix logrotate ****" && \

Dockerfile.armhf

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,11 @@ RUN \
2323
php8-xmlwriter \
2424
php8-zlib && \
2525
echo "**** configure nginx ****" && \
26-
echo 'fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;' >> \
26+
echo 'fastcgi_param HTTP_PROXY ""; # https://httpoxy.org/' >> \
27+
/etc/nginx/fastcgi_params && \
28+
echo 'fastcgi_param PATH_INFO $fastcgi_path_info; # http://nginx.org/en/docs/http/ngx_http_fastcgi_module.html#fastcgi_split_path_info' >> \
29+
/etc/nginx/fastcgi_params && \
30+
echo 'fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; # https://www.nginx.com/resources/wiki/start/topics/examples/phpfcgi/#connecting-nginx-to-php-fpm' >> \
2731
/etc/nginx/fastcgi_params && \
2832
rm -f /etc/nginx/http.d/default.conf && \
2933
echo "**** fix logrotate ****" && \

root/defaults/default

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
server {
2-
listen 80 default_server;
2+
listen 80 default_server;
33

4-
listen 443 ssl;
4+
listen 443 ssl;
55

6-
root /config/www;
7-
index index.html index.htm index.php;
6+
root /config/www;
7+
index index.html index.htm index.php;
88

9-
server_name _;
9+
server_name _;
1010

11-
ssl_certificate /config/keys/cert.crt;
12-
ssl_certificate_key /config/keys/cert.key;
11+
ssl_certificate /config/keys/cert.crt;
12+
ssl_certificate_key /config/keys/cert.key;
1313

14-
client_max_body_size 0;
14+
client_max_body_size 0;
1515

16-
location / {
17-
try_files $uri $uri/ /index.html /index.php?$args =404;
18-
}
16+
location / {
17+
try_files $uri $uri/ /index.html /index.php?$args =404;
18+
}
1919

20-
location ~ \.php$ {
21-
fastcgi_split_path_info ^(.+\.php)(/.+)$;
22-
fastcgi_pass 127.0.0.1:9000;
23-
fastcgi_index index.php;
24-
include /etc/nginx/fastcgi_params;
25-
}
20+
location ~ ^(.+\.php)(.*)$ {
21+
fastcgi_split_path_info ^(.+\.php)(.*)$;
22+
fastcgi_pass 127.0.0.1:9000;
23+
fastcgi_index index.php;
24+
include /etc/nginx/fastcgi_params;
25+
}
2626
}

0 commit comments

Comments
 (0)