ncm-metaconfig: httpd: support casscope

Author: GoodOldJack12

ncm-metaconfig/src/main/metaconfig/httpd/2.4/tests/profiles/keystone.pan

@@ -27,13 +27,13 @@ prefix "contents";
                 "type", "error",
                 "expr", "%{cu}t %M",
                 "name", "", # must be empty
-                )),
+            )),
             "error", "/var/log/httpd/keystone.log",
             "custom", list(dict(
                 "location", "/var/log/httpd/keystone_access.log",
                 "name", "combined",
-                )),
-            ),
+            )),
+        ),
         "wsgi", dict(
             "passauthorization", "on",
             "processgroup", "keystone-public",
@@ -46,19 +46,19 @@ prefix "contents";
                     "user", "keystone",
                     "group", "keystone",
                     "display-name", "%{GROUP}",
-                    ),
                 ),
             ),
+        ),
         "aliases", list(dict(
             "url", "/",
             "destination", "/usr/bin/keystone-wsgi-public",
             "type", "wsgiscript",
-            )),
+        )),
         "directories", list(dict(
             "name", "/usr/bin",
             "authz", list(dict("all", "granted")),
-            )),
-        );
+        )),
+    );
     SELF['keystone'] = clone(data);
 
     data['port'] = 35357;
@@ -79,8 +79,9 @@ prefix "contents";
             "passauthorization", "on",
             "processgroup", "keystone-public",
             "applicationgroup", "%{GLOBAL}",
-            ),
-        );
+        ),
+        "casscope", "/"
+    );
     append(clone(data));
 
     data['name'] = "/identity_admin";
@@ -96,4 +97,4 @@ prefix "contents";
     'action', 'add',
     'name', 'Strict-Transport-Security',
     'value', 'max-age=15768000'
-    ));
+));

ncm-metaconfig/src/main/metaconfig/httpd/2.4/tests/regexps/keystone/base

@@ -13,6 +13,7 @@ Base test for keystone wsgi config
 ^    wsgiapplicationgroup %\{GLOBAL\}
 ^    wsgipassauthorization on
 ^    wsgiprocessgroup keystone-public
+^    casscope /
 ^</location>
 ^<location /identity_admin>
 ^    options \+ExecCGI

ncm-metaconfig/src/main/metaconfig/httpd/config/casscope.tt

@@ -0,0 +1,3 @@
+[%- FOREACH casscope IN desc %]
+casscope casscope.path
+[%- END -%]

ncm-metaconfig/src/main/metaconfig/httpd/config/directory_basic.tt

@@ -5,7 +5,7 @@ directoryindex [% desc.directoryindex.join(' ') %]
 [%- IF desc.exists('limitrequestbody') %]
 limitrequestbody [% desc.limitrequestbody %]
 [% END -%]
-[%- to_process = ['rewrite', 'handler', 'perl', 'outputfilter', 'env', 'limit', 'proxy', 'wsgi', 'expires'] -%]
+[%- to_process = ['rewrite', 'handler', 'perl', 'outputfilter', 'env', 'limit', 'proxy', 'wsgi', 'expires', 'casscope'] -%]
 [%- FOREACH p IN to_process -%]
 [%-      IF desc.exists(p) -%]
 [%          INCLUDE "metaconfig/httpd/config/${p}.tt" desc=desc.$p %]

ncm-metaconfig/src/main/metaconfig/httpd/pan/schema.pan

@@ -594,6 +594,9 @@ type httpd_expires = {
     "default" ? string
     "bytype" ? string{}
 };
+type httpd_casscope = {
+    "path" : string
+}
 
 type httpd_directory = {
     include httpd_file
@@ -610,6 +613,7 @@ type httpd_directory = {
     "davrods" ? httpd_davrods
     "files" ? httpd_file[]
     "expires" ? httpd_expires
+    "casscope" ? httpd_casscope
 };
 
 type httpd_vhost_ip = string with is_ip(SELF) || SELF == '*';