Fix Zero conf (#2036)

This commit is contained in:
Christophe Maudoux 2020-03-03 17:40:39 +01:00
parent ea9f019bc8
commit 1922650218
2 changed files with 16 additions and 12 deletions

View File

@ -96,9 +96,11 @@
"domain" : "__DNSDOMAIN__",
"exportedHeaders" : {
"test1.__DNSDOMAIN__" : {
"Auth-Groups" : "$groups",
"Auth-User" : "$uid"
},
"test2.__DNSDOMAIN__" : {
"Auth-Groups" : "$groups",
"Auth-User" : "$uid"
}
},
@ -120,15 +122,15 @@
},
"locationRules" : {
"auth.__DNSDOMAIN__" : {
"(?#checkUser)^/checkuser" : "$uid eq \"dwho\"",
"(?#checkUser)^/checkuser" : "inGroup(\"timelords\")",
"(?#errors)^/lmerror/" : "accept",
"default" : "accept"
},
"manager.__DNSDOMAIN__" : {
"(?#Configuration)^/(.*?\\.(fcgi|psgi)/)?(manager\\.html|confs/|$)" : "$uid eq \"dwho\"",
"(?#Notifications)/(.*?\\.(fcgi|psgi)/)?notifications" : "$uid eq \"dwho\" or $uid eq \"rtyler\"",
"(?#Sessions)/(.*?\\.(fcgi|psgi)/)?sessions" : "$uid eq \"dwho\" or $uid eq \"rtyler\"",
"default" : "$uid eq \"dwho\" or $uid eq \"rtyler\""
"(?#Configuration)^/(.*?\\.(fcgi|psgi)/)?(manager\\.html|confs/|$)" : "inGroup(\"timelords\")",
"(?#Notifications)/(.*?\\.(fcgi|psgi)/)?notifications" : "inGroup(\"timelords\") or $uid eq \"rtyler\"",
"(?#Sessions)/(.*?\\.(fcgi|psgi)/)?sessions" : "inGroup(\"timelords\") or $uid eq \"rtyler\"",
"default" : "inGroup(\"timelords\") or $uid eq \"rtyler\""
},
"test1.__DNSDOMAIN__" : {
"^/logout" : "logout_sso",

View File

@ -136,10 +136,12 @@ sub zeroConf {
'groups' => {},
'exportedHeaders' => {
"test1.$domain" => {
'Auth-User' => '$uid'
'Auth-User' => '$uid',
'Auth-Groups' => '$groups'
},
"test2.$domain" => {
'Auth-User' => '$uid'
'Auth-User' => '$uid',
'Auth-Groups' => '$groups'
}
},
'registerDB' => 'Demo',
@ -148,7 +150,7 @@ sub zeroConf {
'notificationStorage' => 'File',
'locationRules' => {
"auth.$domain" => {
'(?#checkUser)^/checkuser' => '$uid eq "dwho"',
'(?#checkUser)^/checkuser' => 'inGroup("timelords")',
'(?#errors)^/lmerror/' => 'accept',
'default' => 'accept'
},
@ -161,13 +163,13 @@ sub zeroConf {
'^/logout' => 'logout_sso'
},
"manager.$domain" => {
'default' => '$uid eq "dwho" or $uid eq "rtyler"',
'default' => 'inGroup("timelords") or $uid eq "rtyler"',
'(?#Configuration)^/(.*?\.(fcgi|psgi)/)?(manager\.html|confs/|$)'
=> '$uid eq "dwho"',
=> 'inGroup("timelords")',
'(?#Sessions)/(.*?\.(fcgi|psgi)/)?sessions' =>
'$uid eq "dwho" or $uid eq "rtyler"',
'inGroup("timelords") or $uid eq "rtyler"',
'(?#Notifications)/(.*?\.(fcgi|psgi)/)?notifications' =>
'$uid eq "dwho" or $uid eq "rtyler"',
'inGroup("timelords") or $uid eq "rtyler"',
}
},
'whatToTrace' => '_whatToTrace',