dani
/
lemonldap-ng
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'v2.0'

This commit is contained in:
Xavier 2019-12-13 18:14:47 +01:00
parent 74d2bc92c8 21e5039d21
commit f62a366812
25 changed files with 369 additions and 331 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
e2e-tests/lemonldap-ng-ldap.ini
View File

@ -16,7 +16,7 @@ ldapBindPassword = admin
checkXSS = 0
portalSkin = bootstrap
staticPrefix = /static
languages = fr, en, vi, it, ar
languages = fr, en, vi, it, ar, tr
templateDir = __pwd__/lemonldap-ng-portal/site/templates
portalStatus = 1
;totp2fActivation = 1
@ -33,7 +33,7 @@ useRedirectOnError = 0
enabledModules = conf, sessions, notifications, 2ndFA
protection = manager
staticPrefix = /static
languages = fr, en, vi, ar
languages = fr, en, vi, ar, tr
templateDir = __pwd__/lemonldap-ng-manager/site/templates
[node-handler]

4
e2e-tests/lemonldap-ng-sql.ini
View File

@ -13,7 +13,7 @@ dbiChain = dbi:SQLite:dbname=__pwd__/e2e-tests/conf/config.db
checkXSS = 0
portalSkin = bootstrap
staticPrefix = /static
languages = fr, en, vi, it, ar
languages = fr, en, vi, it, ar, tr
templateDir = __pwd__/lemonldap-ng-portal/site/templates
portalStatus = 1
;totp2fActivation = 1
@ -30,7 +30,7 @@ useRedirectOnError = 0
enabledModules = conf, sessions, notifications, 2ndFA
protection = manager
staticPrefix = /static
languages = fr, en, vi, ar
languages = fr, en, vi, ar, tr
templateDir = __pwd__/lemonldap-ng-manager/site/templates
[node-handler]

4
e2e-tests/lemonldap-ng.ini
View File

@ -21,7 +21,7 @@ dirName=__pwd__/e2e-tests/conf
checkXSS = 0
portalSkin = bootstrap
staticPrefix = /static
languages = fr, en, vi, it, ar, de, zh, nl, es, pt, ro
languages = fr, en, vi, it, ar, de, zh, nl, es, pt, ro, tr
templateDir = __pwd__/lemonldap-ng-portal/site/templates
portalStatus = 1
totp2fActivation = 1
@ -46,7 +46,7 @@ viewerAllowBrowser = 1
viewerAllowDiff = 1
staticPrefix = /static
languages = fr, en, vi, ar, de, it, zh
languages = fr, en, vi, ar, de, it, zh, tr
templateDir = __pwd__/lemonldap-ng-manager/site/templates
[node-handler]

22
fastcgi-server/man/llng-fastcgi-server.8p
View File

