--- loncom/auth/lonacc.pm 2014/01/04 23:21:22 1.151 +++ loncom/auth/lonacc.pm 2014/12/01 22:52:54 1.160 @@ -1,7 +1,7 @@ # The LearningOnline Network # Cookie Based Access Handler # -# $Id: lonacc.pm,v 1.151 2014/01/04 23:21:22 raeburn Exp $ +# $Id: lonacc.pm,v 1.160 2014/12/01 22:52:54 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -160,6 +160,8 @@ sub get_posted_cgi { if (length($value) == 1) { $value=~s/[\r\n]$//; } + } elsif ($fname =~ /\.(xls|doc|ppt)x$/i) { + $value=~s/[\r\n]$//; } if (ref($fields) eq 'ARRAY') { next if (!grep(/^\Q$name\E$/,@{$fields})); @@ -281,7 +283,7 @@ sub sso_login { my ($r,$handle,$username) = @_; my $lonidsdir=$r->dir_config('lonIDsDir'); - if (($r->user eq '') || ($username ne '') || + if (($r->user eq '') || ($username ne '') || ($r->user eq 'public:public') || (defined($env{'user.name'}) && (defined($env{'user.domain'})) && ($handle ne ''))) { # not an SSO case or already logged in @@ -305,7 +307,10 @@ sub sso_login { my %sessiondata; if ($form{'iptoken'}) { %sessiondata = &Apache::lonnet::tmpget($form{'iptoken'}); - my $delete = &Apache::lonnet::tmpdel($form{'token'}); + my $delete = &Apache::lonnet::tmpdel($form{'iptoken'}); + unless ($sessiondata{'sessionserver'}) { + delete($form{'iptoken'}); + } } my $domain = $r->dir_config('lonSSOUserDomain'); @@ -317,8 +322,8 @@ sub sso_login { &Apache::lonnet::logthis(" SSO authorized user $user "); my ($is_balancer,$otherserver,$hosthere); if ($form{'iptoken'}) { - if (($sessiondata{'domain'} eq $form{'udom'}) && - ($sessiondata{'username'} eq $form{'uname'})) { + if (($sessiondata{'domain'} eq $domain) && + ($sessiondata{'username'} eq $user)) { $hosthere = 1; } } @@ -359,13 +364,13 @@ sub sso_login { 'server' => $r->dir_config('lonHostID'), 'sso.login' => 1 ); - foreach my $item ('role','symb') { + foreach my $item ('role','symb','iptoken') { if (exists($form{$item})) { $info{$item} = $form{$item}; } } unless ($info{'symb'}) { - unless ($r->uri eq '/adm/roles') { + unless (($r->uri eq '/adm/roles') || ($r->uri eq '/adm/sso')) { $info{'origurl'} = $r->uri; } } @@ -384,10 +389,8 @@ sub sso_login { $r->set_handlers('PerlHandler'=> undef); } return OK; - } elsif (defined($r->dir_config('lonSSOUserUnknownRedirect'))) { + } else { &Apache::lonnet::logthis(" SSO authorized unknown user $user "); - $r->subprocess_env->set('SSOUserUnknown' => $user); - $r->subprocess_env->set('SSOUserDomain' => $domain); my @cancreate; my %domconfig = &Apache::lonnet::get_dom('configuration',['usercreation'],$domain); @@ -401,13 +404,18 @@ sub sso_login { } } } - if (grep(/^sso$/,@cancreate)) { - $r->internal_redirect('/adm/createaccount'); - } else { - $r->internal_redirect($r->dir_config('lonSSOUserUnknownRedirect')); + if ((grep(/^sso$/,@cancreate)) || (defined($r->dir_config('lonSSOUserUnknownRedirect')))) { + $r->subprocess_env->set('SSOUserUnknown' => $user); + $r->subprocess_env->set('SSOUserDomain' => $domain); + if (grep(/^sso$/,@cancreate)) { + $r->set_handlers('PerlHandler'=> [\&Apache::createaccount::handler]); + $r->handler('perl-script'); + } else { + $r->internal_redirect($r->dir_config('lonSSOUserUnknownRedirect')); + $r->set_handlers('PerlHandler'=> undef); + } + return OK; } - $r->set_handlers('PerlHandler'=> undef); - return OK; } return undef; } @@ -437,7 +445,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 '') { @@ -468,7 +479,7 @@ sub handler { } $env{'request.filename'} = $r->filename; $env{'request.noversionuri'} = &Apache::lonnet::deversion($requrl); - my $suppext; + my ($suppext,$checkabsolute); if ($requrl =~ m{^/adm/wrapper/ext/}) { my $query = $r->args; if ($query) { @@ -489,6 +500,9 @@ sub handler { $env{'request.external.querystring'} = $preserved; } } + if ($env{'request.course.id'}) { + $checkabsolute = 1; + } } elsif ($env{'request.course.id'} && (($requrl =~ m{^/adm/$match_domain/$match_username/aboutme$}) || ($requrl =~ m{^/public/$cdom/$cnum/syllabus$}))) { @@ -503,6 +517,20 @@ sub handler { } } } + if ($requrl =~ m{^/public/$cdom/$cnum/syllabus$}) { + $checkabsolute = 1; + } + } + if ($checkabsolute) { + my $hostname = $r->hostname(); + my $lonhost = &Apache::lonnet::host_from_dns($hostname); + if ($lonhost) { + my $actual = &Apache::lonnet::absolute_url($hostname); + my $expected = $Apache::lonnet::protocol{$lonhost}.'://'.$hostname; + unless ($actual eq $expected) { + $env{'request.use_absolute'} = $expected; + } + } } # -------------------------------------------------------- Load POST parameters @@ -530,6 +558,10 @@ sub handler { if ($otherserver ne '') { $env{'form.otherserver'} = $otherserver; } + unless (($env{'form.origurl'}) || ($r->uri eq '/adm/roles') || + ($r->uri eq '/adm/switchserver') || ($r->uri eq '/adm/sso')) { + $env{'form.origurl'} = $r->uri; + } } # ---------------------------------------------------------------- Check access @@ -537,6 +569,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; @@ -564,6 +603,12 @@ sub handler { return HTTP_NOT_ACCEPTABLE; } } + } elsif (($handle =~ /^publicuser_\d+$/) && (&Apache::lonnet::is_portfolio_url($requrl))) { + my $clientip = $r->get_remote_host(); + if (&Apache::lonnet::allowed('bre',$requrl,undef,undef,$clientip) ne 'F') { + $env{'user.error.msg'}="$requrl:bre:1:1:Access Denied"; + return HTTP_NOT_ACCEPTABLE; + } } else { $env{'user.error.msg'}="$requrl:bre:1:1:Access Denied"; return HTTP_NOT_ACCEPTABLE; @@ -702,7 +747,8 @@ sub handler { } # ------------------------------------ See if this is a viewable portfolio file if (&Apache::lonnet::is_portfolio_url($requrl)) { - my $access=&Apache::lonnet::allowed('bre',$requrl); + my $clientip = $r->get_remote_host(); + my $access=&Apache::lonnet::allowed('bre',$requrl,undef,undef,$clientip); if ($access eq 'A') { &Apache::restrictedaccess::setup_handler($r); return OK;