diff --git a/garr/shib2common/files/customlenses/tomcatxml_0-10-0.aug b/garr/shib2common/files/customlenses/tomcatxml_0-10-0.aug deleted file mode 100644 index 900d014b86790e4e5b8d5f45464208ff731b68ed..0000000000000000000000000000000000000000 --- a/garr/shib2common/files/customlenses/tomcatxml_0-10-0.aug +++ /dev/null @@ -1,147 +0,0 @@ -(* XML lens for Augeas - Author: Francis Giraldeau <francis.giraldeau@usherbrooke.ca> - - Reference: http://www.w3.org/TR/2006/REC-xml11-20060816/ -*) - -module TomcatXml = - -autoload xfm - -(************************************************************************ - * Utilities lens - *************************************************************************) - -let dels (s:string) = del s s -let spc = /[ \t\n]+/ -let osp = /[ \t\n]*/ -let sep_spc = del /[ \t\n]+/ " " -let sep_osp = del /[ \t\n]*/ "" -let sep_eq = del /[ \t\n]*=[ \t\n]*/ "=" - -let nmtoken = /[a-zA-Z:_][a-zA-Z0-9:_.-]*/ -let word = /[a-zA-Z][a-zA-Z0-9._-]*/ -let char = /.|\n/ -(* if we hide the quotes, then we can only accept single or double quotes *) -(* otherwise a put ambiguity is raised *) -let sto_dquote = dels "\"" . store /[^"]*/ . dels "\"" -let sto_squote = dels "'" . store /[^']*/ . dels "'" - -let comment = [ label "#comment" . - dels "<!--" . - store /([^-]|-[^-])*/ . - dels "-->" ] - -let pi_target = nmtoken - /[Xx][Mm][Ll]/ -let empty = Util.empty -let del_end = del />[\n]?/ ">\n" -let del_end_simple = dels ">" - -(* This is siplified version of processing instruction - * pi has to not start or end with a white space and the string - * must not contain "?>". We restrict too much by not allowing any - * "?" nor ">" in PI - *) -let pi = /[^ \n\t]|[^ \n\t][^?>]*[^ \n\t]/ - -(************************************************************************ - * Attributes - *************************************************************************) - - -let decl = [ label "#decl" . sep_spc . - store /[^> \t\n\r]|[^> \t\n\r][^>\t\n\r]*[^> \t\n\r]/ ] - -let decl_def (r:regexp) (b:lens) = [ dels "<" . key r . - sep_spc . store word . - b . sep_osp . del_end_simple ] - -let elem_def = decl_def /!ELEMENT/ decl - -let enum = "(" . osp . nmtoken . ( osp . "|" . osp . nmtoken )* . osp . ")" - -let att_type = /CDATA|ID|IDREF|IDREFS|ENTITY|ENTITIES|NMTOKEN|NMTOKENS/ | - enum - -let id_def = [ sep_spc . key /PUBLIC/ . - [ label "#literal" . sep_spc . sto_dquote ]* ] | - [ sep_spc . key /SYSTEM/ . sep_spc . sto_dquote ] - -let notation_def = decl_def /!NOTATION/ id_def - -let att_def = counter "att_id" . - [ sep_spc . seq "att_id" . - [ label "#name" . store word . sep_spc ] . - [ label "#type" . store att_type . sep_spc ] . - ([ key /#REQUIRED|#IMPLIED/ ] | - [ label "#FIXED" . del /#FIXED[ \n\t]*|/ "" . sto_dquote ]) ]* - -let att_list_def = decl_def /!ATTLIST/ att_def - -let entity_def = decl_def /!ENTITY/ ([sep_spc . label "#decl" . sto_dquote ]) - -let decl_def_item = elem_def | entity_def | att_list_def | notation_def - -let decl_outer = sep_osp . del /\[[ \n\t\r]*/ "[\n" . - (decl_def_item . sep_osp )* . dels "]" - -(* let dtd_def = [ sep_spc . key "SYSTEM" . sep_spc . sto_dquote ] *) - -let doctype = decl_def /!DOCTYPE/ (decl_outer|id_def) - -let attributes = [ label "#attribute" . - [ sep_spc . key nmtoken . sep_eq . sto_dquote ]+ ] - -let attrib_head = [ label "#attribute" . - [ sep_spc . key nmtoken . sep_eq . sto_squote ]+ ] - -let prolog = [ label "#declaration" . - dels "<?xml" . - attrib_head . - sep_osp . - dels "?>" ] - - -(************************************************************************ - * Tags - *************************************************************************) - -(* we consider entities as simple text *) -let text_re = /[^<]+/ - /([^<]*\]\]>[^<]*)/ -let text = [ label "#text" . store text_re ] -let cdata = [ label "#CDATA" . dels "<![CDATA[" . - store (char* - (char* . "]]>" . char*)) . dels "]]>" ] - -let element (body:lens) = - let h = attributes? . sep_osp . dels ">" . body* . dels "</" in - [ dels "<" . square nmtoken h . sep_osp . del_end ] - -let empty_element = [ dels "<" . key nmtoken . value "#empty" . - attributes? . sep_osp . del /\/>[\n]?/ "/>\n" ] - -let pi_instruction = [ dels "<?" . label "#pi" . - [ label "#target" . store pi_target ] . - [ sep_spc . label "#instruction" . store pi ]? . - sep_osp . del /\?>/ "?>" ] - -(* Typecheck is weaker on rec lens, detected by unfolding *) -(* -let content1 = element text -let rec content2 = element (content1|text|comment) -*) - -let rec content = element (text|comment|content|empty_element|pi_instruction) - -(* Constraints are weaker here, but it's better than being too strict *) -let doc = (sep_osp . (prolog | comment | doctype | pi_instruction))* . - ((sep_osp . content) | (sep_osp . empty_element)) . - (sep_osp . (comment | pi_instruction ))* . sep_osp - -let lns = doc - -let filter = (incl "/etc/tomcat6/tomcat-users.xml") . (incl "/etc/tomcat6/server.xml") - . (incl "/etc/tomcat7/tomcat-users.xml") . (incl "/etc/tomcat7/server.xml") - . Util.stdexcl - -let xfm = transform lns filter - diff --git a/garr/shib2common/files/customlenses/webappxml_0-10-0.aug b/garr/shib2common/files/customlenses/webappxml_0-10-0.aug deleted file mode 100644 index 5ca14e0276234c8f8187ed90d1c0cfd507563d54..0000000000000000000000000000000000000000 --- a/garr/shib2common/files/customlenses/webappxml_0-10-0.aug +++ /dev/null @@ -1,142 +0,0 @@ -(* WebAppXML lens for Augeas - Author: Francis Giraldeau <francis.giraldeau@usherbrooke.ca> - - Reference: http://www.w3.org/TR/2006/REC-xml11-20060816/ -*) - -module WebAppXml = - -autoload xfm - -(************************************************************************ - * Utilities lens - *************************************************************************) - -let dels (s:string) = del s s -let spc = /[ \t\n]+/ -let osp = /[ \t\n]*/ -let sep_spc = del /[ \t\n]+/ " " -let sep_osp = del /[ \t\n]*/ "" -let sep_eq = del /[ \t\n]*=[ \t\n]*/ "=" - -let nmtoken = /[a-zA-Z:_][a-zA-Z0-9:_.-]*/ -let word = /[a-zA-Z][a-zA-Z0-9._-]*/ -let char = /.|\n/ -(* if we hide the quotes, then we can only accept single or double quotes *) -(* otherwise a put ambiguity is raised *) -let sto_dquote = dels "\"" . store /[^"]*/ . dels "\"" -let sto_squote = dels "'" . store /[^']*/ . dels "'" - -let comment = [ label "#comment" . - dels "<!--" . - store /([^-]|-[^-])*/ . - dels "-->" ] - -let pi_target = nmtoken - /[Xx][Mm][Ll]/ -let empty = Util.empty -let del_end = del />[\n]?/ ">\n" -let del_end_simple = dels ">" - -(* This is siplified version of processing instruction - * pi has to not start or end with a white space and the string - * must not contain "?>". We restrict too much by not allowing any - * "?" nor ">" in PI - *) -let pi = /[^ \n\t]|[^ \n\t][^?>]*[^ \n\t]/ - -(************************************************************************ - * Attributes - *************************************************************************) - - -let decl = [ label "#decl" . sep_spc . - store /[^> \t\n\r]|[^> \t\n\r][^>\t\n\r]*[^> \t\n\r]/ ] - -let decl_def (r:regexp) (b:lens) = [ dels "<" . key r . - sep_spc . store word . - b . sep_osp . del_end_simple ] - -let elem_def = decl_def /!ELEMENT/ decl - -let enum = "(" . osp . nmtoken . ( osp . "|" . osp . nmtoken )* . osp . ")" - -let att_type = /CDATA|ID|IDREF|IDREFS|ENTITY|ENTITIES|NMTOKEN|NMTOKENS/ | - enum - -let id_def = [ sep_spc . key /PUBLIC/ . - [ label "#literal" . sep_spc . sto_dquote ]* ] | - [ sep_spc . key /SYSTEM/ . sep_spc . sto_dquote ] - -let notation_def = decl_def /!NOTATION/ id_def - -let att_def = counter "att_id" . - [ sep_spc . seq "att_id" . - [ label "#name" . store word . sep_spc ] . - [ label "#type" . store att_type . sep_spc ] . - ([ key /#REQUIRED|#IMPLIED/ ] | - [ label "#FIXED" . del /#FIXED[ \n\t]*|/ "" . sto_dquote ]) ]* - -let att_list_def = decl_def /!ATTLIST/ att_def - -let entity_def = decl_def /!ENTITY/ ([sep_spc . label "#decl" . sto_dquote ]) - -let decl_def_item = elem_def | entity_def | att_list_def | notation_def - -let decl_outer = sep_osp . del /\[[ \n\t\r]*/ "[\n" . - (decl_def_item . sep_osp )* . dels "]" - -(* let dtd_def = [ sep_spc . key "SYSTEM" . sep_spc . sto_dquote ] *) - -let doctype = decl_def /!DOCTYPE/ (decl_outer|id_def) - -let attributes = [ label "#attribute" . - [ sep_spc . key nmtoken . sep_eq . sto_dquote ]+ ] - -let prolog = [ label "#declaration" . - dels "<?xml" . - attributes . - sep_osp . - dels "?>" ] - - -(************************************************************************ - * Tags - *************************************************************************) - -(* we consider entities as simple text *) -let text_re = /[^<]+/ - /([^<]*\]\]>[^<]*)/ -let text = [ label "#text" . store text_re ] -let cdata = [ label "#CDATA" . dels "<![CDATA[" . - store (char* - (char* . "]]>" . char*)) . dels "]]>" ] - -let element (body:lens) = - let h = attributes? . sep_osp . dels ">" . body* . dels "</" in - [ dels "<" . square nmtoken h . sep_osp . del_end ] - -let empty_element = [ dels "<" . key nmtoken . value "#empty" . - attributes? . sep_osp . del /\/>[\n]?/ "/>\n" ] - -let pi_instruction = [ dels "<?" . label "#pi" . - [ label "#target" . store pi_target ] . - [ sep_spc . label "#instruction" . store pi ]? . - sep_osp . del /\?>/ "?>" ] - -(* Typecheck is weaker on rec lens, detected by unfolding *) -(* -let content1 = element text -let rec content2 = element (content1|text|comment) -*) - -let rec content = element (text|comment|content|empty_element|pi_instruction) - -(* Constraints are weaker here, but it's better than being too strict *) -let doc = (sep_osp . (prolog | comment | doctype | pi_instruction))* . - ((sep_osp . content) | (sep_osp . empty_element)) . - (sep_osp . (comment | pi_instruction ))* . sep_osp - -let lns = doc - -let filter = (incl "/usr/local/src/shibboleth-identity-provider/src/main/webapp/WEB-INF/*.xml") - . Util.stdexcl - -let xfm = transform lns filter diff --git a/garr/shib2common/files/customlenses/webappxml_1-2-0.aug b/garr/shib2common/files/customlenses/webappxml_1-2-0.aug index 3c40fa6bfde6ffa9ce52419766261a947aad3b10..e5061b9bb82fc40b405cbecd01e2111e2cde99f6 100644 --- a/garr/shib2common/files/customlenses/webappxml_1-2-0.aug +++ b/garr/shib2common/files/customlenses/webappxml_1-2-0.aug @@ -156,7 +156,8 @@ let doc = (sep_osp . (prolog | comment | doctype | pi_instruction))* . let lns = doc -let filter = (incl "/usr/local/src/shibboleth-identity-provider/src/main/webapp/WEB-INF/*.xml") +let filter = (incl "/usr/local/src/shibboleth-identityprovider/src/main/webapp/WEB-INF/*.xml") + . (incl "/usr/local/src/shibboleth-identity-provider/src/main/webapp/WEB-INF/*.xml") . (incl "/etc/xml/catalog") let xfm = transform lns filter