@ -1,4 +1,4 @@
.\" Automatically generated by Pod::Man 4.09 (Pod::Simple 3.35)
.\" Automatically generated by Pod::Man 4.11 (Pod::Simple 3.35)
.\"
.\" Standard preamble:
.\" ========================================================================
@ -54,16 +54,20 @@
.\" Avoid warning from groff about undefined register 'F'.
.de IX
..
.if !\nF .nr F 0
.if \nF>0 \{\
. de IX
. tm Index:\\$1\t\\n%\t"\\$2"
.nr rF 0
.if \n(.g .if rF .nr rF 1
.if (\n(rF:(\n(.g==0)) \{\
. if \nF \{\
. de IX
. tm Index:\\$1\t\\n%\t"\\$2"
..
. if !\nF==2 \{\
. nr % 0
. nr F 2
. if !\nF==2 \{\
. nr % 0
. nr F 2
. \}
. \}
.\}
.rr rF
.\"
.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
.\" Fear. Run. Save yourself. No user-serviceable parts.
@ -129,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "llng-fastcgi-server 8"
.TH llng-fastcgi-server 8 "2019-11-08" "perl v5.26.1" "User Contributed Perl Documentation"
.TH llng-fastcgi-server 8 "2019-12-13" "perl v5.30.0" "User Contributed Perl Documentation"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l

4
lemonldap-ng-common/lemonldap-ng.ini
View File

@ -187,7 +187,7 @@ staticPrefix = __PORTALSTATICDIR__
templateDir = __PORTALTEMPLATESDIR__
; languages: available languages for portal interface
languages = en, fr, vi, it, ar, de, fi
languages = en, fr, vi, it, ar, de, fi, tr
; II - Optional parameters (overwrite configuration)
@ -372,7 +372,7 @@ staticPrefix = __MANAGERSTATICDIR__
templateDir = __MANAGERTEMPLATESDIR__
; languages: available languages for manager interface
languages = fr, en, it, vi, ar
languages = fr, en, it, vi, ar, tr
; Manager modules enabled
; Set here the list of modules you want to see in manager interface

1
lemonldap-ng-manager/MANIFEST
View File

@ -196,6 +196,7 @@ site/htdocs/static/logos/fr.png
site/htdocs/static/logos/it.png
site/htdocs/static/logos/llng-icon-32.png
site/htdocs/static/logos/llng-logo-32.png
site/htdocs/static/logos/tr.png
site/htdocs/static/logos/vi.png
site/htdocs/static/logos/zh.png
site/htdocs/static/reverseTree.json

13
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Tests.pm
View File

@ -627,6 +627,19 @@ sub tests {
return 1;
},
# Warn if ldapPpolicyControl is used with AD (#2007)
ppolicyAd => sub {
if ( $conf->{ldapPpolicyControl}
and $conf->{authentication} eq "AD" )
{
return ( 1,
"LDAP password policy control should be disabled when using AD authentication"
);
}
return 1;
},
# Warn if bruteForceProtection enabled without History
bruteForceProtection => sub {
return 1 unless ( $conf->{bruteForceProtection} );

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

File diff suppressed because it is too large Load Diff

1
lemonldap-ng-portal/MANIFEST
View File

@ -361,6 +361,7 @@ site/htdocs/static/common/modules/WebID.png
site/htdocs/static/common/nl.png
site/htdocs/static/common/pt.png
site/htdocs/static/common/ro.png
site/htdocs/static/common/tr.png
site/htdocs/static/common/vi.png
site/htdocs/static/common/zh.png
site/htdocs/static/languages/ar.json

21
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/Combination.pm
View File

@ -152,16 +152,17 @@ sub authForce {
return 0;
}
#sub setSecurity {
# my $self = shift;
# my ($req) = @_;
# $self->getStack( $req, 'extractFormInfo' ) or return PE_ERROR;
# $req->userData->{_combinationTry} ||= 0;
# eval {
# $req->data->{combinationStack}->[ $req->userData->{_combinationTry} ]
# ->[0]->( 'setSecurity', @_ );
# };
#}
sub setSecurity {
my $self = shift;
my ($req) = @_;
$self->getStack( $req, 'extractFormInfo' ) or return;
eval {
$req->data->{combinationStack}
->[ $req->data->{dataKeep}->{combinationTry} ]->[0]
->( 'setSecurity', @_ );
};
$self->logger->debug($@) if ($@);
}
## UserDB steps
###############

1
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Display.pm
View File

@ -268,6 +268,7 @@ sub display {
or ( $self->conf->{authentication} eq 'Combination'
and $req->{error} > PE_OK
and $req->{error} != PE_FIRSTACCESS
and $req->{error} != PE_BADCREDENTIALS
and $req->{error} != PE_PP_PASSWORD_EXPIRED )
# and ( $req->{error} == PE_TOKENEXPIRED or $req->{error} == PE_NOTOKEN )

10
lemonldap-ng-portal/site/htdocs/static/languages/tr.json
View File

@ -280,11 +280,11 @@
"warning":"Uyarı",
"welcomeOnPortal":"Güvenli kimlik doğrulama portalına hoş geldiniz.",
"yesResendMail":"Evet, tekrar e-posta gönder",
"yourAddress":"Know your address",
"yourAddress":"Adresini bil",
"yourApps":"Uygulamalarınız",
"yourEmail":"Know your email",
"yourEmail":"E-postanı bil",
"yourFavApps":"Favorite applications",
"yourIdentity":"Know your identity",
"yourIdentity":"Kimliğini bil",
"yourIdentityIs":"Kimliğiniz",
"yourKeyIsRegistered":"Anahtarınız kaydedildi",
"yourKeyIsAlreadyRegistered":"Anahtarınız zaten kaydedilmiş!",
@ -292,8 +292,8 @@
"yourKeyIsVerified":"Anahtarınız doğrulandı",
"yourNewTotpKey":"Yeni TOTP anahtarınız, lütfen test edin ve kodu girin",
"yourOffline":"Çevrimdışıyken hesabına eriş",
"yourPhone":"Know your phone number",
"yourProfile":"Know your profile",
"yourPhone":"Telefon numaranı bil",
"yourProfile":"Profilini bil",
"yourTotpKey":"TOTP anahtarınız",
"yubikey2f":"Yubikey"
}

2
lemonldap-ng-portal/site/templates/bootstrap/ext2fcheck.tpl
View File

@ -15,7 +15,7 @@
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lock"></i> </span>
</div>
<input name="code" value="" class="form-control" id="extcode" trplaceholder="code" autocomplete="off" />
<input name="code" value="" type="text" class="form-control" id="extcode" trplaceholder="code" autocomplete="off" />
</div>
</div>
<div class="buttons">

2
lemonldap-ng-portal/site/templates/bootstrap/totp2fcheck.tpl
View File

@ -15,7 +15,7 @@
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lock"></i> </span>
</div>
<input name="code" value="" class="form-control" id="extcode" trplaceholder="code" autocomplete="off" />
<input name="code" value="" type="text" class="form-control" id="extcode" trplaceholder="code" autocomplete="off" />
</div>
</div>
<div class="buttons mb-3">

2
lemonldap-ng-portal/site/templates/bootstrap/utotp2fcheck.tpl
View File

@ -49,7 +49,7 @@
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-lock"></i></span>
</div>
<input name="code" value="" class="form-control" id="extcode" trplaceholder="code" autocomplete="off" />
<input name="code" value="" type="text" class="form-control" id="extcode" trplaceholder="code" autocomplete="off" />
</div>
</div>
<div class="buttons mb-3">

2
lemonldap-ng-portal/t/30-SAML-POST-with-2F-and-Notification.t
View File

@ -100,7 +100,7 @@ SKIP: {
ok(
$res->[2]->[0] =~
qr%<input name="code" value="" class="form-control" id="extcode" trplaceholder="code" autocomplete="off" />%,
qr%<input name="code" value="" type="text" class="form-control" id="extcode" trplaceholder="code" autocomplete="off" />%,
'Found EXTCODE input'
) or print STDERR Dumper( $res->[2]->[0] );

2
lemonldap-ng-portal/t/57-GlobalLogout.t
View File

@ -201,7 +201,7 @@ ok(
);
expectRedirection( $res, 'http://auth.example.com/' );
my $nbr = count_sessions();
$nbr = count_sessions();
ok( $nbr == 3, "Three sessions found" )
or explain("Number of session(s) found = $nbr");
count(4);

4
lemonldap-ng-portal/t/76-2F-Ext-with-BruteForce.t
View File

@ -97,7 +97,7 @@ my ( $host, $url, $query ) =
ok(
$res->[2]->[0] =~
qr%<input name="code" value="" class="form-control" id="extcode" trplaceholder="code" autocomplete="off" />%,
qr%<input name="code" value="" type="text" class="form-control" id="extcode" trplaceholder="code" autocomplete="off" />%,
'Found EXTCODE input'
) or print STDERR Dumper( $res->[2]->[0] );
count(1);
@ -138,7 +138,7 @@ count(1);
ok(
$res->[2]->[0] =~
qr%<input name="code" value="" class="form-control" id="extcode" trplaceholder="code" autocomplete="off" />%,
qr%<input name="code" value="" type="text" class="form-control" id="extcode" trplaceholder="code" autocomplete="off" />%,
'Found EXTCODE input'
) or print STDERR Dumper( $res->[2]->[0] );
count(1);

2
lemonldap-ng-portal/t/76-2F-Ext-with-CodeActivation.t
View File

@ -40,7 +40,7 @@ my ( $host, $url, $query ) =
ok(
$res->[2]->[0] =~
qr%<input name="code" value="" class="form-control" id="extcode" trplaceholder="code" autocomplete="off" />%,
qr%<input name="code" value="" type="text" class="form-control" id="extcode" trplaceholder="code" autocomplete="off" />%,
'Found EXTCODE input'
) or print STDERR Dumper( $res->[2]->[0] );
count(1);

2
lemonldap-ng-portal/t/76-2F-Ext-with-GrantSession.t
View File

@ -42,7 +42,7 @@ my ( $host, $url, $query ) =
ok(
$res->[2]->[0] =~
qr%<input name="code" value="" class="form-control" id="extcode" trplaceholder="code" autocomplete="off" />%,
qr%<input name="code" value="" type="text" class="form-control" id="extcode" trplaceholder="code" autocomplete="off" />%,
'Found EXTCODE input'
) or print STDERR Dumper( $res->[2]->[0] );
count(1);

2
lemonldap-ng-portal/t/76-2F-Ext-with-History.t
View File

@ -81,7 +81,7 @@ ok(
ok(
$res->[2]->[0] =~
qr%<input name="code" value="" class="form-control" id="extcode" trplaceholder="code" autocomplete="off" />%,
qr%<input name="code" value="" type="text" class="form-control" id="extcode" trplaceholder="code" autocomplete="off" />%,
'Found EXTCODE input'
) or print STDERR Dumper( $res->[2]->[0] );

4
lemonldap-ng-portal/t/77-2F-Extra.t
View File

@ -56,7 +56,7 @@ my ( $host, $url, $query ) =
ok(
$res->[2]->[0] =~
qr%<input name="code" value="" class="form-control" id="extcode" trplaceholder="code" autocomplete="off" />%,
qr%<input name="code" value="" type="text" class="form-control" id="extcode" trplaceholder="code" autocomplete="off" />%,
'Found EXTCODE input'
) or print STDERR Dumper( $res->[2]->[0] );
count(1);
@ -141,7 +141,7 @@ my ( $host, $url, $query ) =
ok(
$res->[2]->[0] =~
qr%<input name="code" value="" class="form-control" id="extcode" trplaceholder="code" autocomplete="off" />%,
qr%<input name="code" value="" type="text" class="form-control" id="extcode" trplaceholder="code" autocomplete="off" />%,
'Found EXTCODE input'
) or print STDERR Dumper( $res->[2]->[0] );
count(1);

2
lemonldap-ng-portal/t/77-2F-Mail-with-global-storage.t
View File

@ -39,7 +39,7 @@ my ( $host, $url, $query ) =
ok(
$res->[2]->[0] =~
qr%<input name="code" value="" class="form-control" id="extcode" trplaceholder="code" autocomplete="off" />%,
qr%<input name="code" value="" type="text" class="form-control" id="extcode" trplaceholder="code" autocomplete="off" />%,
'Found EXTCODE input'
) or print STDERR Dumper( $res->[2]->[0] );
count(1);

2
lemonldap-ng-portal/t/77-2F-Mail.t
View File

@ -38,7 +38,7 @@ my ( $host, $url, $query ) =
ok(
$res->[2]->[0] =~
qr%<input name="code" value="" class="form-control" id="extcode" trplaceholder="code" autocomplete="off" />%,
qr%<input name="code" value="" type="text" class="form-control" id="extcode" trplaceholder="code" autocomplete="off" />%,
'Found EXTCODE input'
) or print STDERR Dumper( $res->[2]->[0] );
count(1);

2
lemonldap-ng-portal/t/78-2F-Upgrade.t
View File

@ -114,7 +114,7 @@ $pdata = expectCookie( $res, 'lemonldappdata' );
ok(
$res->[2]->[0] =~
qr%<input name="code" value="" class="form-control" id="extcode" trplaceholder="code" autocomplete="off" />%,
qr%<input name="code" value="" type="text" class="form-control" id="extcode" trplaceholder="code" autocomplete="off" />%,
'Found EXTCODE input'
) or print STDERR Dumper( $res->[2]->[0] );
count(1);