Skip to content

GitLab

Commit 7d27259e authored by Yadd's avatar Yadd
Browse files
Options

Create a "Same" value for userDB and remove some other

parent 9c3bdd51
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 89 additions and 257 deletions
_example/conf/lmConf-1.json
View file @ 7d27259e
......@@ -162,6 +162,6 @@
"securedCookie" : 0,
"sessionDataToRemember" : {},
"timeout" : 72000,
"userDB" : "Demo",
"userDB" : "Same",
"whatToTrace" : "_whatToTrace"
}
e2e-tests/lmConf-1.json
View file @ 7d27259e
......@@ -184,6 +184,6 @@
"securedCookie": 0,
"sessionDataToRemember": {},
"timeout": 72000,
"userDB": "Demo",
"userDB": "Same",
"whatToTrace": "_whatToTrace"
}
\ No newline at end of file
}
e2e-tests/manager/07-authParams.js
View file @ 7d27259e
......@@ -24,8 +24,8 @@ describe('Lemonldap::NG Manager', function() {
element(by.css('.glyphicon-plus-sign')).click();
element(by.id('a-authChoiceModules')).click();
element(by.id('t-authChoiceModules/n1')).click();
element(by.xpath("//option[@value='BrowserID']")).click();
expect(element(by.id('t-browseridParams')).isDisplayed()).toBeTruthy();
element(by.xpath("//option[@value='LDAP']")).click();
expect(element(by.id('t-ldapParams')).isDisplayed()).toBeTruthy();
});
it('should display auth modules chosen with authMulti', function() {
......@@ -39,4 +39,4 @@ describe('Lemonldap::NG Manager', function() {
expect(element(by.id('t-casParams')).isDisplayed()).toBeTruthy();
});
});
});
\ No newline at end of file
});
lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/DefaultValues.pm
View file @ 7d27259e
......@@ -244,7 +244,7 @@ sub defaultValues {
'trustedProxies' => '',
'twitterAuthnLevel' => 1,
'userControl' => '^[\\w\\.\\-@]+$',
'userDB' => 'Demo',
'userDB' => 'Same',
'useRedirectOnError' => 1,
'useSafeJail' => 1,
'webIDAuthnLevel' => 1,
......
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm
View file @ 7d27259e
......@@ -227,7 +227,7 @@ m[^(?:(?:\-+\s*BEGIN\s+(?:PUBLIC\s+KEY|CERTIFICATE)\s*\-+\r?\n)?[a-zA-Z0-9/\+\r\
map( { $_->{'k'}; } @{ $_[2]{'select'}; } ) );
return $test
? 1
: ( 0, "Invalid value '$_[0]' for this select" );
: ( 1, "Invalid value '$_[0]' for this select" );
}
},
'subContainer' => {
......@@ -2839,8 +2839,12 @@ qr/^(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-
'type' => 'pcre'
},
'userDB' => {
'default' => 'Demo',
'default' => 'Same',
'select' => [
{
'k' => 'Same',
'v' => 'Same'
},
{
'k' => 'AD',
'v' => 'Active Directory'
......@@ -2849,58 +2853,14 @@ qr/^(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-
'k' => 'DBI',
'v' => 'Database (DBI)'
},
{
'k' => 'Choice',
'v' => 'authChoice'
},
{
'k' => 'Demo',
'v' => 'Demonstration'
},
{
'k' => 'Facebook',
'v' => 'Facebook'
},
{
'k' => 'Google',
'v' => 'Google'
},
{
'k' => 'LDAP',
'v' => 'LDAP'
},
{
'k' => 'Multi',
'v' => 'Multiple'
},
{
'k' => 'Null',
'v' => 'None'
},
{
'k' => 'OpenID',
'v' => 'OpenID'
},
{
'k' => 'OpenIDConnect',
'v' => 'OpenID Connect'
},
{
'k' => 'Proxy',
'v' => 'Proxy'
},
{
'k' => 'Remote',
'v' => 'Remote'
},
{
'k' => 'SAML',
'v' => 'SAML v2'
},
{
'k' => 'Slave',
'v' => 'Slave'
},
{
'k' => 'WebID',
'v' => 'WebID'
......
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Attributes.pm
View file @ 7d27259e
......@@ -120,7 +120,7 @@ sub types {
{ $_ eq $_[0] } map ( { $_->{k} } @{ $_[2]->{select} } ) );
return $test
? 1
: ( 0, "Invalid value '$_[0]' for this select" );
: ( 1, "Invalid value '$_[0]' for this select" );
},
},
......@@ -1796,24 +1796,14 @@ sub attributes {
userDB => {
type => 'select',
select => [
{ k => 'AD', v => 'Active Directory' },
{ k => 'DBI', v => 'Database (DBI)' },
{ k => 'Choice', v => 'authChoice' },
{ k => 'Demo', v => 'Demonstration' },
{ k => 'Facebook', v => 'Facebook' },
{ k => 'Google', v => 'Google' },
{ k => 'LDAP', v => 'LDAP' },
{ k => 'Multi', v => 'Multiple' },
{ k => 'Null', v => 'None' },
{ k => 'OpenID', v => 'OpenID' },
{ k => 'OpenIDConnect', v => 'OpenID Connect' },
{ k => 'Proxy', v => 'Proxy' },
{ k => 'Remote', v => 'Remote' },
{ k => 'SAML', v => 'SAML v2' },
{ k => 'Slave', v => 'Slave' },
{ k => 'WebID', v => 'WebID' },
{ k => 'Same', v => 'Same' },
{ k => 'AD', v => 'Active Directory' },
{ k => 'DBI', v => 'Database (DBI)' },
{ k => 'LDAP', v => 'LDAP' },
{ k => 'Null', v => 'None' },
{ k => 'WebID', v => 'WebID' },
],
default => 'Demo',
default => 'Same',
documentation => 'User module',
},
passwordDB => {
......
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Zero.pm
View file @ 7d27259e
......@@ -9,7 +9,7 @@ sub zeroConf {
return {
'timeout' => 72000,
'loginHistoryEnabled' => 1,
'userDB' => 'Demo',
'userDB' => 'Same',
'applicationList' => {
'2administration' => {
'manager' => {
......
lemonldap-ng-manager/t/conf/lmConf-1.json
View file @ 7d27259e
......@@ -147,6 +147,6 @@
"securedCookie": 0,
"sessionDataToRemember": {},
"timeout": 72000,
"userDB": "Demo",
"userDB": "Same",
"whatToTrace": "_whatToTrace"
}
lemonldap-ng-manager/t/jsonfiles/01-base-tree.json
View file @ 7d27259e
......@@ -239,53 +239,23 @@
"title": "authentication",
"type": "select"
}, {
"default": "Demo",
"default": "Same",
"id": "userDB",
"select": [{
"k": "Same",
"v": "Same as auth"
}, {
"k": "AD",
"v": "Active Directory"
}, {
"k": "DBI",
"v": "Database (DBI)"
}, {
"k": "Choice",
"v": "authChoice"
}, {
"k": "Demo",
"v": "Demonstration"
}, {
"k": "Facebook",
"v": "Facebook"
}, {
"k": "Google",
"v": "Google"
}, {
"k": "LDAP",
"v": "LDAP"
}, {
"k": "Multi",
"v": "Multiple"
}, {
"k": "Null",
"v": "None"
}, {
"k": "OpenID",
"v": "OpenID"
}, {
"k": "Proxy",
"v": "Proxy"
}, {
"k": "Remote",
"v": "Remote"
}, {
"k": "SAML",
"v": "SAML v2"
}, {
"k": "Slave",
"v": "Slave"
}, {
"k": "WebID",
"v": "WebID"
}],
"title": "userDB",
"type": "select"
......
lemonldap-ng-manager/t/jsonfiles/02-base-tree-all-nodes-opened.json
View file @ 7d27259e
......@@ -351,57 +351,27 @@
"type": "select",
"data": "Demo"
}, {
"default": "Demo",
"default": "Same",
"id": "userDB",
"select": [{
"k": "Same",
"v": "Same as auth"
}, {
"k": "AD",
"v": "Active Directory"
}, {
"k": "DBI",
"v": "Database (DBI)"
}, {
"k": "Choice",
"v": "authChoice"
}, {
"k": "Demo",
"v": "Demonstration"
}, {
"k": "Facebook",
"v": "Facebook"
}, {
"k": "Google",
"v": "Google"
}, {
"k": "LDAP",
"v": "LDAP"
}, {
"k": "Multi",
"v": "Multiple"
}, {
"k": "Null",
"v": "None"
}, {
"k": "OpenID",
"v": "OpenID"
}, {
"k": "Proxy",
"v": "Proxy"
}, {
"k": "Remote",
"v": "Remote"
}, {
"k": "SAML",
"v": "SAML v2"
}, {
"k": "Slave",
"v": "Slave"
}, {
"k": "WebID",
"v": "WebID"
}],
"title": "userDB",
"type": "select",
"data": "Demo"
"data": "Same"
}, {
"default": "Demo",
"id": "passwordDB",
......
lemonldap-ng-manager/t/jsonfiles/12-modified.json
View file @ 7d27259e
......@@ -361,53 +361,23 @@
"type": "select",
"data": "Demo"
}, {
"default": "Demo",
"default": "Same",
"id": "userDB",
"select": [{
"k": "Same",
"v": "Same as auth"
}, {
"k": "AD",
"v": "Active Directory"
}, {
"k": "DBI",
"v": "Database (DBI)"
}, {
"k": "Choice",
"v": "authChoice"
}, {
"k": "Demo",
"v": "Demonstration"
}, {
"k": "Facebook",
"v": "Facebook"
}, {
"k": "Google",
"v": "Google"
}, {
"k": "LDAP",
"v": "LDAP"
}, {
"k": "Multi",
"v": "Multiple"
}, {
"k": "Null",
"v": "None"
}, {
"k": "OpenID",
"v": "OpenID"
}, {
"k": "Proxy",
"v": "Proxy"
}, {
"k": "Remote",
"v": "Remote"
}, {
"k": "SAML",
"v": "SAML v2"
}, {
"k": "Slave",
"v": "Slave"
}, {
"k": "WebID",
"v": "WebID"
}],
"title": "userDB",
"type": "select",
......
lemonldap-ng-manager/t/jsonfiles/14-bad.json
View file @ 7d27259e
......@@ -351,57 +351,27 @@
"type": "select",
"data": "Demo"
}, {
"default": "Demo",
"default": "Same",
"id": "userDB",
"select": [{
"k": "Same",
"v": "Same as auth"
}, {
"k": "AD",
"v": "Active Directory"
}, {
"k": "DBI",
"v": "Database (DBI)"
}, {
"k": "Choice",
"v": "authChoice"
}, {
"k": "Demo",
"v": "Demonstration"
}, {
"k": "Facebook",
"v": "Facebook"
}, {
"k": "Google",
"v": "Google"
}, {
"k": "LDAP",
"v": "LDAP"
}, {
"k": "Multi",
"v": "Multiple"
}, {
"k": "Null",
"v": "None"
}, {
"k": "OpenID",
"v": "OpenID"
}, {
"k": "Proxy",
"v": "Proxy"
}, {
"k": "Remote",
"v": "Remote"
}, {
"k": "SAML",
"v": "SAML v2"
}, {
"k": "Slave",
"v": "Slave"
}, {
"k": "WebID",
"v": "WebID"
}],
"title": "userDB",
"type": "select",
"data": "Demo"
"data": "Same"
}, {
"default": "Demo",
"id": "passwordDB",
......
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Init.pm
View file @ 7d27259e
......@@ -177,12 +177,14 @@ sub reloadConf {
# Load authentication/userDB
# --------------------------
my $mod;
for my $type (qw(authentication userDB)) {
unless ( $self->conf->{$type} ) {
$self->error("$type is not set");
return $self->fail;
}
my $module = '::' . ucfirst($type) . '::' . $self->conf->{$type};
$mod = $self->conf->{$type} unless($self->conf->{$type} eq 'Same');
my $module = '::' . ucfirst($type) . '::' . $mod;
$module =~ s/Authentication/Auth/;
# Launch and initialize module
......
lemonldap-ng-portal/t/20-Auth-and-password-DBI.t
View file @ 7d27259e
......@@ -23,7 +23,7 @@ SKIP: {
logLevel => 'error',
useSafeJail => 1,
authentication => 'DBI',
userDB => 'DBI',
userDB => 'Same',
dbiAuthChain => 'dbi:SQLite:dbname=t/userdb.db',
dbiAuthUser => '',
dbiAuthPassword => '',
......
lemonldap-ng-portal/t/21-Auth-and-password-LDAP.t
View file @ 7d27259e
......@@ -16,7 +16,7 @@ SKIP: {
useSafeJail => 1,
authentication => 'LDAP',
portal => 'http://auth.example.com/',
userDB => 'LDAP',
userDB => 'Same',
registerDB => 'LDAP',
LDAPFilter => $ENV{LDAPFILTER} || '(cn=$user)',
ldapServer => $ENV{LDAPSERVER},
......
lemonldap-ng-portal/t/22-Auth-and-password-AD.t
View file @ 7d27259e
......@@ -16,7 +16,7 @@ SKIP: {
logLevel => 'error',
useSafeJail => 1,
authentication => 'AD',
userDB => 'AD',
userDB => 'Same',
LDAPFilter => $ENV{ADFILTER} || '(cn=$user)',
ldapServer => $ENV{ADSERVER},
ldapBase => $ENV{ADBASE},
......
lemonldap-ng-portal/t/23-AuthNull.t
View file @ 7d27259e
......@@ -11,7 +11,7 @@ my $client = LLNG::Manager::Test->new(
logLevel => 'error',
useSafeJail => 1,
authentication => 'Null',
userDB => 'Null',
userDB => 'Same',
}
}
);
......
lemonldap-ng-portal/t/25-AuthSlave.t
View file @ 7d27259e
......@@ -11,7 +11,7 @@ my $client = LLNG::Manager::Test->new(
logLevel => 'error',
useSafeJail => 1,
authentication => 'Slave',
userDB => 'Slave',
userDB => 'Same',
slaveUserHeader => 'My-Test',
slaveExportedVars => {
name => 'Name',
......
lemonldap-ng-portal/t/26-AuthRemote.t
View file @ 7d27259e
......@@ -11,7 +11,7 @@ my $client = LLNG::Manager::Test->new(
logLevel => 'error',
useSafeJail => 1,
authentication => 'Remote',
userDB => 'Remote',
userDB => 'Same',
remoteUserField => 'uid',
remoteGlobalStorage => 'Apache::Session::File',
remoteGlobalStorageOptions => {
......
lemonldap-ng-portal/t/27-AuthProxy.t
View file @ 7d27259e
......@@ -14,7 +14,7 @@ SKIP: {
logLevel => 'error',
useSafeJail => 1,
authentication => 'Proxy',
userDB => 'Proxy',
userDB => 'Same',
soapAuthService => $ENV{REMOTELLNG},
}
}
......
lemonldap-ng-portal/t/28-AuthChoice.t
View file @ 7d27259e
......@@ -27,7 +27,7 @@ SKIP: {
logLevel => 'error',
useSafeJail => 1,
authentication => 'Choice',
userDB => 'Choice',
userDB => 'Same',
authChoiceParam => 'test',
authChoiceModules => {
......
lemonldap-ng-portal/t/30-Auth-and-issuer-SAML-Artifact-with-SOAP-SLO-IdP-initiated.t
View file @ 7d27259e
......@@ -182,7 +182,7 @@ sub issuer {
domain => 'idp.com',
portal => 'http://auth.idp.com',
authentication => 'Demo',
userDB => 'Demo',
userDB => 'Same',
issuerDBSAMLActivation => 1,
samlSPMetaDataOptions => {
'sp.com' => {
......@@ -468,7 +468,7 @@ sub sp {
domain => 'sp.com',
portal => 'http://auth.sp.com',
authentication => 'SAML',
userDB => 'SAML',
userDB => 'Same',
issuerDBSAMLActivation => 0,
samlIDPMetaDataExportedAttributes => {
idp => {
......
lemonldap-ng-portal/t/30-Auth-and-issuer-SAML-Artifact-with-SOAP-SLO.t
View file @ 7d27259e
......@@ -231,7 +231,7 @@ sub issuer {
domain => 'idp.com',
portal => 'http://auth.idp.com',
authentication => 'Demo',
userDB => 'Demo',
userDB => 'Same',
issuerDBSAMLActivation => 1,
samlSPMetaDataOptions => {
'sp.com' => {
......@@ -516,7 +516,7 @@ sub sp {
domain => 'sp.com',
portal => 'http://auth.sp.com',
authentication => 'SAML',
userDB => 'SAML',
userDB => 'Same',
issuerDBSAMLActivation => 0,
samlIDPMetaDataExportedAttributes => {
idp => {
......
lemonldap-ng-portal/t/30-Auth-and-issuer-SAML-Metadata.t
View file @ 7d27259e
......@@ -40,7 +40,7 @@ sub issuer {
domain => 'idp.com',