--- loncom/auth/loncacc.pm 2004/01/27 23:06:22 1.31.2.1 +++ loncom/auth/loncacc.pm 2004/08/23 18:57:16 1.35 @@ -2,7 +2,7 @@ # Cookie Based Access Handler for Construction Area # (lonacc: 5/21/99,5/22,5/29,5/31 Gerd Kortemeyer) # -# $Id: loncacc.pm,v 1.31.2.1 2004/01/27 23:06:22 albertel Exp $ +# $Id: loncacc.pm,v 1.35 2004/08/23 18:57:16 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -48,12 +48,11 @@ use Apache::lonnet(); sub constructaccess { my ($url,$ownerdomain)=@_; - my ($ownername)=($url=~/\/(?:\~|priv\/|home\/)(\w+)/); + my ($ownername)=($url=~/\/(?:\~|priv\/|home\/)(\w+)\//); unless (($ownername) && ($ownerdomain)) { return ''; } # We do not allow editing of previous versions of files. if ($url=~/\.(\d+)\.(\w+)$/) { return ''; } my @possibledomains = &Apache::lonnet::current_machine_domains(); - &Apache::lonnet::logthis("got domains of ".join(':',@possibledomains)); if ($ownername eq $ENV{'user.name'}) { foreach my $domain (@possibledomains) { if ($domain eq $ENV{'user.domain'}) { @@ -62,7 +61,6 @@ sub constructaccess { } } - foreach my $domain (@possibledomains) { my $capriv='user.priv.ca./'.$domain.'/'.$ownername.'./'; foreach (keys %ENV) { @@ -81,7 +79,9 @@ sub handler { my %cookies=CGI::Cookie->parse($r->header_in('Cookie')); my $lonid=$cookies{'lonID'}; my $cookie; + &Apache::lonnet::logthis("Wha? cookie"); if ($lonid) { + &Apache::lonnet::logthis("Valid cookie"); my $handle=$lonid->value; $handle=~s/\W//g; my $lonidsdir=$r->dir_config('lonIDsDir'); @@ -120,6 +120,7 @@ sub handler { return OK; } else { + &Apache::lonnet::logthis("Invalid cookie"); $r->log_reason("Cookie $handle not valid", $r->filename) }; }