Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Maxime Besson
lemonldap-ng
Commits
8cd579f1
Commit
8cd579f1
authored
Mar 11, 2019
by
Clément OUDOT
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add a waiting message for Kerberos/SSL workflow (#1670)
parent
145db1cf
Changes
15
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
35 additions
and
13 deletions
+35
-13
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/Kerberos.pm
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/Kerberos.pm
+1
-0
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/SSL.pm
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/SSL.pm
+1
-0
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Display.pm
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Display.pm
+5
-1
lemonldap-ng-portal/site/htdocs/static/languages/ar.json
lemonldap-ng-portal/site/htdocs/static/languages/ar.json
+2
-1
lemonldap-ng-portal/site/htdocs/static/languages/de.json
lemonldap-ng-portal/site/htdocs/static/languages/de.json
+2
-1
lemonldap-ng-portal/site/htdocs/static/languages/en.json
lemonldap-ng-portal/site/htdocs/static/languages/en.json
+1
-0
lemonldap-ng-portal/site/htdocs/static/languages/es.json
lemonldap-ng-portal/site/htdocs/static/languages/es.json
+2
-1
lemonldap-ng-portal/site/htdocs/static/languages/fr.json
lemonldap-ng-portal/site/htdocs/static/languages/fr.json
+1
-0
lemonldap-ng-portal/site/htdocs/static/languages/it.json
lemonldap-ng-portal/site/htdocs/static/languages/it.json
+2
-1
lemonldap-ng-portal/site/htdocs/static/languages/nl.json
lemonldap-ng-portal/site/htdocs/static/languages/nl.json
+2
-1
lemonldap-ng-portal/site/htdocs/static/languages/pt.json
lemonldap-ng-portal/site/htdocs/static/languages/pt.json
+2
-1
lemonldap-ng-portal/site/htdocs/static/languages/ro.json
lemonldap-ng-portal/site/htdocs/static/languages/ro.json
+2
-1
lemonldap-ng-portal/site/htdocs/static/languages/vi.json
lemonldap-ng-portal/site/htdocs/static/languages/vi.json
+2
-1
lemonldap-ng-portal/site/htdocs/static/languages/zh.json
lemonldap-ng-portal/site/htdocs/static/languages/zh.json
+2
-1
lemonldap-ng-portal/site/templates/bootstrap/standardform.tpl
...nldap-ng-portal/site/templates/bootstrap/standardform.tpl
+8
-3
No files found.
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/Kerberos.pm
View file @
8cd579f1
...
...
@@ -114,6 +114,7 @@ sub extractFormInfo {
#$self->p->setHiddenFormValue( $req, kerberos => 0, '', 0 );
eval
(
$self
->
InitCmd
);
die
'
Unable to launch init commmand
'
.
$self
->
{
InitCmd
}
if
(
$@
);
$req
->
data
->
{
waitingMessage
}
=
1
;
return
PE_FIRSTACCESS
;
}
}
...
...
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/SSL.pm
View file @
8cd579f1
...
...
@@ -51,6 +51,7 @@ sub extractFormInfo {
$req
->
data
->
{
customScript
}
.=
$self
->
{
AjaxInitScript
};
$self
->
logger
->
debug
(
"
Send init/script ->
"
.
$req
->
data
->
{
customScript
}
);
$req
->
data
->
{
waitingMessage
}
=
1
;
return
PE_FIRSTACCESS
;
}
else
{
...
...
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Display.pm
View file @
8cd579f1
...
...
@@ -113,7 +113,7 @@ sub display {
&&
$req
->
data
->
{
login
},
ASK_LOGINS
=>
$req
->
param
('
checkLogins
')
||
0
,
CONFIRMKEY
=>
$self
->
stamp
(),
LIST
=>
$req
->
data
->
{
list
}
||
[]
,
LIST
=>
$req
->
data
->
{
list
}
||
[]
,
REMEMBER
=>
$req
->
data
->
{
confirmRemember
},
(
$req
->
data
->
{
customScript
}
...
...
@@ -420,6 +420,10 @@ sub display {
}
if
(
$req
->
data
->
{
waitingMessage
}
)
{
$templateParams
{
WAITING_MESSAGE
}
=
1
;
}
$self
->
logger
->
debug
("
Skin returned:
$skinfile
");
return
(
$skinfile
,
\
%templateParams
);
}
...
...
lemonldap-ng-portal/site/htdocs/static/languages/ar.json
View file @
8cd579f1
...
...
@@ -242,6 +242,7 @@
"verify"
:
"التحقق"
,
"VHnotFound"
:
"Virtual Host not found"
,
"wait"
:
"انتظر"
,
"waitingmessage"
:
"Authentication in progress, please wait"
,
"warning"
:
"تحذير"
,
"welcomeOnPortal"
:
"مرحبا بك على بوابة إثبات الهوية الآمنة."
,
"yesResendMail"
:
"نعم، أعد إرسال البريد"
,
...
...
@@ -258,4 +259,4 @@
"yourPhone"
:
"رقم هاتفك"
,
"yourProfile"
:
"ملفك الشخصي"
,
"yourTotpKey"
:
"Your TOTP key"
}
\ No newline at end of file
}
lemonldap-ng-portal/site/htdocs/static/languages/de.json
View file @
8cd579f1
...
...
@@ -242,6 +242,7 @@
"verify"
:
"Verify"
,
"VHnotFound"
:
"Virtual Host not found"
,
"wait"
:
"Warten"
,
"waitingmessage"
:
"Authentication in progress, please wait"
,
"warning"
:
"Warnung"
,
"welcomeOnPortal"
:
"Willkommen in Ihrem gesicherten Authentifizierungsportal."
,
"yesResendMail"
:
"Ja, Mail erneut senden."
,
...
...
@@ -258,4 +259,4 @@
"yourPhone"
:
"Ihre Telefonnummer"
,
"yourProfile"
:
"Ihr Profil"
,
"yourTotpKey"
:
"Your TOTP key"
}
\ No newline at end of file
}
lemonldap-ng-portal/site/htdocs/static/languages/en.json
View file @
8cd579f1
...
...
@@ -242,6 +242,7 @@
"verify"
:
"Verify"
,
"VHnotFound"
:
"Virtual Host not found"
,
"wait"
:
"Wait"
,
"waitingmessage"
:
"Authentication in progress, please wait"
,
"warning"
:
"Warning"
,
"welcomeOnPortal"
:
"Welcome on your secured authentication portal."
,
"yesResendMail"
:
"Yes, resend the mail"
,
...
...
lemonldap-ng-portal/site/htdocs/static/languages/es.json
View file @
8cd579f1
...
...
@@ -242,6 +242,7 @@
"verify"
:
"Verify"
,
"VHnotFound"
:
"Virtual Host not found"
,
"wait"
:
"Wait"
,
"waitingmessage"
:
"Authentication in progress, please wait"
,
"warning"
:
"Warning"
,
"welcomeOnPortal"
:
"Welcome on your secured authentication portal."
,
"yesResendMail"
:
"Yes, resend the mail"
,
...
...
@@ -258,4 +259,4 @@
"yourPhone"
:
"Your phone number"
,
"yourProfile"
:
"Your profile"
,
"yourTotpKey"
:
"Your TOTP key"
}
\ No newline at end of file
}
lemonldap-ng-portal/site/htdocs/static/languages/fr.json
View file @
8cd579f1
...
...
@@ -242,6 +242,7 @@
"verify"
:
"Vérifier"
,
"VHnotFound"
:
"Hôte virtuel erroné ou inexistant"
,
"wait"
:
"Attendre"
,
"waitingmessage"
:
"Authentification en cours, merci de patienter"
,
"warning"
:
"Attention"
,
"welcomeOnPortal"
:
"Bienvenue sur votre portail d'authentification sécurisée."
,
"yesResendMail"
:
"Oui, renvoyer le mail"
,
...
...
lemonldap-ng-portal/site/htdocs/static/languages/it.json
View file @
8cd579f1
...
...
@@ -242,6 +242,7 @@
"verify"
:
"Verifica"
,
"VHnotFound"
:
"Virtual Host not found"
,
"wait"
:
"Attendere"
,
"waitingmessage"
:
"Authentication in progress, please wait"
,
"warning"
:
"Avvertimento"
,
"welcomeOnPortal"
:
"Benvenuto sul tuo portale di autenticazione protetta."
,
"yesResendMail"
:
"Sì, rinvia e-mail"
,
...
...
@@ -258,4 +259,4 @@
"yourPhone"
:
"Numero di telefono"
,
"yourProfile"
:
"Il tuo profilo"
,
"yourTotpKey"
:
"La tua chiave TOTP"
}
\ No newline at end of file
}
lemonldap-ng-portal/site/htdocs/static/languages/nl.json
View file @
8cd579f1
...
...
@@ -242,6 +242,7 @@
"verify"
:
"Verify"
,
"VHnotFound"
:
"Virtual Host not found"
,
"wait"
:
"Wait"
,
"waitingmessage"
:
"Authentication in progress, please wait"
,
"warning"
:
"Warning"
,
"welcomeOnPortal"
:
"Welcome on your secured authentication portal."
,
"yesResendMail"
:
"Yes, resend the mail"
,
...
...
@@ -258,4 +259,4 @@
"yourPhone"
:
"Your phone number"
,
"yourProfile"
:
"Your profile"
,
"yourTotpKey"
:
"Your TOTP key"
}
\ No newline at end of file
}
lemonldap-ng-portal/site/htdocs/static/languages/pt.json
View file @
8cd579f1
...
...
@@ -242,6 +242,7 @@
"verify"
:
"Verify"
,
"VHnotFound"
:
"Virtual Host not found"
,
"wait"
:
"Wait"
,
"waitingmessage"
:
"Authentication in progress, please wait"
,
"warning"
:
"Warning"
,
"welcomeOnPortal"
:
"Welcome on your secured authentication portal."
,
"yesResendMail"
:
"Yes, resend the mail"
,
...
...
@@ -258,4 +259,4 @@
"yourPhone"
:
"Your phone number"
,
"yourProfile"
:
"Your profile"
,
"yourTotpKey"
:
"Your TOTP key"
}
\ No newline at end of file
}
lemonldap-ng-portal/site/htdocs/static/languages/ro.json
View file @
8cd579f1
...
...
@@ -242,6 +242,7 @@
"verify"
:
"Verify"
,
"VHnotFound"
:
"Virtual Host not found"
,
"wait"
:
"Wait"
,
"waitingmessage"
:
"Authentication in progress, please wait"
,
"warning"
:
"Warning"
,
"welcomeOnPortal"
:
"Welcome on your secured authentication portal."
,
"yesResendMail"
:
"Yes, resend the mail"
,
...
...
@@ -258,4 +259,4 @@
"yourPhone"
:
"Your phone number"
,
"yourProfile"
:
"Your profile"
,
"yourTotpKey"
:
"Your TOTP key"
}
\ No newline at end of file
}
lemonldap-ng-portal/site/htdocs/static/languages/vi.json
View file @
8cd579f1
...
...
@@ -242,6 +242,7 @@
"verify"
:
"Xác minh"
,
"VHnotFound"
:
"Virtual Host not found"
,
"wait"
:
"Hãy đợi"
,
"waitingmessage"
:
"Authentication in progress, please wait"
,
"warning"
:
"Cảnh báo"
,
"welcomeOnPortal"
:
"Chào mừng bạn đến với cổng thông tin xác thực được bảo mật của bạn."
,
"yesResendMail"
:
"Có, gửi lại thư"
,
...
...
@@ -258,4 +259,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
}
lemonldap-ng-portal/site/htdocs/static/languages/zh.json
View file @
8cd579f1
...
...
@@ -242,6 +242,7 @@
"verify"
:
"验证"
,
"VHnotFound"
:
"Virtual Host not found"
,
"wait"
:
"等待"
,
"waitingmessage"
:
"Authentication in progress, please wait"
,
"warning"
:
"警告"
,
"welcomeOnPortal"
:
"欢迎来到您的加密认证 portal"
,
"yesResendMail"
:
"好的,重新发送邮件"
,
...
...
@@ -258,4 +259,4 @@
"yourPhone"
:
"您的电话号码"
,
"yourProfile"
:
"您的档案"
,
"yourTotpKey"
:
"Your TOTP key"
}
\ No newline at end of file
}
lemonldap-ng-portal/site/templates/bootstrap/standardform.tpl
View file @
8cd579f1
<TMPL_IF
NAME=
"TOKEN"
>
<input
type=
"hidden"
name=
"token"
value=
"<TMPL_VAR NAME="
TOKEN
"
>
" />
</TMPL_IF>
<TMPL_IF
NAME=
"WAITING_MESSAGE"
>
<div
class=
"alert alert-info"
><span
trspan=
"waitingmessage"
/></div>
<TMPL_ELSE>
<div
class=
"form"
>
<div
class=
"input-group mb-3"
>
<div
class=
"input-group-prepend"
>
...
...
@@ -24,9 +31,6 @@
<input
type=
"text"
name=
"captcha"
size=
"<TMPL_VAR NAME=CAPTCHA_SIZE>"
class=
"form-control"
trplaceholder=
"captcha"
required
aria-required=
"true"
autocomplete=
"off"
/>
</div>
</TMPL_IF>
<TMPL_IF
NAME=
"TOKEN"
>
<input
type=
"hidden"
name=
"token"
value=
"<TMPL_VAR NAME="
TOKEN
"
>
" />
</TMPL_IF>
<TMPL_INCLUDE
NAME=
"impersonation.tpl"
>
<TMPL_INCLUDE
NAME=
"checklogins.tpl"
>
...
...
@@ -36,6 +40,7 @@
<span
trspan=
"connect"
>
Connect
</span>
</button>
</div>
</TMPL_IF>
<div
class=
"actions"
>
<TMPL_IF
NAME=
"DISPLAY_RESETPASSWORD"
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment