Append issuersTimeout option (#1916)

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

@@ -102,6 +102,7 @@ sub defaultValues {
         'issuerDBOpenIDRule'            => 1,
         'issuerDBSAMLPath'              => '^/saml/',
         'issuerDBSAMLRule'              => 1,
+        'issuersTimeout'                => 120,
         'jsRedirect'                    => 0,
         'krbAuthnLevel'                 => 3,
         'krbRemoveDomain'               => 1,

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

@@ -65,6 +65,7 @@ our $issuerParameters = {
   issuerDBOpenID => [qw(issuerDBOpenIDActivation issuerDBOpenIDPath issuerDBOpenIDRule openIdIssuerSecret openIdAttr openIdSPList openIdSreg_fullname openIdSreg_nickname openIdSreg_language openIdSreg_postcode openIdSreg_timezone openIdSreg_country openIdSreg_gender openIdSreg_email openIdSreg_dob)],
   issuerDBOpenIDConnect => [qw(issuerDBOpenIDConnectActivation issuerDBOpenIDConnectPath issuerDBOpenIDConnectRule)],
   issuerDBSAML => [qw(issuerDBSAMLActivation issuerDBSAMLPath issuerDBSAMLRule)],
+  issuerOptions => [qw(issuersTimeout)],
 };
 our $samlServiceParameters = [qw(samlEntityID samlServicePrivateKeySig samlServicePrivateKeySigPwd samlServicePublicKeySig samlServicePrivateKeyEnc samlServicePrivateKeyEncPwd samlServicePublicKeyEnc samlServiceUseCertificateInResponse samlServiceSignatureMethod samlNameIDFormatMapEmail samlNameIDFormatMapX509 samlNameIDFormatMapWindows samlNameIDFormatMapKerberos samlAuthnContextMapPassword samlAuthnContextMapPasswordProtectedTransport samlAuthnContextMapTLSClient samlAuthnContextMapKerberos samlOrganizationDisplayName samlOrganizationName samlOrganizationURL samlSPSSODescriptorAuthnRequestsSigned samlSPSSODescriptorWantAssertionsSigned samlSPSSODescriptorSingleLogoutServiceHTTPRedirect samlSPSSODescriptorSingleLogoutServiceHTTPPost samlSPSSODescriptorSingleLogoutServiceSOAP samlSPSSODescriptorAssertionConsumerServiceHTTPArtifact samlSPSSODescriptorAssertionConsumerServiceHTTPPost samlSPSSODescriptorArtifactResolutionServiceArtifact samlIDPSSODescriptorWantAuthnRequestsSigned samlIDPSSODescriptorSingleSignOnServiceHTTPRedirect samlIDPSSODescriptorSingleSignOnServiceHTTPPost samlIDPSSODescriptorSingleSignOnServiceHTTPArtifact samlIDPSSODescriptorSingleLogoutServiceHTTPRedirect samlIDPSSODescriptorSingleLogoutServiceHTTPPost samlIDPSSODescriptorSingleLogoutServiceSOAP samlIDPSSODescriptorArtifactResolutionServiceArtifact samlAttributeAuthorityDescriptorAttributeServiceSOAP samlIdPResolveCookie samlMetadataForceUTF8 samlStorage samlStorageOptions samlRelayStateTimeout samlUseQueryStringSpecific samlCommonDomainCookieActivation samlCommonDomainCookieDomain samlCommonDomainCookieReader samlCommonDomainCookieWriter samlDiscoveryProtocolActivation samlDiscoveryProtocolURL samlDiscoveryProtocolPolicy samlDiscoveryProtocolIsPassive samlOverrideIDPEntityID)];
 our $oidcServiceParameters = [qw(oidcServiceMetaDataIssuer oidcServiceMetaDataAuthorizeURI oidcServiceMetaDataTokenURI oidcServiceMetaDataUserInfoURI oidcServiceMetaDataJWKSURI oidcServiceMetaDataRegistrationURI oidcServiceMetaDataIntrospectionURI oidcServiceMetaDataEndSessionURI oidcServiceMetaDataCheckSessionURI oidcServiceMetaDataFrontChannelURI oidcServiceMetaDataBackChannelURI oidcServiceMetaDataAuthnContext oidcServicePrivateKeySig oidcServicePublicKeySig oidcServiceKeyIdSig oidcServiceAllowDynamicRegistration oidcServiceAllowAuthorizationCodeFlow oidcServiceAllowImplicitFlow oidcServiceAllowHybridFlow oidcStorage oidcStorageOptions)];

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

@@ -1378,6 +1378,10 @@ qr/^(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-zA-Z0-
             'default' => 1,
             'type'    => 'boolOrExpr'
         },
+        'issuersTimeout' => {
+            'default' => 120,
+            'type'    => 'int'
+        },
         'jsRedirect' => {
             'default' => 0,
             'type'    => 'boolOrExpr'

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

@@ -664,6 +664,11 @@ sub attributes {
             type          => 'int',
             documentation => 'Token timeout for forms',
         },
+        issuersTimeout => {
+            default       => 120,
+            type          => 'int',
+            documentation => 'Token timeout for issuers',
+        },
         requireToken => {
             default       => 1,
             type          => 'boolOrExpr',

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

@@ -493,6 +493,12 @@ sub tree {
                                 'issuerDBGetParameters'
                             ]
                         },
+                        {
+                            title => 'issuerOptions',
+                            help  => 'start.html#options',
+                            form  => 'simpleInputContainer',
+                            nodes => ['issuersTimeout']
+                        },
                     ]
                 },
                 {
@@ -553,7 +559,8 @@ sub tree {
                 {
                     title => 'reloadParams',
                     help  => 'configlocation.html#configuration_reload',
-                    nodes => [ 'reloadUrls', 'reloadTimeout', 'dontCompactConf' ]
+                    nodes =>
+                      [ 'reloadUrls', 'reloadTimeout', 'dontCompactConf' ]
                 },
                 {
                     title => 'plugins',

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

@@ -344,7 +344,9 @@
 "issuerDBOpenIDConnectActivation":"تفعيل",
 "issuerDBOpenIDConnectPath":"مسار",
 "issuerDBOpenIDConnectRule":"استخدام القاعدة",
+"issuerOptions":"Options",
 "issuerParams":"وحدات المصدر",
+"issuersTimeout":"Issuers timeout",
 "jsRedirect":"إعادة توجيه الرسالة",
 "jqueryButtonSelector":"زر التحديد ل جي كويري  (اختياري)",
 "jqueryFormSelector":"تحديد الاستمارة ل جي كويري (اختياري)",

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

@@ -344,7 +344,9 @@
 "issuerDBOpenIDConnectActivation":"Activation",
 "issuerDBOpenIDConnectPath":"Path",
 "issuerDBOpenIDConnectRule":"Use rule",
+"issuerOptions":"Options",
 "issuerParams":"Issuer modules",
+"issuersTimeout":"Issuers timeout",
 "jsRedirect":"Redirection message",
 "jqueryButtonSelector":"jQuery button selector (optional)",
 "jqueryFormSelector":"jQuery form selector (optional)",

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

@@ -344,7 +344,9 @@
 "issuerDBOpenIDConnectActivation":"Activation",
 "issuerDBOpenIDConnectPath":"Path",
 "issuerDBOpenIDConnectRule":"Use rule",
+"issuerOptions":"Options",
 "issuerParams":"Issuer modules",
+"issuersTimeout":"Issuers timeout",
 "jsRedirect":"Redirection message",
 "jqueryButtonSelector":"jQuery button selector (optional)",
 "jqueryFormSelector":"jQuery form selector (optional)",

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

@@ -344,7 +344,9 @@
 "issuerDBOpenIDConnectActivation":"Activation",
 "issuerDBOpenIDConnectPath":"Chemin",
 "issuerDBOpenIDConnectRule":"Règle d'utilisation",
+"issuerOptions":"Options",
 "issuerParams":"Modules fournisseur",
+"issuersTimeout":"Délai de validation pour les fournisseurs",
 "jsRedirect":"Message de redirection",
 "jqueryButtonSelector":"Sélecteur jQuery du bouton (optionnel)",
 "jqueryFormSelector":"Sélecteur jQuery du formulaire (optionnel)",

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

@@ -344,7 +344,9 @@
 "issuerDBOpenIDConnectActivation":"Attivazione",
 "issuerDBOpenIDConnectPath":"Path",
 "issuerDBOpenIDConnectRule":"Utilizza la regola",
+"issuerOptions":"Options",
 "issuerParams":"Moduli emittenti",
+"issuersTimeout":"Issuers timeout",
 "jsRedirect":"Messaggio di reindirizzamento",
 "jqueryButtonSelector":"Selettore del pulsante jQuery (opzionale)",
 "jqueryFormSelector":"Selettore modulo jQuery (opzionale)",

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

@@ -344,7 +344,9 @@
 "issuerDBOpenIDConnectActivation":"Kích hoạt",
 "issuerDBOpenIDConnectPath":"Đường dẫn",
 "issuerDBOpenIDConnectRule":"Quy tắc sử dụng",
+"issuerOptions":"Options",
 "issuerParams":"Mô-đun của nhà phát hành",
+"issuersTimeout":"Issuers timeout",
 "jsRedirect":"Thông báo chuyển hướng",
 "jqueryButtonSelector":"nút chọn jQuery (tùy chọn)",
 "jqueryFormSelector":"trình đơn chọn jQuery (tùy chọn)",

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

@@ -344,7 +344,9 @@
 "issuerDBOpenIDConnectActivation":"激活",
 "issuerDBOpenIDConnectPath":"Path",
 "issuerDBOpenIDConnectRule":"Use rule",
+"issuerOptions":"Options",
 "issuerParams":"Issuer modules",
+"issuersTimeout":"Issuers timeout",
 "jsRedirect":"Redirection message",
 "jqueryButtonSelector":"jQuery 按钮选择器（可选）",
 "jqueryFormSelector":"jQuery form selector (optional)",

lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Issuer.pm

@@ -35,7 +35,8 @@ has _ott => (
     lazy    => 1,
     default => sub {
         my $ott = $_[0]->{p}->loadModule('::Lib::OneTimeToken');
-        $ott->timeout( $_[0]->{conf}->{formTimeout} );
+        my $timeout = $_[0]->{conf}->{issuersTimeout} // $_[0]->{conf}->{formTimeout};
+        $ott->timeout( $timeout );
         return $ott;
     }
 );