feature(trust): improved remote ip internal proxy support (#300)

* feat(trusted_proxy): Add support for RemoteIPInternalProxy * fix(syntax): add semicolon
saltstack-formulas · Jan 8, 2021 · 22c647e · 22c647e
1 parent 6c52933
commit 22c647e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 0 deletions.
diff --git a/apache/files/Debian/conf-available/remoteip.conf.jinja b/apache/files/Debian/conf-available/remoteip.conf.jinja
@@ -2,3 +2,6 @@ RemoteIPHeader {{ salt['pillar.get']('apache:mod_remoteip:RemoteIPHeader', 'X-Fo
 {%- for trusted_proxy in salt['pillar.get']('apache:mod_remoteip:RemoteIPTrustedProxy', []) %}
 RemoteIPTrustedProxy {{ trusted_proxy }}
 {%- endfor %}
+{%- for trusted_proxy in salt['pillar.get']('apache:mod_remoteip:RemoteIPInternalProxy', []) %}
+RemoteIPInternalProxy {{ trusted_proxy }}
+{%- endfor %}
diff --git a/apache/files/RedHat/conf.modules.d/remoteip.conf.jinja b/apache/files/RedHat/conf.modules.d/remoteip.conf.jinja
@@ -6,3 +6,6 @@ RemoteIPHeader {{ salt['pillar.get']('apache:mod_remoteip:RemoteIPHeader', 'X-Fo
 {%- for trusted_proxy in salt['pillar.get']('apache:mod_remoteip:RemoteIPTrustedProxy', []) %}
 RemoteIPTrustedProxy {{ trusted_proxy }}
 {%- endfor %}
+{%- for trusted_proxy in salt['pillar.get']('apache:mod_remoteip:RemoteIPInternalProxy', []) %}
+RemoteIPInternalProxy {{ trusted_proxy }}
+{%- endfor %}
diff --git a/pillar.example b/pillar.example
@@ -444,6 +444,9 @@ apache:
     RemoteIPTrustedProxy:
       - 10.0.8.0/24
       - 127.0.0.1
+    RemoteIPInternalProxy:
+      - 10.10.8.0/24
+      - 127.0.0.1
 
   # ``apache.mod_security`` formula additional configuration:
   mod_security:

diff --git a/test/salt/pillar/modules.sls b/test/salt/pillar/modules.sls
@@ -427,6 +427,9 @@ apache:
     RemoteIPTrustedProxy:
       - 10.0.8.0/24
       - 127.0.0.1
+    RemoteIPInternalProxy:
+      - 10.10.8.0/24
+      - 127.0.0.1
 
   # ``apache.mod_security`` formula additional configuration:
   mod_security: