diff --git a/_example/conf/lmConf-1.json b/_example/conf/lmConf-1.json index d9368d90c..fa40ec499 100644 --- a/_example/conf/lmConf-1.json +++ b/_example/conf/lmConf-1.json @@ -125,9 +125,9 @@ "default" : "accept" }, "manager.__DNSDOMAIN__" : { - "(?#Configuration)^/(manager\\.html|confs|$)" : "$uid eq \"dwho\"", - "(?#Notifications)/notifications" : "$uid eq \"dwho\" or $uid eq \"rtyler\"", - "(?#Sessions)/sessions" : "$uid eq \"dwho\" or $uid eq \"rtyler\"", + "(?#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\"" }, "test1.__DNSDOMAIN__" : { diff --git a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm index 7888a9aba..873ff2cc1 100644 --- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm +++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm @@ -137,7 +137,7 @@ qr/^(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a- eval { do { qr/$_[0]/; - } + } }; return $@ ? ( 0, "__badRegexp__: $@" ) : 1; } @@ -218,8 +218,7 @@ m[^(?:(?:\-+\s*BEGIN\s+(?:PUBLIC\s+KEY|CERTIFICATE)\s*\-+\r?\n)?[a-zA-Z0-9/\+\r\ }, 'select' => { 'test' => sub { - my $test = - grep( { $_ eq $_[0]; } + my $test = grep( { $_ eq $_[0]; } map( { $_->{'k'}; } @{ $_[2]{'select'}; } ) ); return $test ? 1 @@ -1586,7 +1585,7 @@ qr/^(?:\*\.)?(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][ eval { do { qr/$_[0]/; - } + } }; return $@ ? 0 : 1; }, 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 e0a964fb2..2adbfbb30 100644 --- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Zero.pm +++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Zero.pm @@ -162,10 +162,11 @@ sub zeroConf { }, "manager.$domain" => { 'default' => '$uid eq "dwho" or $uid eq "rtyler"', - '(?#Configuration)^/(manager\.html|confs|$)' => - '$uid eq "dwho"', - '(?#Sessions)/sessions' => '$uid eq "dwho" or $uid eq "rtyler"', - '(?#Notifications)/notifications' => +'(?#Configuration)^/(.*?\.(fcgi|psgi)/)?(manager\.html|confs/|$)' + => '$uid eq "dwho"', + '(?#Sessions)/(.*?\.(fcgi|psgi)/)?sessions' => + '$uid eq "dwho" or $uid eq "rtyler"', + '(?#Notifications)/(.*?\.(fcgi|psgi)/)?notifications' => '$uid eq "dwho" or $uid eq "rtyler"', } }, diff --git a/lemonldap-ng-manager/site/htdocs/static/js/viewDiff.js b/lemonldap-ng-manager/site/htdocs/static/js/viewDiff.js index 90779a200..f084e1ce7 100644 --- a/lemonldap-ng-manager/site/htdocs/static/js/viewDiff.js +++ b/lemonldap-ng-manager/site/htdocs/static/js/viewDiff.js @@ -1,4 +1,4 @@ -// Generated by CoffeeScript 1.12.7 +// Generated by CoffeeScript 1.12.8 /* diff.html script diff --git a/lemonldap-ng-manager/site/htdocs/static/js/viewer.js b/lemonldap-ng-manager/site/htdocs/static/js/viewer.js index 93dc3c0de..ed4206d42 100644 --- a/lemonldap-ng-manager/site/htdocs/static/js/viewer.js +++ b/lemonldap-ng-manager/site/htdocs/static/js/viewer.js @@ -1,4 +1,4 @@ -// Generated by CoffeeScript 1.12.7 +// Generated by CoffeeScript 1.12.8 /* LemonLDAP::NG Viewer client