Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Nicolas R
lemonldap-ng
Commits
4e130f32
Commit
4e130f32
authored
Sep 04, 2020
by
Yadd
Browse files
Merge branch 'v2.0' into master
parents
937bdd4e
b9e9ff1f
Changes
6
Hide whitespace changes
Inline
Side-by-side
doc/sources/admin/rules_examples.rst
View file @
4e130f32
...
...
@@ -33,6 +33,10 @@ attribute you see there can be used in a rule!
$groups =~ /\b(?:admins|su)\b/ # admins OR su
$groups =~ /\badmin_[1-3a]\b/ # admin_1 OR admin_2 OR admin_3 OR admin_a
defined $hGroups->{'administrators'}
# 2.0.8 and higher only
inGroup('administrators')
- Combining multiple expressions
...
...
doc/sources/admin/sfextra.rst
View file @
4e130f32
...
...
@@ -38,7 +38,7 @@ You can find the configuration for this feature in
- ``$homeMail`` : this second factor will only trigger if the
``$homeMail`` session key exists
- ``defined $hGroups{'admin'}`` : this second factor will only
- ``defined $hGroups
->
{'admin'}`` : this second factor will only
trigger if the user is in the ``admin`` group
After adding your second factors, don't forget to add overload
...
...
lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf.pm
View file @
4e130f32
...
...
@@ -480,7 +480,7 @@ sub delete {
my
(
$self
,
$c
)
=
@_
;
my
@a
=
$self
->
available
();
if
(
grep
(
/^$c$/
,
@a
)
)
{
return
$self
->
_launch
(
'
delete
',
$self
,
$c
);
return
$self
->
_launch
(
'
delete
',
$c
);
}
else
{
return
0
;
...
...
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Api/Misc.pm
View file @
4e130f32
# Miscenalleous endpoints
package
Lemonldap::NG::Manager::Api::
Misc
;
our
$VERSION
=
'
2.0.
8
';
our
$VERSION
=
'
2.0.
9
';
package
Lemonldap::NG::Manager::
Api
;
use
Mouse
;
extends
'
Lemonldap::NG::Manager::Api::Common
';
# Health-check endpoint
...
...
lemonldap-ng-manager/site/htdocs/static/languages/fr.json
View file @
4e130f32
...
...
@@ -579,8 +579,8 @@
"oidcRPMetaDataOptionsTimeouts"
:
"Expiration"
,
"oidcRPMetaDataOptionsAllowOffline"
:
"Autoriser l'accès hors ligne"
,
"oidcOPMetaDataOptionsCheckJWTSignature"
:
"Vérifier la signature des jetons"
,
"oidcOPMetaDataOptionsClientID"
:
"I
dentifia
nt"
,
"oidcOPMetaDataOptionsClientSecret"
:
"
Mot de passe
"
,
"oidcOPMetaDataOptionsClientID"
:
"I
D clie
nt"
,
"oidcOPMetaDataOptionsClientSecret"
:
"
Secret client
"
,
"oidcOPMetaDataOptionsConfiguration"
:
"Configuration"
,
"oidcOPMetaDataOptionsConfigurationURI"
:
"URI de la configuration"
,
"oidcOPMetaDataOptionsDisplay"
:
"Affichage"
,
...
...
@@ -611,8 +611,8 @@
"oidcRPMetaDataOptionsAllowPasswordGrant"
:
"Autoriser le Password Grant OAuth2.0"
,
"oidcRPMetaDataOptionsAuthorizationCodeExpiration"
:
"Expiration des codes d'autorisation"
,
"oidcRPMetaDataOptionsBypassConsent"
:
"Contourner le consentement"
,
"oidcRPMetaDataOptionsClientID"
:
"I
dentifia
nt"
,
"oidcRPMetaDataOptionsClientSecret"
:
"
Mot de passe
"
,
"oidcRPMetaDataOptionsClientID"
:
"I
D clie
nt"
,
"oidcRPMetaDataOptionsClientSecret"
:
"
Secret client
"
,
"oidcRPMetaDataOptionsDisplay"
:
"Affichage"
,
"oidcRPMetaDataOptionsDisplayName"
:
"Nom d'affichage"
,
"oidcRPMetaDataOptionsIcon"
:
"Logo"
,
...
...
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/Net/LDAP.pm
View file @
4e130f32
...
...
@@ -679,6 +679,9 @@ sub searchGroups {
# Launch group search
if
(
$group_value
)
{
if
(
$self
->
{
conf
}
->
{
ldapGroupDecodeSearchedValue
}
)
{
utf8::
decode
(
$group_value
);
}
if
(
$dupcheck
->
{
$group_value
}
)
{
$self
->
{
portal
}
->
logger
->
debug
(
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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