--- loncom/auth/lonacc.pm 2021/01/03 00:12:12 1.159.2.8.2.8 +++ loncom/auth/lonacc.pm 2021/01/02 22:11:26 1.159.2.17 @@ -1,7 +1,7 @@ # The LearningOnline Network # Cookie Based Access Handler # -# $Id: lonacc.pm,v 1.159.2.8.2.8 2021/01/03 00:12:12 raeburn Exp $ +# $Id: lonacc.pm,v 1.159.2.17 2021/01/02 22:11:26 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -355,14 +355,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'} = @@ -550,7 +542,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; @@ -595,15 +586,6 @@ sub handler { } } } - if ($requrl=~m{^/+tiny/+$match_domain/+\w+$}) { - if ($env{'user.name'} eq 'public' && - $env{'user.domain'} eq 'public') { - $env{'request.firsturl'}=$requrl; - return FORBIDDEN; - } else { - return OK; - } - } # ---------------------------------------------------------------- Check access my $now = time; @@ -616,8 +598,7 @@ sub handler { if (($requrl eq '/adm/viewclasslist') || ($requrl =~ m{^(/adm/wrapper|)\Q/uploaded/$cdom/$cnum/docs/\E}) || ($requrl =~ m{^/adm/.*/aboutme$}) || - ($requrl=~m{^/adm/coursedocs/showdoc/}) || - ($requrl=~m{^(/adm/wrapper|)/adm/$cdom/$cnum/\d+/ext\.tool$})) { + ($requrl=~m{^/adm/coursedocs/showdoc/})) { $check_block = 1; } } @@ -630,8 +611,7 @@ sub handler { ($requrl=~m|\.problem/smpedit$|) || ($requrl=~/^\/public\/.*\/syllabus$/) || ($requrl=~/^\/adm\/(viewclasslist|navmaps)$/) || - ($requrl=~/^\/adm\/.*\/aboutme\/portfolio(\?|$)/) || - ($requrl=~m{^/adm/$cdom/$cnum/\d+/ext\.tool$})) { + ($requrl=~/^\/adm\/.*\/aboutme\/portfolio(\?|$)/)) { $check_symb = 1; } } @@ -686,7 +666,7 @@ sub handler { &Apache::blockedaccess::setup_handler($r); return OK; } - } elsif ($check_access) { + } elsif ($check_access) { if ($handle eq '') { unless ($access eq 'F') { if ($requrl =~ m{^/res/$match_domain/$match_username/}) {