--- loncom/auth/lonacc.pm 2014/10/04 02:59:32 1.158
+++ loncom/auth/lonacc.pm 2015/03/11 17:27:15 1.159.2.1
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Cookie Based Access Handler
#
-# $Id: lonacc.pm,v 1.158 2014/10/04 02:59:32 raeburn Exp $
+# $Id: lonacc.pm,v 1.159.2.1 2015/03/11 17:27:15 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -290,7 +290,10 @@ sub sso_login {
return undef;
}
- my ($user) = ($r->user =~ m/([a-zA-Z0-9_\-@.]*)/);
+ my ($user) = ($r->user =~ m/^($match_username)$/);
+ if ($user eq '') {
+ return undef;
+ }
my $query = $r->args;
my %form;
@@ -445,7 +448,10 @@ sub handler {
my ($is_balancer,$otherserver);
if ($handle eq '') {
- unless (($requrl eq '/adm/switchserver') && (!$r->is_initial_req())) {
+ unless ((($requrl eq '/adm/switchserver') && (!$r->is_initial_req())) ||
+ ($requrl =~ m{^/public/$match_domain/$match_courseid/syllabus}) ||
+ ($requrl =~ m{^/adm/help/}) ||
+ ($requrl =~ m{^/res/$match_domain/$match_username/})) {
$r->log_reason("Cookie not valid", $r->filename);
}
} elsif ($handle ne '') {
@@ -566,6 +572,13 @@ sub handler {
if ($requrl !~ m{^/(?:adm|public|prtspool)/}
|| $requrl =~ /^\/adm\/.*\/(smppg|bulletinboard)(\?|$ )/x) {
my $access=&Apache::lonnet::allowed('bre',$requrl);
+ if ($handle eq '') {
+ unless ($access eq 'F') {
+ if ($requrl =~ m{^/res/$match_domain/$match_username/}) {
+ $r->log_reason("Cookie not valid", $r->filename);
+ }
+ }
+ }
if ($access eq '1') {
$env{'user.error.msg'}="$requrl:bre:0:0:Choose Course";
return HTTP_NOT_ACCEPTABLE;
500 Internal Server Error
Internal Server Error
The server encountered an internal error or
misconfiguration and was unable to complete
your request.
Please contact the server administrator at
root@localhost to inform them of the time this error occurred,
and the actions you performed just before this error.
More information about this error may be available
in the server error log.