Sfoglia il codice sorgente

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

* feat(trusted_proxy): Add support for RemoteIPInternalProxy

* fix(syntax): add semicolon
tags/v1.1.2
Marius van Witzenburg 4 anni fa
parent
commit
22c647eb5c
Nessun account collegato all'indirizzo email del committer
4 ha cambiato i file con 12 aggiunte e 0 eliminazioni
  1. +3
    -0
      apache/files/Debian/conf-available/remoteip.conf.jinja
  2. +3
    -0
      apache/files/RedHat/conf.modules.d/remoteip.conf.jinja
  3. +3
    -0
      pillar.example
  4. +3
    -0
      test/salt/pillar/modules.sls

+ 3
- 0
apache/files/Debian/conf-available/remoteip.conf.jinja Vedi File

@@ -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 %}

+ 3
- 0
apache/files/RedHat/conf.modules.d/remoteip.conf.jinja Vedi File

@@ -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 %}

+ 3
- 0
pillar.example Vedi File

@@ -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:

+ 3
- 0
test/salt/pillar/modules.sls Vedi File

@@ -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:

Loading…
Annulla
Salva