Merge pull request #1541 from jrha/metaconfig_httpd_negate

ncm-metaconfig/httpd: Don't render negate if set
quattor · Oct 8, 2022 · 083ee42 · 083ee42
2 parents d2b3c27 + e7a8ad0
commit 083ee42
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/ncm-metaconfig/src/main/metaconfig/httpd/2.4/tests/regexps/wsgi_conf/base b/ncm-metaconfig/src/main/metaconfig/httpd/2.4/tests/regexps/wsgi_conf/base
@@ -30,7 +30,6 @@ multiline
 ^\s{8}sslrequiressl$
 ^\s{8}require not all granted$
 ^\s{8}require not ip 1.2.3.4$
-^\s{8}require not negate 1$
 ^\s{8}require all denied$
 ^\s{8}require env VARX VARY$
 ^\s{8}require expr some valid expression$

diff --git a/ncm-metaconfig/src/main/metaconfig/httpd/config/authz.tt b/ncm-metaconfig/src/main/metaconfig/httpd/config/authz.tt
@@ -1,10 +1,12 @@
 [%- FOR authz IN desc -%]
 [%- FOR pair IN authz.pairs -%]
+[%- IF pair.key != 'negate' -%]
 require [% authz.negate ? 'not ' : '' -%][%- pair.key -%]
-[%- SWITCH pair.key -%]
-[%- CASE ['not', 'valid-user'] -%]
-[%- CASE -%]
-[%- -%] [% CCM.is_list(pair.value) ? pair.value.join(' ') : pair.value -%]
-[%- END %]
+[%- SWITCH pair.key -%]
+[%- CASE ['not', 'valid-user'] -%]
+[%- CASE -%]
+[%- -%] [% CCM.is_list(pair.value) ? pair.value.join(' ') : pair.value -%]
+[%- END %]
+[% END %]
 [% END %]
 [% END -%]