Commit 92b65ae8 authored by Xavier Guimard's avatar Xavier Guimard

Merge branch 'v2.0'

parents 4934eb92 deac8a7f
......@@ -62,6 +62,7 @@ sub defaultValues {
'Lemonldap::NG::Common::Apache::Session::Generate::SHA256',
'LockDirectory' => '/var/lib/lemonldap-ng/sessions/lock/'
},
'gpgDb' => '',
'groups' => {},
'handlerInternalCache' => 15,
'hiddenAttributes' => '_password',
......
......@@ -42,6 +42,7 @@ our $authParameters = {
dbiParams => [qw(dbiAuthnLevel dbiExportedVars dbiAuthChain dbiAuthUser dbiAuthPassword dbiUserChain dbiUserUser dbiUserPassword dbiAuthTable dbiUserTable dbiAuthLoginCol dbiAuthPasswordCol dbiPasswordMailCol userPivot dbiAuthPasswordHash dbiDynamicHashEnabled dbiDynamicHashValidSchemes dbiDynamicHashValidSaltedSchemes dbiDynamicHashNewPasswordScheme)],
demoParams => [qw(demoExportedVars)],
facebookParams => [qw(facebookAuthnLevel facebookExportedVars facebookAppId facebookAppSecret facebookUserField)],
gpgParams => [qw(gpgDb)],
kerberosParams => [qw(krbKeytab krbByJs krbAuthnLevel krbRemoveDomain)],
ldapParams => [qw(ldapAuthnLevel ldapExportedVars ldapServer ldapPort ldapBase managerDn managerPassword ldapTimeout ldapVersion ldapRaw LDAPFilter AuthLDAPFilter mailLDAPFilter ldapSearchDeref ldapGroupBase ldapGroupObjectClass ldapGroupAttributeName ldapGroupAttributeNameUser ldapGroupAttributeNameSearch ldapGroupDecodeSearchedValue ldapGroupRecursive ldapGroupAttributeNameGroup ldapPpolicyControl ldapSetPassword ldapChangePasswordAsUser ldapPwdEnc ldapUsePasswordResetAttribute ldapPasswordResetAttribute ldapPasswordResetAttributeValue ldapAllowResetExpiredPassword)],
linkedinParams => [qw(linkedInAuthnLevel linkedInClientID linkedInClientSecret linkedInFields linkedInUserField linkedInScope)],
......
......@@ -301,8 +301,8 @@ sub attributes {
'v' => 'Facebook'
},
{
'k' => 'Google',
'v' => 'Google'
'k' => 'GPG',
'v' => 'GPG'
},
{
'k' => 'Kerberos',
......@@ -394,10 +394,6 @@ sub attributes {
'k' => 'Facebook',
'v' => 'Facebook'
},
{
'k' => 'Google',
'v' => 'Google'
},
{
'k' => 'LDAP',
'v' => 'LDAP'
......@@ -503,8 +499,8 @@ sub attributes {
'v' => 'Facebook'
},
{
'k' => 'Google',
'v' => 'Google'
'k' => 'GPG',
'v' => 'GPG'
},
{
'k' => 'Kerberos',
......@@ -804,8 +800,8 @@ qr/(?:(?:https?):\/\/(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.]
'v' => 'Facebook'
},
{
'k' => 'Google',
'v' => 'Google'
'k' => 'GPG',
'v' => 'GPG'
},
{
'k' => 'Kerberos',
......@@ -1131,6 +1127,10 @@ qr/^(?:\*\.)?(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][
},
'type' => 'keyTextContainer'
},
'gpgDb' => {
'default' => '',
'type' => 'text'
},
'grantSessionRules' => {
'keyTest' => sub {
my ( $val, $conf ) = @_;
......
......@@ -264,9 +264,8 @@
"generalParameters":"المعاييرالعامة",
"globalStorage":"أباتشي :: وحدة الجلسة",
"globalStorageOptions":"أباتشي :: معايير وحدة الجلسة",
"googleAuthnLevel":"مستوى إثبات الهوية",
"googleExportedVars":"المتغيرات المصدرة",
"googleParams":"معاييرغوغل",
"gpgDb":"GPG database",
"gpgParams":"GPG parameters",
"grantSessionRules":"ظروف الافتتاح",
"groups":"المجموعات",
"hashkey":"المفتاح",
......@@ -400,9 +399,9 @@
"mailOther":"آخر",
"mailReplyTo":"عنوان الجواب",
"mailSessionKey":"مفتاح الجلسة الذي يحتوي على عنوان البريد الإلكتروني",
"mailSubject":"نجاح عنوان البريد",
"mailSubject":"Success mail subject",
"mailTimeout":"عدم تطابق كلمت المرور",
"mailUrl":"Page URL",
"mailUrl":"Reset page URL",
"maintenance":"وضع الصيانة",
"malformedValue":"قيمة سيئة التصميم",
"managerDn":"حساب",
......@@ -644,7 +643,7 @@
"registerDB":"Register module",
"registerDoneSubject":"عنوان البريد الذي تم القيام به",
"registerTimeout":"مدة صلاحية طلب التسجيل",
"registerUrl":"Page URL",
"registerUrl":"Register page URL",
"reloadParams":"Configuration reload",
"reloadTimeout":"Reload timeout",
"reloadUrls":"Reload URLs",
......@@ -964,4 +963,4 @@
"samlCommonDomainCookieWriter":"يو آر إل الكاتب",
"samlRelayStateTimeout":"تناوب حالة مهلة الجلسة ",
"samlUseQueryStringSpecific":"استخدام أسلوب query_string المعين"
}
}
\ No newline at end of file
......@@ -264,9 +264,8 @@
"generalParameters":"General Parameters",
"globalStorage":"Apache::Session module",
"globalStorageOptions":"Apache::Session module parameters",
"googleAuthnLevel":"Authentication level",
"googleExportedVars":"Exported variables",
"googleParams":"Google parameters",
"gpgDb":"GPG database",
"gpgParams":"GPG parameters",
"grantSessionRules":"Opening conditions",
"groups":"Groups",
"hashkey":"Key",
......@@ -402,7 +401,7 @@
"mailSessionKey":"Session key containing mail address",
"mailSubject":"Success mail subject",
"mailTimeout":"Validity time of a password reset request",
"mailUrl":"Page URL",
"mailUrl":"Reset page URL",
"maintenance":"Maintenance mode",
"malformedValue":"Malformed value",
"managerDn":"Account",
......@@ -644,7 +643,7 @@
"registerDB":"Register module",
"registerDoneSubject":"Subject for done mail",
"registerTimeout":"Validity time of a register request",
"registerUrl":"Page URL",
"registerUrl":"Register page URL",
"reloadParams":"Configuration reload",
"reloadTimeout":"Reload timeout",
"reloadUrls":"Reload URLs",
......@@ -964,4 +963,4 @@
"samlCommonDomainCookieWriter":"Writer URL",
"samlRelayStateTimeout":"RelayState session timeout",
"samlUseQueryStringSpecific":"Use specific query_string method"
}
}
\ No newline at end of file
......@@ -264,9 +264,8 @@
"generalParameters":"General Parameters",
"globalStorage":"Apache::Session module",
"globalStorageOptions":"Apache::Session module parameters",
"googleAuthnLevel":"Authentication level",
"googleExportedVars":"Exported variables",
"googleParams":"Google parameters",
"gpgDb":"GPG database",
"gpgParams":"GPG parameters",
"grantSessionRules":"Opening conditions",
"groups":"Groups",
"hashkey":"Key",
......
......@@ -264,9 +264,8 @@
"generalParameters":"Paramètres généraux",
"globalStorage":"Module Apache::Session",
"globalStorageOptions":"Paramètres du module Apache::Session",
"googleAuthnLevel":"Niveau d'authentification",
"googleExportedVars":"Variables exportées",
"googleParams":"Paramètres Google",
"gpgDb":"Base de données GPG",
"gpgParams":"Paramètres GPG",
"grantSessionRules":"Conditions d'ouverture",
"groups":"Groupes",
"hashkey":"Clef",
......
......@@ -264,9 +264,8 @@
"generalParameters":"Parametri generali",
"globalStorage":"Modulo Apache::Session",
"globalStorageOptions":"Parametri di modulo Apache::Session",
"googleAuthnLevel":"Livello di autenticazione",
"googleExportedVars":"Variabili esportate",
"googleParams":"Parametri Google",
"gpgDb":"GPG database",
"gpgParams":"GPG parameters",
"grantSessionRules":"Condizioni di apertura",
"groups":"Gruppi",
"hashkey":"Chiave",
......@@ -380,7 +379,6 @@
"lwpOpts":"Opzioni per le richieste del server",
"lwpSslOpts":"Opzioni SSL per le richieste del server",
"macros":"Macro",
"mailBody":"Successo contenuto di posta",
"mail2f":"Mail second factor",
"mail2fActivation":"Activation",
"mail2fCodeRegex":"Code regex",
......@@ -389,6 +387,7 @@
"mail2fBody":"Mail body",
"mail2fAuthnLevel":"Authentication level",
"mail2fLogo":"Logo",
"mailBody":"Successo contenuto di posta",
"mailCharset":"Charset",
"mailConfirmBody":"Contenuto della mail di conferma",
"mailConfirmSubject":"Soggetto della mail di conferma",
......@@ -641,7 +640,7 @@
"regexps":"Espressioni regolari",
"register":"Registra nuovo account",
"registerConfirmSubject":"Oggetto per la mail di conferma",
"registerDB":"Modulo di autoregidi registrazionestrazione",
"registerDB":"Modulo di autoregistrazione",
"registerDoneSubject":"Oggetto per la mail inviata",
"registerTimeout":"Tempo di validità di una richiesta di registrazione",
"registerUrl":"URL della pagina di registrazione",
......@@ -964,4 +963,4 @@
"samlCommonDomainCookieWriter":"URL dell'autore",
"samlRelayStateTimeout":"Timeout di sessione di RelayState",
"samlUseQueryStringSpecific":"Utilizza il metodo specifico query_string"
}
}
\ No newline at end of file
......@@ -264,9 +264,8 @@
"generalParameters":"Thông số chung",
"globalStorage":"Mô đun Apache :: Session",
"globalStorageOptions":"Tham số mô đun Apache :: Session ",
"googleAuthnLevel":"Mức xác thực",
"googleExportedVars":"Xuất khẩu biến",
"googleParams":"Tham số của Google",
"gpgDb":"GPG database",
"gpgParams":"GPG parameters",
"grantSessionRules":"Điều kiện mở",
"groups":"Nhóm",
"hashkey":"Khóa",
......@@ -380,7 +379,6 @@
"lwpOpts":"Tùy chọn cho yêu cầu máy chủ",
"lwpSslOpts":"Tùy chọn SSL cho yêu cầu máy chủ",
"macros":"Macros",
"mailBody":"Nội dung thư thành công",
"mail2f":"Mail second factor",
"mail2fActivation":"Activation",
"mail2fCodeRegex":"Code regex",
......@@ -389,6 +387,7 @@
"mail2fBody":"Mail body",
"mail2fAuthnLevel":"Authentication level",
"mail2fLogo":"Logo",
"mailBody":"Success mail content",
"mailCharset":"Charset",
"mailConfirmBody":"Xác nhận nội dung thư",
"mailConfirmSubject":"Xác nhận chủ đề thư",
......@@ -964,4 +963,4 @@
"samlCommonDomainCookieWriter":"Trình viết URL",
"samlRelayStateTimeout":"Thời gian hết hạn phiên RelayState ",
"samlUseQueryStringSpecific":"Sử dụng phương pháp query_string cụ thể"
}
}
\ No newline at end of file
......@@ -38,7 +38,7 @@
"addU2FKey":"Add U2F key",
"addTOTPKey":"Add TOTP key",
"addVhost":"增加virtualhost",
"adParams":"Active Directory参数",
"adParams":"Active Directory parameters",
"ADPwdExpireWarning":"密码过期警告",
"ADPwdMaxAge":"密码最长有效期",
"advancedParams":"高级参数",
......@@ -264,9 +264,8 @@
"generalParameters":"通用参数",
"globalStorage":"Apache::Session 模块",
"globalStorageOptions":"Apache::Session module parameters",
"googleAuthnLevel":"认证等级",
"googleExportedVars":"导出的参数",
"googleParams":"Google 参数",
"gpgDb":"GPG database",
"gpgParams":"GPG parameters",
"grantSessionRules":"Opening conditions",
"groups":"Groups",
"hashkey":"Key",
......@@ -964,4 +963,4 @@
"samlCommonDomainCookieWriter":"Writer URL",
"samlRelayStateTimeout":"RelayState session timeout",
"samlUseQueryStringSpecific":"Use specific query_string method"
}
}
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -241,4 +241,4 @@
"yourPhone":"رقم هاتفك",
"yourProfile":"ملفك الشخصي",
"yourTotpKey":"Your TOTP key"
}
}
\ No newline at end of file
......@@ -241,4 +241,4 @@
"yourPhone":"Ihre Telefonnummer",
"yourProfile":"Ihr Profil",
"yourTotpKey":"Your TOTP key"
}
}
\ No newline at end of file
......@@ -241,4 +241,4 @@
"yourPhone":"Your phone number",
"yourProfile":"Your profile",
"yourTotpKey":"Your TOTP key"
}
}
\ No newline at end of file
......@@ -241,4 +241,4 @@
"yourPhone":"Numero di telefono",
"yourProfile":"Il tuo profilo",
"yourTotpKey":"La tua chiave TOTP"
}
}
\ No newline at end of file
......@@ -241,4 +241,4 @@
"yourPhone":"Your phone number",
"yourProfile":"Your profile",
"yourTotpKey":"Your TOTP key"
}
}
\ No newline at end of file
......@@ -241,4 +241,4 @@
"yourPhone":"Your phone number",
"yourProfile":"Your profile",
"yourTotpKey":"Your TOTP key"
}
}
\ No newline at end of file
......@@ -241,4 +241,4 @@
"yourPhone":"Your phone number",
"yourProfile":"Your profile",
"yourTotpKey":"Your TOTP key"
}
}
\ No newline at end of file
......@@ -241,4 +241,4 @@
"yourPhone":"Số điện thoại của bạn",
"yourProfile":"Profile của bạn",
"yourTotpKey":"Your TOTP key"
}
}
\ No newline at end of file
......@@ -241,4 +241,4 @@
"yourPhone":"您的电话号码",
"yourProfile":"您的档案",
"yourTotpKey":"Your TOTP key"
}
}
\ No newline at end of file
......@@ -62,6 +62,10 @@
<TMPL_INCLUDE NAME="sslformChoice.tpl">
</TMPL_IF>
<TMPL_IF NAME="gpgform">
<TMPL_INCLUDE NAME="gpgform.tpl">
</TMPL_IF>
<TMPL_IF NAME="logo">
<div class="form">
......
......@@ -15,4 +15,4 @@
"requestIssuedFromIP":"الطلب قد أرسل من عنوان الآي بي",
"yourLoginCodeIs":"Your login code is",
"yourLoginIs":"تسجيل الدخول الخاص بك هو"
}
}
\ No newline at end of file
......@@ -15,4 +15,4 @@
"requestIssuedFromIP":"La richiesta è stata emessa da IP",
"yourLoginCodeIs":"Your login code is",
"yourLoginIs":"Il tuo login é"
}
}
\ No newline at end of file
......@@ -15,4 +15,4 @@
"requestIssuedFromIP":"Yêu cầu được gửi đi từ địa chỉ IP",
"yourLoginCodeIs":"Your login code is",
"yourLoginIs":"Đăng nhập của bạn là"
}
}
\ No newline at end of file
......@@ -15,4 +15,4 @@
"requestIssuedFromIP":"此请求来自IP地址",
"yourLoginCodeIs":"Your login code is",
"yourLoginIs":"您登陆的账户是"
}
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment