Add manager options for CAS/OIDC resolution rules (#2753)

lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/ReConstants.pm

@@ -25,8 +25,8 @@ our $doubleHashKeys = 'issuerDBGetParameters';
 our $simpleHashKeys = '(?:(?:c(?:as(?:StorageOption|Attribute)|ustom(?:Plugins|Add)Param|heckUserHiddenHeader|ombModule)|l(?:o(?:calSessionStorageOption|goutService)|dapExportedVar|wp(?:Ssl)?Opt)|f(?:indUser(?:Exclud|Search)ingAttribute|acebookExportedVar)|re(?:moteGlobalStorageOption|st2f(?:Verify|Init)Arg|loadUrl)|g(?:r(?:antSessionRule|oup)|lobalStorageOption)|n(?:otificationStorageOption|ginxCustomHandler)|p(?:ersistentStorageOption|ortalSkinRule)|(?:(?:d(?:emo|bi)|webID)E|e)xportedVar|macro)s|o(?:idc(?:S(?:ervice(?:DynamicRegistrationEx(?:portedVar|traClaim)s|MetaDataAuthnContext)|torageOptions)|OPMetaDataJ(?:SON|WKS))|penIdExportedVars)|a(?:(?:daptativeAuthenticationLevelR|ut(?:hChoiceMod|oSigninR))ules|pplicationList)|s(?:(?:amlStorageOption|laveExportedVar)s|essionDataToRemember|fExtra)|S(?:MTPTLSOpts|SLVarIf))';
 our $specialNodeKeys = '(?:(?:(?:saml(?:ID|S)|oidc[OR])P|cas(?:App|Srv))MetaDataNode|virtualHost)s';
 our $casAppMetaDataNodeKeys = 'casAppMetaData(?:Options(?:(?:UserAttribut|Servic|Rul)e|AuthnLevel)|(?:ExportedVar|Macro)s)';
-our $casSrvMetaDataNodeKeys = 'casSrvMetaData(?:Options(?:ProxiedServices|DisplayName|SortNumber|Gateway|Renew|Icon|Url)|ExportedVars)';
-our $oidcOPMetaDataNodeKeys = 'oidcOPMetaData(?:Options(?:C(?:lient(?:Secret|ID)|heckJWTSignature|onfigurationURI)|S(?:toreIDToken|ortNumber|cope)|TokenEndpointAuthMethod|(?:JWKSTimeou|Promp)t|I(?:DTokenMaxAge|con)|U(?:iLocales|seNonce)|Display(?:Name)?|AcrValues|MaxAge)|ExportedVars|J(?:SON|WKS))';
+our $casSrvMetaDataNodeKeys = 'casSrvMetaData(?:Options(?:Re(?:solutionRule|new)|ProxiedServices|DisplayName|SortNumber|Gateway|Icon|Url)|ExportedVars)';
+our $oidcOPMetaDataNodeKeys = 'oidcOPMetaData(?:Options(?:C(?:lient(?:Secret|ID)|heckJWTSignature|onfigurationURI)|S(?:toreIDToken|ortNumber|cope)|(?:ResolutionRul|MaxAg)e|TokenEndpointAuthMethod|(?:JWKSTimeou|Promp)t|I(?:DTokenMaxAge|con)|U(?:iLocales|seNonce)|Display(?:Name)?|AcrValues)|ExportedVars|J(?:SON|WKS))';
 our $oidcRPMetaDataNodeKeys = 'oidcRPMetaData(?:Options(?:A(?:llow(?:(?:ClientCredentials|Password)Grant|Offline)|ccessToken(?:Expiration|SignAlg|Claims|JWT)|uth(?:orizationCodeExpiration|nLevel)|dditionalAudiences)|I(?:DToken(?:ForceClaims|Expiration|SignAlg)|con)|R(?:e(?:directUris|freshToken|quirePKCE)|ule)|Logout(?:SessionRequired|Type|Url)|P(?:ostLogoutRedirectUris|ublic)|UserI(?:nfoSignAlg|DAttr)|OfflineSessionExpiration|Client(?:Secret|ID)|BypassConsent|DisplayName|ExtraClaims)|(?:ExportedVar|ScopeRule|Macro)s)';
 our $samlIDPMetaDataNodeKeys = 'samlIDPMetaData(?:Options(?:(?:Check(?:S[LS]OMessageSignatur|Audienc|Tim)|EncryptionMod|UserAttribut|DisplayNam)e|S(?:ign(?:S[LS]OMessage|atureMethod)|toreSAMLToken|[LS]OBinding|ortNumber)|A(?:llow(?:LoginFromIDP|ProxiedAuthn)|daptSessionUtime)|Re(?:questedAuthnContext|solutionRule|layStateURL)|Force(?:Authn|UTF8)|I(?:sPassive|con)|NameIDFormat)|ExportedAttributes|XML)';
 our $samlSPMetaDataNodeKeys = 'samlSPMetaData(?:Options(?:S(?:ign(?:S[LS]OMessage|atureMethod)|essionNotOnOrAfterTimeout)|N(?:ameID(?:SessionKey|Format)|otOnOrAfterTimeout)|(?:CheckS[LS]OMessageSignatur|OneTimeUs|Rul)e|En(?:ableIDPInitiatedURL|cryptionMode)|AuthnLevel|ForceUTF8)|(?:ExportedAttribute|Macro)s|XML)';

lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm

@@ -797,6 +797,10 @@ sub attributes {
             'default' => 0,
             'type'    => 'bool'
         },
+        'casSrvMetaDataOptionsResolutionRule' => {
+            'default' => '',
+            'type'    => 'longtext'
+        },
         'casSrvMetaDataOptionsSortNumber' => {
             'type' => 'int'
         },
@@ -2277,6 +2281,10 @@ m[^(?:ldapi://[^/]*/?|\w[\w\-\.]*(?::\d{1,5})?|ldap(?:s|\+tls)?://\w[\w\-\.]*(?:
         'oidcOPMetaDataOptionsPrompt' => {
             'type' => 'text'
         },
+        'oidcOPMetaDataOptionsResolutionRule' => {
+            'default' => '',
+            'type'    => 'longtext'
+        },
         'oidcOPMetaDataOptionsScope' => {
             'default' => 'openid profile',
             'type'    => 'text'

lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Attributes.pm

@@ -3673,6 +3673,10 @@ m{^(?:ldapi://[^/]*/?|\w[\w\-\.]*(?::\d{1,5})?|ldap(?:s|\+tls)?://\w[\w\-\.]*(?:
             type          => 'int',
             documentation => 'Number to sort buttons',
         },
+        casSrvMetaDataOptionsResolutionRule => {
+            type    => 'longtext',
+            default => '',
+        },
 
         # Fake attribute: used by manager REST API to agglomerate all nodes
         # related to a CAS IDP partner
@@ -4372,6 +4376,10 @@ m{^(?:ldapi://[^/]*/?|\w[\w\-\.]*(?::\d{1,5})?|ldap(?:s|\+tls)?://\w[\w\-\.]*(?:
         oidcOPMetaDataOptionsIcon          => { type => 'text', },
         oidcOPMetaDataOptionsStoreIDToken  => { type => 'bool', default => 0 },
         oidcOPMetaDataOptionsSortNumber    => { type => 'int', },
+        oidcOPMetaDataOptionsResolutionRule => {
+            type    => 'longtext',
+            default => '',
+        },
 
         # OpenID Connect relying parties
         oidcRPMetaDataExportedVars => {

lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/CTrees.pm

@@ -82,7 +82,6 @@ sub cTrees {
                 help  => 'authsaml.html#options',
                 form  => 'simpleInputContainer',
                 nodes => [
-                    'samlIDPMetaDataOptionsResolutionRule',
                     'samlIDPMetaDataOptionsNameIDFormat',
                     'samlIDPMetaDataOptionsForceAuthn',
                     'samlIDPMetaDataOptionsIsPassive',
@@ -98,6 +97,7 @@ sub cTrees {
                 nodes => [
                     "samlIDPMetaDataOptionsDisplayName",
                     "samlIDPMetaDataOptionsIcon",
+                    'samlIDPMetaDataOptionsResolutionRule',
                     "samlIDPMetaDataOptionsSortNumber"
                 ]
             }
@@ -186,6 +186,7 @@ sub cTrees {
                 nodes => [
                     'oidcOPMetaDataOptionsDisplayName',
                     'oidcOPMetaDataOptionsIcon',
+                    'oidcOPMetaDataOptionsResolutionRule',
                     'oidcOPMetaDataOptionsSortNumber'
                 ]
             },
@@ -285,6 +286,7 @@ sub cTrees {
                 nodes => [
                     'casSrvMetaDataOptionsDisplayName',
                     'casSrvMetaDataOptionsIcon',
+                    'casSrvMetaDataOptionsResolutionRule',
                     'casSrvMetaDataOptionsSortNumber',
                 ]
             },

lemonldap-ng-manager/site/htdocs/static/js/conftree.js

@@ -146,6 +146,13 @@ function templates(tpl,key) {
             "id" : tpl+"s/"+key+"/"+"casSrvMetaDataOptionsIcon",
             "title" : "casSrvMetaDataOptionsIcon"
          },
+         {
+            "default" : "",
+            "get" : tpl+"s/"+key+"/"+"casSrvMetaDataOptionsResolutionRule",
+            "id" : tpl+"s/"+key+"/"+"casSrvMetaDataOptionsResolutionRule",
+            "title" : "casSrvMetaDataOptionsResolutionRule",
+            "type" : "longtext"
+         },
          {
             "get" : tpl+"s/"+key+"/"+"casSrvMetaDataOptionsSortNumber",
             "id" : tpl+"s/"+key+"/"+"casSrvMetaDataOptionsSortNumber",
@@ -362,6 +369,13 @@ function templates(tpl,key) {
             "id" : tpl+"s/"+key+"/"+"oidcOPMetaDataOptionsIcon",
             "title" : "oidcOPMetaDataOptionsIcon"
          },
+         {
+            "default" : "",
+            "get" : tpl+"s/"+key+"/"+"oidcOPMetaDataOptionsResolutionRule",
+            "id" : tpl+"s/"+key+"/"+"oidcOPMetaDataOptionsResolutionRule",
+            "title" : "oidcOPMetaDataOptionsResolutionRule",
+            "type" : "longtext"
+         },
          {
             "get" : tpl+"s/"+key+"/"+"oidcOPMetaDataOptionsSortNumber",
             "id" : tpl+"s/"+key+"/"+"oidcOPMetaDataOptionsSortNumber",
@@ -976,13 +990,6 @@ function templates(tpl,key) {
    },
    {
       "_nodes" : [
-         {
-            "default" : "",
-            "get" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsResolutionRule",
-            "id" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsResolutionRule",
-            "title" : "samlIDPMetaDataOptionsResolutionRule",
-            "type" : "longtext"
-         },
          {
             "default" : "",
             "get" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsNameIDFormat",
@@ -1114,6 +1121,13 @@ function templates(tpl,key) {
             "id" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsIcon",
             "title" : "samlIDPMetaDataOptionsIcon"
          },
+         {
+            "default" : "",
+            "get" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsResolutionRule",
+            "id" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsResolutionRule",
+            "title" : "samlIDPMetaDataOptionsResolutionRule",
+            "type" : "longtext"
+         },
          {
             "get" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsSortNumber",
             "id" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsSortNumber",

lemonldap-ng-manager/site/htdocs/static/languages/ar.json

@@ -161,6 +161,7 @@
 "casSrvMetaDataOptionsIcon":"مسارالأيقونة",
 "casSrvMetaDataOptionsProxiedServices":"خدمات البروكسي",
 "casSrvMetaDataOptionsRenew":"تجديد إثبات الهوية",
+"casSrvMetaDataOptionsResolutionRule":"حل القاعدة",
 "casSrvMetaDataOptionsSortNumber":"Order",
 "casSrvMetaDataOptionsUrl":" يو أر ل الخادم",
 "casSrvName":"اسم خادم كاس",
@@ -652,6 +653,7 @@
 "oidcOPMetaDataOptionsMaxAge":"الحد الأقصى للعمر",
 "oidcOPMetaDataOptionsPrompt":"عاجل",
 "oidcOPMetaDataOptionsProtocol":"بروتوكول",
+"oidcOPMetaDataOptionsResolutionRule":"حل القاعدة",
 "oidcOPMetaDataOptionsScope":"نطاق",
 "oidcOPMetaDataOptionsSortNumber":"Order",
 "oidcOPMetaDataOptionsStoreIDToken":"مخزن تعريف التوكن",

lemonldap-ng-manager/site/htdocs/static/languages/en.json

@@ -161,6 +161,7 @@
 "casSrvMetaDataOptionsIcon":"Icon path",
 "casSrvMetaDataOptionsProxiedServices":"Proxied services",
 "casSrvMetaDataOptionsRenew":"Renew authentication",
+"casSrvMetaDataOptionsResolutionRule":"Resolution rule",
 "casSrvMetaDataOptionsSortNumber":"Order",
 "casSrvMetaDataOptionsUrl":"Server URL",
 "casSrvName":"CAS Server Name",
@@ -652,6 +653,7 @@
 "oidcOPMetaDataOptionsMaxAge":"Max age",
 "oidcOPMetaDataOptionsPrompt":"Prompt",
 "oidcOPMetaDataOptionsProtocol":"Protocol",
+"oidcOPMetaDataOptionsResolutionRule":"Resolution rule",
 "oidcOPMetaDataOptionsScope":"Scope",
 "oidcOPMetaDataOptionsSortNumber":"Order",
 "oidcOPMetaDataOptionsStoreIDToken":"Store ID Token",

lemonldap-ng-manager/site/htdocs/static/languages/es.json

@@ -161,6 +161,7 @@
 "casSrvMetaDataOptionsIcon":"Icon path",
 "casSrvMetaDataOptionsProxiedServices":"Servicios proxificados",
 "casSrvMetaDataOptionsRenew":"Renovar autentificación",
+"casSrvMetaDataOptionsResolutionRule":"Resolution rule",
 "casSrvMetaDataOptionsSortNumber":"Orden",
 "casSrvMetaDataOptionsUrl":"URL de servicio",
 "casSrvName":"Nombre de servidor CAS",
@@ -652,6 +653,7 @@
 "oidcOPMetaDataOptionsMaxAge":"Max age",
 "oidcOPMetaDataOptionsPrompt":"Prompt",
 "oidcOPMetaDataOptionsProtocol":"Protocolo",
+"oidcOPMetaDataOptionsResolutionRule":"Resolution rule",
 "oidcOPMetaDataOptionsScope":"Ámbito",
 "oidcOPMetaDataOptionsSortNumber":"Orden",
 "oidcOPMetaDataOptionsStoreIDToken":"Guardar token ID",

lemonldap-ng-manager/site/htdocs/static/languages/fr.json

@@ -161,6 +161,7 @@
 "casSrvMetaDataOptionsIcon":"Chemin de l'icône",
 "casSrvMetaDataOptionsProxiedServices":"Services mandatés",
 "casSrvMetaDataOptionsRenew":"Renouveler l'authentification",
+"casSrvMetaDataOptionsResolutionRule":"Règle de résolution",
 "casSrvMetaDataOptionsSortNumber":"Ordre",
 "casSrvMetaDataOptionsUrl":"URL du serveur",
 "casSrvName":"Nom du serveur CAS",
@@ -652,6 +653,7 @@
 "oidcOPMetaDataOptionsMaxAge":"Age maximum",
 "oidcOPMetaDataOptionsPrompt":"Interaction",
 "oidcOPMetaDataOptionsProtocol":"Protocole",
+"oidcOPMetaDataOptionsResolutionRule":"Règle de résolution",
 "oidcOPMetaDataOptionsScope":"Scope",
 "oidcOPMetaDataOptionsSortNumber":"Ordre",
 "oidcOPMetaDataOptionsStoreIDToken":"Conserver le jeton d'identité",

lemonldap-ng-manager/site/htdocs/static/languages/he.json

@@ -161,6 +161,7 @@
 "casSrvMetaDataOptionsIcon":"נתיב לסמל",
 "casSrvMetaDataOptionsProxiedServices":"שירותים מתווכים",
 "casSrvMetaDataOptionsRenew":"חידוש אימות",
+"casSrvMetaDataOptionsResolutionRule":"Resolution rule",
 "casSrvMetaDataOptionsSortNumber":"סדר",
 "casSrvMetaDataOptionsUrl":"כתובת שרת",
 "casSrvName":"CAS Server Name",
@@ -652,6 +653,7 @@
 "oidcOPMetaDataOptionsMaxAge":"גיל מרבי",
 "oidcOPMetaDataOptionsPrompt":"Prompt",
 "oidcOPMetaDataOptionsProtocol":"פרוטוקול",
+"oidcOPMetaDataOptionsResolutionRule":"Resolution rule",
 "oidcOPMetaDataOptionsScope":"היקף",
 "oidcOPMetaDataOptionsSortNumber":"סדר",
 "oidcOPMetaDataOptionsStoreIDToken":"Store ID Token",

lemonldap-ng-manager/site/htdocs/static/languages/it.json

@@ -161,6 +161,7 @@
 "casSrvMetaDataOptionsIcon":"Path icona",
 "casSrvMetaDataOptionsProxiedServices":"Servizi Proxied",
 "casSrvMetaDataOptionsRenew":"Rinnova l'autenticazione",
+"casSrvMetaDataOptionsResolutionRule":"Regola di risoluzione",
 "casSrvMetaDataOptionsSortNumber":"Ordine",
 "casSrvMetaDataOptionsUrl":"URL del server",
 "casSrvName":"NOme del Server CAS",
@@ -652,6 +653,7 @@
 "oidcOPMetaDataOptionsMaxAge":"Età massima",
 "oidcOPMetaDataOptionsPrompt":"Richiesta",
 "oidcOPMetaDataOptionsProtocol":"Protocollo",
+"oidcOPMetaDataOptionsResolutionRule":"Regola di risoluzione",
 "oidcOPMetaDataOptionsScope":"Scopo",
 "oidcOPMetaDataOptionsSortNumber":"Ordine",
 "oidcOPMetaDataOptionsStoreIDToken":"Immagazzina ID Token",

lemonldap-ng-manager/site/htdocs/static/languages/pl.json

@@ -161,6 +161,7 @@
 "casSrvMetaDataOptionsIcon":"Ścieżka ikony",
 "casSrvMetaDataOptionsProxiedServices":"Usługi proxy",
 "casSrvMetaDataOptionsRenew":"Odnów uwierzytelnianie",
+"casSrvMetaDataOptionsResolutionRule":"Reguła rozstrzygania",
 "casSrvMetaDataOptionsSortNumber":"Kolejność",
 "casSrvMetaDataOptionsUrl":"URL serwera",
 "casSrvName":"Nazwa serwera CAS",
@@ -652,6 +653,7 @@
 "oidcOPMetaDataOptionsMaxAge":"Maksymalny czas ważności",
 "oidcOPMetaDataOptionsPrompt":"Prompt",
 "oidcOPMetaDataOptionsProtocol":"Protokół",
+"oidcOPMetaDataOptionsResolutionRule":"Reguła rozstrzygania",
 "oidcOPMetaDataOptionsScope":"Zakres",
 "oidcOPMetaDataOptionsSortNumber":"Kolejność",
 "oidcOPMetaDataOptionsStoreIDToken":"Przechowuj token identyfikacyjny",

lemonldap-ng-manager/site/htdocs/static/languages/tr.json

@@ -161,6 +161,7 @@
 "casSrvMetaDataOptionsIcon":"İkon yolu",
 "casSrvMetaDataOptionsProxiedServices":"Vekil sunucu servisleri",
 "casSrvMetaDataOptionsRenew":"Kimlik doğrulamayı yenile",
+"casSrvMetaDataOptionsResolutionRule":"Çözünürlük kuralı",
 "casSrvMetaDataOptionsSortNumber":"Sıra",
 "casSrvMetaDataOptionsUrl":"Sunucu URL'si",
 "casSrvName":"CAS Sunucu Adı",
@@ -652,6 +653,7 @@
 "oidcOPMetaDataOptionsMaxAge":"Maksimum ömür",
 "oidcOPMetaDataOptionsPrompt":"İstem",
 "oidcOPMetaDataOptionsProtocol":"Protokol",
+"oidcOPMetaDataOptionsResolutionRule":"Çözünürlük kuralı",
 "oidcOPMetaDataOptionsScope":"Kapsam",
 "oidcOPMetaDataOptionsSortNumber":"Sıra",
 "oidcOPMetaDataOptionsStoreIDToken":"ID Jetonu Sakla",

lemonldap-ng-manager/site/htdocs/static/languages/vi.json

@@ -161,6 +161,7 @@
 "casSrvMetaDataOptionsIcon":"Đường dẫn Icon",
 "casSrvMetaDataOptionsProxiedServices":"Dịch vụ proxy",
 "casSrvMetaDataOptionsRenew":"Gia hạn chứng thực",
+"casSrvMetaDataOptionsResolutionRule":"Quy tắc phân giải ",
 "casSrvMetaDataOptionsSortNumber":"Order",
 "casSrvMetaDataOptionsUrl":"URL máy chủ",
 "casSrvName":"Tên máy chủ CAS",
@@ -652,6 +653,7 @@
 "oidcOPMetaDataOptionsMaxAge":"Thời hạn tối đa",
 "oidcOPMetaDataOptionsPrompt":"Nhắc nhở",
 "oidcOPMetaDataOptionsProtocol":"Giao thức",
+"oidcOPMetaDataOptionsResolutionRule":"Quy tắc phân giải ",
 "oidcOPMetaDataOptionsScope":"Phạm vi",
 "oidcOPMetaDataOptionsSortNumber":"Order",
 "oidcOPMetaDataOptionsStoreIDToken":"Mã thông báo Cửa hàng",

lemonldap-ng-manager/site/htdocs/static/languages/zh.json

@@ -161,6 +161,7 @@
 "casSrvMetaDataOptionsIcon":"图标路径",
 "casSrvMetaDataOptionsProxiedServices":"代理服务",
 "casSrvMetaDataOptionsRenew":"更新驗證",
+"casSrvMetaDataOptionsResolutionRule":"解析規則",
 "casSrvMetaDataOptionsSortNumber":"順序",
 "casSrvMetaDataOptionsUrl":"服务器 URL",
 "casSrvName":"CAS 服务器名称",
@@ -652,6 +653,7 @@
 "oidcOPMetaDataOptionsMaxAge":"最大時間",
 "oidcOPMetaDataOptionsPrompt":"提示",
 "oidcOPMetaDataOptionsProtocol":"協定",
+"oidcOPMetaDataOptionsResolutionRule":"解析規則",
 "oidcOPMetaDataOptionsScope":"範圍",
 "oidcOPMetaDataOptionsSortNumber":"順序",
 "oidcOPMetaDataOptionsStoreIDToken":"儲存 ID 權杖",

lemonldap-ng-manager/site/htdocs/static/languages/zh_TW.json

@@ -161,6 +161,7 @@
 "casSrvMetaDataOptionsIcon":"圖示路徑",
 "casSrvMetaDataOptionsProxiedServices":"已代理的服務",
 "casSrvMetaDataOptionsRenew":"更新驗證",
+"casSrvMetaDataOptionsResolutionRule":"解析規則",
 "casSrvMetaDataOptionsSortNumber":"順序",
 "casSrvMetaDataOptionsUrl":"伺服器 URL",
 "casSrvName":"CAS 伺服器名稱",
@@ -652,6 +653,7 @@
 "oidcOPMetaDataOptionsMaxAge":"最大時間",
 "oidcOPMetaDataOptionsPrompt":"提示",
 "oidcOPMetaDataOptionsProtocol":"協定",
+"oidcOPMetaDataOptionsResolutionRule":"解析規則",
 "oidcOPMetaDataOptionsScope":"範圍",
 "oidcOPMetaDataOptionsSortNumber":"順序",
 "oidcOPMetaDataOptionsStoreIDToken":"儲存 ID 權杖",