Replace RemoteIPTrustedProxy by RemoteIPInternalProxy in remoteip.conf (

#2004) Else the internal IP ranges are ignored See https://httpd.apache.org/docs/2.4/en/mod/mod_remoteip.html#remoteiptrustedproxy and https://httpd.apache.org/docs/2.4/en/mod/mod_remoteip.html#remoteipinternalproxy Signed-off-by: Mossroy <[email protected]>
nextcloud · Aug 20, 2023 · 04e4138 · 04e4138
1 parent c496644
commit 04e4138
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/25/apache/Dockerfile b/25/apache/Dockerfile
@@ -124,9 +124,9 @@ VOLUME /var/www/html
 RUN a2enmod headers rewrite remoteip ;\
     {\
      echo RemoteIPHeader X-Real-IP ;\
-     echo RemoteIPTrustedProxy 10.0.0.0/8 ;\
-     echo RemoteIPTrustedProxy 172.16.0.0/12 ;\
-     echo RemoteIPTrustedProxy 192.168.0.0/16 ;\
+     echo RemoteIPInternalProxy 10.0.0.0/8 ;\
+     echo RemoteIPInternalProxy 172.16.0.0/12 ;\
+     echo RemoteIPInternalProxy 192.168.0.0/16 ;\
     } > /etc/apache2/conf-available/remoteip.conf;\
     a2enconf remoteip
 

diff --git a/26/apache/Dockerfile b/26/apache/Dockerfile
@@ -125,9 +125,9 @@ VOLUME /var/www/html
 RUN a2enmod headers rewrite remoteip ;\
     {\
      echo RemoteIPHeader X-Real-IP ;\
-     echo RemoteIPTrustedProxy 10.0.0.0/8 ;\
-     echo RemoteIPTrustedProxy 172.16.0.0/12 ;\
-     echo RemoteIPTrustedProxy 192.168.0.0/16 ;\
+     echo RemoteIPInternalProxy 10.0.0.0/8 ;\
+     echo RemoteIPInternalProxy 172.16.0.0/12 ;\
+     echo RemoteIPInternalProxy 192.168.0.0/16 ;\
     } > /etc/apache2/conf-available/remoteip.conf;\
     a2enconf remoteip
 

diff --git a/update.sh b/update.sh
@@ -29,7 +29,7 @@ declare -A base=(
 )
 
 declare -A extras=(
-	[apache]='\nRUN a2enmod headers rewrite remoteip ;\\\n    {\\\n     echo RemoteIPHeader X-Real-IP ;\\\n     echo RemoteIPTrustedProxy 10.0.0.0/8 ;\\\n     echo RemoteIPTrustedProxy 172.16.0.0/12 ;\\\n     echo RemoteIPTrustedProxy 192.168.0.0/16 ;\\\n    } > /etc/apache2/conf-available/remoteip.conf;\\\n    a2enconf remoteip'
+	[apache]='\nRUN a2enmod headers rewrite remoteip ;\\\n    {\\\n     echo RemoteIPHeader X-Real-IP ;\\\n     echo RemoteIPInternalProxy 10.0.0.0/8 ;\\\n     echo RemoteIPInternalProxy 172.16.0.0/12 ;\\\n     echo RemoteIPInternalProxy 192.168.0.0/16 ;\\\n    } > /etc/apache2/conf-available/remoteip.conf;\\\n    a2enconf remoteip'
 	[fpm]=''
 	[fpm-alpine]=''
 )