From e7a8ad077bc4354332128ebac4a2d1ff0fd3300e Mon Sep 17 00:00:00 2001 From: James Adams Date: Fri, 11 Mar 2022 12:29:47 +0000 Subject: [PATCH] ncm-metaconfig/httpd: Don't render negate if set `negate` is a special key intended to negate all other options and should not itself be rendered. Previously this template would insert `require not negate 1` as a requirement which is invalid. --- .../httpd/2.4/tests/regexps/wsgi_conf/base | 1 - .../src/main/metaconfig/httpd/config/authz.tt | 12 +++++++----- 2 files changed, 7 insertions(+), 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 index aaa4b87c25..69ef57ce3e 100644 --- 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 index 84b4440165..9569bdad40 100644 --- 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 -%]