--- loncom/auth/lonacc.pm 2020/01/22 18:10:12 1.159.2.8.2.1 +++ loncom/auth/lonacc.pm 2017/04/04 02:59:40 1.166 @@ -1,7 +1,7 @@ # The LearningOnline Network # Cookie Based Access Handler # -# $Id: lonacc.pm,v 1.159.2.8.2.1 2020/01/22 18:10:12 raeburn Exp $ +# $Id: lonacc.pm,v 1.166 2017/04/04 02:59:40 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -159,7 +159,7 @@ sub get_posted_cgi { if (length($value) == 1) { $value=~s/[\r\n]$//; } - } elsif ($fname =~ /\.(xls|doc|ppt)(x|m)$/i) { + } elsif ($fname =~ /\.(xls|doc|ppt)x$/i) { $value=~s/[\r\n]$//; } if (ref($fields) eq 'ARRAY') { @@ -202,6 +202,14 @@ sub get_posted_cgi { $fname=''; $fmime=''; } + if ($i<$#lines && $lines[$i+1]=~/^Content\-Type\:\s*([\w\-\/]+)/i) { + # TODO: something with $1 ! + $i++; + } + if ($i<$#lines && $lines[$i+1]=~/^Content\-transfer\-encoding\:\s*([\w\-\/]+)/i) { + # TODO: something with $1 ! + $i++; + } $i++; } } else { @@ -281,6 +289,7 @@ sub upload_size_allowed { sub sso_login { my ($r,$handle,$username) = @_; + my $lonidsdir=$r->dir_config('lonIDsDir'); if (($r->user eq '') || ($username ne '') || ($r->user eq 'public:public') || (defined($env{'user.name'}) && (defined($env{'user.domain'})) && ($handle ne ''))) { @@ -332,21 +341,17 @@ sub sso_login { ($is_balancer,$otherserver) = &Apache::lonnet::check_loadbalancing($user,$domain,'login'); if ($is_balancer) { - # Check if browser sent a LON-CAPA load balancer cookie (and this is a balancer) - my ($found_server,$balancer_cookie) = &Apache::lonnet::check_for_balancer_cookie($r); - if (($found_server) && ($balancer_cookie =~ /^\Q$domain\E_\Q$user\E_/)) { - $otherserver = $found_server; - } elsif ($otherserver eq '') { + if ($otherserver eq '') { my $lowest_load; ($otherserver,undef,undef,undef,$lowest_load) = &Apache::lonnet::choose_server($domain); if ($lowest_load > 100) { $otherserver = &Apache::lonnet::spareserver($lowest_load,$lowest_load,1,$domain); } - if ($otherserver ne '') { - my @hosts = &Apache::lonnet::current_machine_ids(); - if (grep(/^\Q$otherserver\E$/,@hosts)) { - $hosthere = $otherserver; - } + } + if ($otherserver ne '') { + my @hosts = &Apache::lonnet::current_machine_ids(); + if (grep(/^\Q$otherserver\E$/,@hosts)) { + $hosthere = $otherserver; } } } @@ -355,14 +360,6 @@ sub sso_login { # login but immediately go to switch server to find us a new # machine &Apache::lonauth::success($r,$user,$domain,$home,'noredirect'); - foreach my $item (keys(%form)) { - $env{'form.'.$item} = $form{$item}; - } - unless ($form{'symb'}) { - unless (($r->uri eq '/adm/roles') || ($r->uri eq '/adm/sso')) { - $env{'form.origurl'} = $r->uri; - } - } $env{'request.sso.login'} = 1; if (defined($r->dir_config("lonSSOReloginServer"))) { $env{'request.sso.reloginserver'} = @@ -377,7 +374,7 @@ sub sso_login { } else { # need to login them in, so generate the need data that # migrate expects to do login - my $ip = $r->get_remote_host(); + my $ip = $r->get_remote_host(); my %info=('ip' => $ip, 'domain' => $domain, 'username' => $user, @@ -509,7 +506,7 @@ sub handler { my $preserved; foreach my $pair (split(/&/,$query)) { my ($name, $value) = split(/=/,$pair); - unless (($name eq 'symb') || ($name eq 'usehttp')) { + unless ($name eq 'symb') { $preserved .= $pair.'&'; } if (($env{'request.course.id'}) && ($name eq 'folderpath')) { @@ -528,7 +525,8 @@ sub handler { } } elsif ($env{'request.course.id'} && (($requrl =~ m{^/adm/$match_domain/$match_username/aboutme$}) || - ($requrl =~ m{^/public/$cdom/$cnum/syllabus$}))) { + ($requrl eq "/public/$cdom/$cnum/syllabus") || + ($requrl =~ m{^/adm/$cdom/$cnum/\d+/exttools?$}))) { my $query = $r->args; if ($query) { foreach my $pair (split(/&/,$query)) { @@ -549,7 +547,6 @@ sub handler { my $lonhost = &Apache::lonnet::host_from_dns($hostname); if ($lonhost) { my $actual = &Apache::lonnet::absolute_url($hostname); - my $exphostname = &Apache::lonnet::hostname($lonhost); my $expected = $Apache::lonnet::protocol{$lonhost}.'://'.$hostname; unless ($actual eq $expected) { $env{'request.use_absolute'} = $expected; @@ -565,7 +562,7 @@ sub handler { my $checkexempt; if ($env{'user.loadbalexempt'} eq $r->dir_config('lonHostID')) { if ($env{'user.loadbalcheck.time'} + 600 > time) { - $checkexempt = 1; + $checkexempt = 1; } } if ($env{'user.noloadbalance'} eq $r->dir_config('lonHostID')) { @@ -575,32 +572,18 @@ sub handler { ($is_balancer,$otherserver) = &Apache::lonnet::check_loadbalancing($env{'user.name'}, $env{'user.domain'}); - if ($is_balancer) { - unless (($requrl eq '/adm/switchserver') && (!$r->is_initial_req())) { - # Check if browser sent a LON-CAPA load balancer cookie (and this is a balancer) - my ($found_server,$balancer_cookie) = &Apache::lonnet::check_for_balancer_cookie($r); - if (($found_server) && ($balancer_cookie =~ /^\Q$env{'user.domain'}\E_\Q$env{'user.name'}\E_/)) { - $otherserver = $found_server; - } - } - } } if ($is_balancer) { - unless (($requrl eq '/adm/switchserver') && (!$r->is_initial_req())) { - $r->set_handlers('PerlResponseHandler'=> - [\&Apache::switchserver::handler]); - if ($otherserver ne '') { - $env{'form.otherserver'} = $otherserver; - } + $r->set_handlers('PerlResponseHandler'=> + [\&Apache::switchserver::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; } } - if ($requrl=~m{^/+tiny/+$match_domain/+\w+$}) { - return OK; - } # ---------------------------------------------------------------- Check access my $now = time; @@ -691,7 +674,8 @@ sub handler { ($requrl=~m|\.problem/smpedit$|) || ($requrl=~/^\/public\/.*\/syllabus$/) || ($requrl=~/^\/adm\/(viewclasslist|navmaps)$/) || - ($requrl=~/^\/adm\/.*\/aboutme\/portfolio(\?|$)/)) { + ($requrl=~/^\/adm\/.*\/aboutme\/portfolio(\?|$)/) || + ($requrl=~m{^/adm/$cdom/$cnum/\d+/exttools?$})) { # ------------------------------------- This is serious stuff, get symb and log my $symb; if ($query) { @@ -786,7 +770,7 @@ sub handler { # ------------------------------------ See if this is a viewable portfolio file if (&Apache::lonnet::is_portfolio_url($requrl)) { my $clientip = $r->get_remote_host(); - my $access=&Apache::lonnet::allowed('bre',$requrl,undef,undef,$clientip); + my $access=&Apache::lonnet::allowed('bre',$requrl,undef,undef,$clientip); if ($access eq 'A') { &Apache::restrictedaccess::setup_handler($r); return OK;