WIP - Append relative parameters (#1637)

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

@@ -28,7 +28,7 @@ our $casAppMetaDataNodeKeys = 'casAppMetaData(?:Options(?:Servic|Rul)e|ExportedV
 our $casSrvMetaDataNodeKeys = 'casSrvMetaData(?:Options(?:ProxiedServices|DisplayName|Gateway|Renew|Icon|Url)|ExportedVars)';
 our $oidcOPMetaDataNodeKeys = 'oidcOPMetaData(?:Options(?:C(?:lient(?:Secret|ID)|heckJWTSignature|onfigurationURI)|TokenEndpointAuthMethod|(?:JWKSTimeou|Promp)t|I(?:DTokenMaxAge|con)|S(?:toreIDToken|cope)|U(?:iLocales|seNonce)|Display(?:Name)?|AcrValues|MaxAge)|ExportedVars|J(?:SON|WKS))';
 our $oidcRPMetaDataNodeKeys = 'oidcRPMetaData(?:Options(?:(?:PostLogoutRedirectUri|ExtraClaim)s|I(?:DToken(?:Expiration|SignAlg)|con)|Logout(?:SessionRequired|Type|Url)|AccessTokenExpiration|R(?:edirectUris|ule)|Client(?:Secret|ID)|BypassConsent|DisplayName|UserIDAttr)|ExportedVars)';
-our $samlIDPMetaDataNodeKeys = 'samlIDPMetaData(?:Options(?:(?:Check(?:S[LS]OMessageSignatur|Audienc|Tim)|EncryptionMod|UserAttribut|IsPassiv)e|A(?:llow(?:LoginFromIDP|ProxiedAuthn)|daptSessionUtime)|Re(?:questedAuthnContext|solutionRule|layStateURL)|S(?:ignS[LS]OMessage|toreSAMLToken|[LS]OBinding)|Force(?:Authn|UTF8)|NameIDFormat)|ExportedAttributes|XML)';
+our $samlIDPMetaDataNodeKeys = 'samlIDPMetaData(?:Options(?:(?:Check(?:S[LS]OMessageSignatur|Audienc|Tim)|EncryptionMod|UserAttribut|DisplayNam)e|A(?:llow(?:LoginFromIDP|ProxiedAuthn)|daptSessionUtime)|Re(?:questedAuthnContext|solutionRule|layStateURL)|S(?:ignS[LS]OMessage|toreSAMLToken|[LS]OBinding)|Force(?:Authn|UTF8)|I(?:sPassive|con)|NameIDFormat)|ExportedAttributes|XML)';
 our $samlSPMetaDataNodeKeys = 'samlSPMetaData(?:Options(?:N(?:ameID(?:SessionKey|Format)|otOnOrAfterTimeout)|S(?:essionNotOnOrAfterTimeout|ignS[LS]OMessage)|(?:CheckS[LS]OMessageSignatur|OneTimeUs|Rul)e|En(?:ableIDPInitiatedURL|cryptionMode)|ForceUTF8)|ExportedAttributes|XML)';
 our $virtualHostKeys = '(?:vhost(?:A(?:uthnLevel|liases)|(?:Maintenanc|Typ)e|Https|Port)|(?:exportedHeader|locationRule)s|post)';
 

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

@@ -2591,6 +2591,9 @@ qr/(?:(?:https?):\/\/(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.]
             'default' => 1,
             'type'    => 'bool'
         },
+        'samlIDPMetaDataOptionsDisplayName' => {
+            'type' => 'text'
+        },
         'samlIDPMetaDataOptionsEncryptionMode' => {
             'default' => 'none',
             'select'  => [
@@ -2617,6 +2620,9 @@ qr/(?:(?:https?):\/\/(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.]
             'default' => 0,
             'type'    => 'bool'
         },
+        'samlIDPMetaDataOptionsIcon' => {
+            'type' => 'text'
+        },
         'samlIDPMetaDataOptionsIsPassive' => {
             'default' => 0,
             'type'    => 'bool'

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

@@ -1145,8 +1145,10 @@ sub attributes {
         },
 
         # Password reset
-        mailBody =>
-            { type => 'longtext', documentation => 'Custom password reset mail body', },
+        mailBody => {
+            type          => 'longtext',
+            documentation => 'Custom password reset mail body',
+        },
 
         mailConfirmBody => {
             type          => 'longtext',
@@ -2202,6 +2204,8 @@ sub attributes {
             default => 0,
         },
         samlIDPMetaDataOptionsUserAttribute => { type => 'text', },
+        samlIDPMetaDataOptionsDisplayName  => { type => 'text', },
+        samlIDPMetaDataOptionsIcon         => { type => 'text', },
 
         # SP keys
         samlSPMetaDataExportedAttributes => {
@@ -2560,9 +2564,10 @@ sub attributes {
             documentation => 'LDAP filter for auth search'
         },
         ldapGroupDecodeSearchedValue => {
-            default       => 0,
-            type          => 'bool',
-            documentation => 'Decode value before searching it in LDAP groups',
+            default => 0,
+            type    => 'bool',
+            documentation =>
+                'Decode value before searching it in LDAP groups',
         },
         ldapGroupRecursive => {
             default       => 0,

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

@@ -87,6 +87,14 @@ sub cTrees {
                     "samlIDPMetaDataOptionsCheckTime",
                     "samlIDPMetaDataOptionsCheckAudience"
                 ]
+            },
+                        {
+                title => "samlIDPMetaDataOptionsDisplay",
+                form  => 'simpleInputContainer',
+                nodes => [
+                    "samlIDPMetaDataOptionsDisplayName",
+                    "samlIDPMetaDataOptionsIcon"
+                ]
             }
         ],
         samlSPMetaDataNode => [

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

@@ -840,6 +840,23 @@ function templates(tpl,key) {
       "id" : "samlIDPMetaDataOptionsSecurity",
       "title" : "samlIDPMetaDataOptionsSecurity",
       "type" : "simpleInputContainer"
+   },
+   {
+      "_nodes" : [
+         {
+            "get" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsDisplayName",
+            "id" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsDisplayName",
+            "title" : "samlIDPMetaDataOptionsDisplayName"
+         },
+         {
+            "get" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsIcon",
+            "id" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsIcon",
+            "title" : "samlIDPMetaDataOptionsIcon"
+         }
+      ],
+      "id" : "samlIDPMetaDataOptionsDisplay",
+      "title" : "samlIDPMetaDataOptionsDisplay",
+      "type" : "simpleInputContainer"
    }
 ]
 ;

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

@@ -871,6 +871,10 @@
 "samlIDPMetaDataOptionsSession":"جلسة",
 "samlIDPMetaDataOptionsSignature":"توقيع",
 "samlIDPMetaDataOptionsBinding":"ربط",
+"samlIDPMetaDataOptionsDisplay":"Display",
+"samlIDPMetaDataOptionsDisplayName":"Display name",
+"samlIDPMetaDataOptionsDisplayParams":"Display",
+"samlIDPMetaDataOptionsIcon":"Logo",
 "samlIDPMetaDataOptionsSecurity":"الحماية",
 "samlIDPMetaDataOptionsStoreSAMLToken":"حفظ SAML توكن",
 "samlIDPMetaDataOptionsRelayStateURL":"السماح بعنوان اليو آر إل ك RelayState",

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

@@ -871,6 +871,10 @@
 "samlIDPMetaDataOptionsSession":"Session",
 "samlIDPMetaDataOptionsSignature":"Signature",
 "samlIDPMetaDataOptionsBinding":"Binding",
+"samlIDPMetaDataOptionsDisplay":"Display",
+"samlIDPMetaDataOptionsDisplayName":"Display name",
+"samlIDPMetaDataOptionsDisplayParams":"Display",
+"samlIDPMetaDataOptionsIcon":"Logo",
 "samlIDPMetaDataOptionsSecurity":"Security",
 "samlIDPMetaDataOptionsStoreSAMLToken":"Store SAML Token",
 "samlIDPMetaDataOptionsRelayStateURL":"Allow URL as RelayState",

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

@@ -871,6 +871,10 @@
 "samlIDPMetaDataOptionsSession":"Session",
 "samlIDPMetaDataOptionsSignature":"Signature",
 "samlIDPMetaDataOptionsBinding":"Binding",
+"samlIDPMetaDataOptionsDisplay":"Display",
+"samlIDPMetaDataOptionsDisplayName":"Display name",
+"samlIDPMetaDataOptionsDisplayParams":"Display",
+"samlIDPMetaDataOptionsIcon":"Logo",
 "samlIDPMetaDataOptionsSecurity":"Security",
 "samlIDPMetaDataOptionsStoreSAMLToken":"Store SAML Token",
 "samlIDPMetaDataOptionsRelayStateURL":"Allow URL as RelayState",

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

@@ -871,6 +871,10 @@
 "samlIDPMetaDataOptionsSession":"Session",
 "samlIDPMetaDataOptionsSignature":"Signature",
 "samlIDPMetaDataOptionsBinding":"Méthode",
+"samlIDPMetaDataOptionsDisplay":"Affichage",
+"samlIDPMetaDataOptionsDisplayName":"Nom d'affichage",
+"samlIDPMetaDataOptionsDisplayParams":"Affichage",
+"samlIDPMetaDataOptionsIcon":"Logo",
 "samlIDPMetaDataOptionsSecurity":"Sécurité",
 "samlIDPMetaDataOptionsStoreSAMLToken":"Conserver le jeton SAML",
 "samlIDPMetaDataOptionsRelayStateURL":"Pemettre une URL dans le RelayState",

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

@@ -871,6 +871,10 @@
 "samlIDPMetaDataOptionsSession":"Sessioni",
 "samlIDPMetaDataOptionsSignature":"Firma",
 "samlIDPMetaDataOptionsBinding":"Vincolante",
+"samlIDPMetaDataOptionsDisplay":"Display",
+"samlIDPMetaDataOptionsDisplayName":"Display name",
+"samlIDPMetaDataOptionsDisplayParams":"Display",
+"samlIDPMetaDataOptionsIcon":"Logo",
 "samlIDPMetaDataOptionsSecurity":"Sicurezza",
 "samlIDPMetaDataOptionsStoreSAMLToken":"Store SAML Token",
 "samlIDPMetaDataOptionsRelayStateURL":"Consenti l'URL come RelayState",

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

@@ -871,6 +871,10 @@
 "samlIDPMetaDataOptionsSession":"Phiên",
 "samlIDPMetaDataOptionsSignature":"Chữ ký",
 "samlIDPMetaDataOptionsBinding":"Liên kết",
+"samlIDPMetaDataOptionsDisplay":"Display",
+"samlIDPMetaDataOptionsDisplayName":"Display name",
+"samlIDPMetaDataOptionsDisplayParams":"Display",
+"samlIDPMetaDataOptionsIcon":"Logo",
 "samlIDPMetaDataOptionsSecurity":"Bảo mật",
 "samlIDPMetaDataOptionsStoreSAMLToken":"Lưu trữ token SAML",
 "samlIDPMetaDataOptionsRelayStateURL":"Cho phép URL như RelayState",

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

@@ -871,6 +871,10 @@
 "samlIDPMetaDataOptionsSession":"Session",
 "samlIDPMetaDataOptionsSignature":"Signature",
 "samlIDPMetaDataOptionsBinding":"Binding",
+"samlIDPMetaDataOptionsDisplay":"Display",
+"samlIDPMetaDataOptionsDisplayName":"Display name",
+"samlIDPMetaDataOptionsDisplayParams":"Display",
+"samlIDPMetaDataOptionsIcon":"Logo",
 "samlIDPMetaDataOptionsSecurity":"Security",
 "samlIDPMetaDataOptionsStoreSAMLToken":"Store SAML Token",
 "samlIDPMetaDataOptionsRelayStateURL":"Allow URL as RelayState",

lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/SAML.pm

@@ -268,6 +268,9 @@ sub loadIDPs {
         $self->idpList->{$entityID}->{confKey} = $_;
         $self->idpList->{$entityID}->{name}    = $name;
 
+
+        #####################
+
         # Set encryption mode
         my $encryption_mode = $self->conf->{samlIDPMetaDataOptions}->{$_}
           ->{samlIDPMetaDataOptionsEncryptionMode};