From b76db50022b91e3099ad136467d99f66cfcccb23 Mon Sep 17 00:00:00 2001 From: Christophe Maudoux Date: Tue, 26 Mar 2019 21:20:54 +0100 Subject: [PATCH] Update zeroConf --- _example/conf/lmConf-1.json | 9 +++++++-- .../lib/Lemonldap/NG/Manager/Conf/Zero.pm | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/_example/conf/lmConf-1.json b/_example/conf/lmConf-1.json index 8f31fd436..300b10ff5 100644 --- a/_example/conf/lmConf-1.json +++ b/_example/conf/lmConf-1.json @@ -86,7 +86,7 @@ "authentication" : "Demo", "cfgAuthor" : "The LemonLDAP::NG team", "cfgNum" : 1, - "cfgVersion" : "2.0.2", + "cfgVersion" : "2.0.3", "cookieName" : "lemonldap", "demoExportedVars" : { "cn" : "cn", @@ -119,8 +119,13 @@ "namespace" : "lemonldap-ng-sessions" }, "locationRules" : { + "auth.__DNSDOMAIN__" : { + "(?#checkUser)^/checkuser" : "$uid eq \"dwho\"", + "(?#errors)^/lmerror/" : "accept", + "default" : "accept" + }, "manager.__DNSDOMAIN__" : { - "(?#Configuration)^/(manager\\.html|conf/)" : "$uid eq \"dwho\"", + "(?#Configuration)^/(manager\\.html|$)" : "$uid eq \"dwho\"", "(?#Notifications)/notifications" : "$uid eq \"dwho\" or $uid eq \"rtyler\"", "(?#Sessions)/sessions" : "$uid eq \"dwho\" or $uid eq \"rtyler\"", "default" : "$uid eq \"dwho\" or $uid eq \"rtyler\"" diff --git a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Zero.pm b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Zero.pm index 540f51255..ef2cec82b 100644 --- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Zero.pm +++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Zero.pm @@ -1,6 +1,6 @@ package Lemonldap::NG::Manager::Conf::Zero; -our $VERSION = '2.0.2'; +our $VERSION = '2.0.3'; sub zeroConf { my ( $domain, $sessionDir, $persistentSessionDir, $notificationDir ) = @_; @@ -147,6 +147,11 @@ sub zeroConf { 'portal' => "http://auth.$domain/", 'notificationStorage' => 'File', 'locationRules' => { + "auth.$domain" => { + '(?#checkUser)^/checkuser' => '$uid eq "dwho"', + '(?#errors)^/lmerror/' => 'accept', + 'default' => 'accept' + }, "test1.$domain" => { 'default' => 'accept', '^/logout' => 'logout_sso' @@ -157,7 +162,7 @@ sub zeroConf { }, "manager.$domain" => { 'default' => '$uid eq "dwho" or $uid eq "rtyler"', - '(?#Configuration)^/(manager\.html|conf/)' => '$uid eq "dwho"', + '(?#Configuration)^/(manager\.html|$)' => '$uid eq "dwho"', '(?#Sessions)/sessions' => '$uid eq "dwho" or $uid eq "rtyler"', '(?#Notifications)/notifications' => '$uid eq "dwho" or $uid eq "rtyler"',