--- loncom/auth/lonacc.pm 2023/07/05 17:31:46 1.159.2.21.2.5 +++ loncom/auth/lonacc.pm 2022/06/20 15:07:21 1.204 @@ -1,7 +1,7 @@ # The LearningOnline Network # Cookie Based Access Handler # -# $Id: lonacc.pm,v 1.159.2.21.2.5 2023/07/05 17:31:46 raeburn Exp $ +# $Id: lonacc.pm,v 1.204 2022/06/20 15:07:21 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -160,7 +160,7 @@ sub get_posted_cgi { if (length($value) == 1) { $value=~s/[\r\n]$//; } - } + } if ($fname =~ /\.(xls|doc|ppt)(x|m)$/i) { $value=~s/[\r\n]$//; } @@ -204,6 +204,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 { @@ -307,7 +315,7 @@ sub sso_login { my %form; if ($query) { my @items = ('role','symb','iptoken','origurl','ttoken', - 'ltoken','linkkey','logtoken','sso','lcssowin'); + 'ltoken','linkkey','logtoken','sso'); &Apache::loncommon::get_unprocessed_cgi($query,\@items); foreach my $item (@items) { if (defined($env{'form.'.$item})) { @@ -325,8 +333,7 @@ sub sso_login { } } - my ($linkprot,$linkprotuser,$linkprotexit,$linkkey,$deeplinkurl, - $linkprotpbid,$linkprotpburl); + my ($linkprot,$linkprotuser,$linkkey,$deeplinkurl); # # If Shibboleth auth is in use, and a dual SSO and non-SSO login page @@ -365,9 +372,6 @@ sub sso_login { if ($info{'linkprot'}) { $linkprot = $info{'linkprot'}; $linkprotuser = $info{'linkprotuser'}; - $linkprotexit = $info{'linkprotexit'}; - $linkprotpbid = $info{'linkprotpbid'}; - $linkprotpburl = $info{'linkprotpburl'}; } elsif ($info{'linkkey'} ne '') { $linkkey = $info{'linkkey'}; } @@ -389,15 +393,10 @@ sub sso_login { if ($firsturl =~ m{^/tiny/$match_domain/\w+$}) { $form{'origurl'} = $firsturl; $deeplinkurl = $firsturl; - } elsif ($firsturl eq '/adm/email') { - $form{'origurl'} = $firsturl; } if ($form{'linkprot'}) { $linkprot = $form{'linkprot'}; $linkprotuser = $form{'linkprotuser'}; - $linkprotexit = $form{'linkprotexit'}; - $linkprotpbid = $form{'linkprotpbid'}; - $linkprotpburl = $form{'linkprotpburl'}; } elsif ($form{'linkkey'} ne '') { $linkkey = $form{'linkkey'}; } @@ -426,9 +425,6 @@ sub sso_login { if ($form{'linkprot'}) { $linkprot = $form{'linkprot'}; $linkprotuser = $form{'linkprotuser'}; - $linkprotexit = $form{'linkprotexit'}; - $linkprotpbid = $form{'linkprotpbid'}; - $linkprotpburl = $form{'linkprotpburl'}; } elsif ($form{'linkkey'} ne '') { $linkkey = $form{'linkkey'}; } @@ -436,19 +432,8 @@ sub sso_login { } elsif ($form{'ltoken'}) { my %link_info = &Apache::lonnet::tmpget($form{'ltoken'}); $linkprot = $link_info{'linkprot'}; - if ($linkprot) { - if ($link_info{'linkprotuser'} ne '') { - $linkprotuser = $link_info{'linkprotuser'}; - } - if ($link_info{'linkprotexit'} ne '') { - $linkprotexit = $link_info{'linkprotexit'}; - } - if ($link_info{'linkprotpbid'} ne '') { - $linkprotpbid = $link_info{'linkprotpbid'}; - } - if ($link_info{'linkprotpburl'} ne '') { - $linkprotpburl = $link_info{'linkprotpburl'}; - } + if (($linkprot) && ($link_info{'linkprotuser'} ne '')) { + $linkprotuser = $link_info{'linkprotuser'}; } my $delete = &Apache::lonnet::tmpdel($form{'ltoken'}); delete($form{'ltoken'}); @@ -470,13 +455,7 @@ sub sso_login { origurl => $deeplinkurl, linkprot => $linkprot, linkprotuser => $linkprotuser, - linkprotexit => $linkprotexit, - linkprotpbid => $linkprotpbid, - linkprotpburl => $linkprotpburl, ); - if ($env{'form.lcssowin'}) { - $data{'lcssowin'} = $env{'form.lcssowin'}; - } my $token = &Apache::lonnet::tmpput(\%data,$r->dir_config('lonHostID'),'link'); unless (($token eq 'con_lost') || ($token eq 'refused') || ($token =~ /^error:/) || ($token eq 'unknown_cmd') || ($token eq 'no_such_host')) { @@ -542,25 +521,10 @@ sub sso_login { if ($linkprotuser ne '') { $env{'request.linkprotuser'} = $linkprotuser; } - if ($linkprotexit ne '') { - $env{'request.linkprotexit'} = $linkprotexit; - } - if ($linkprotpbid ne '') { - $env{'request.linkprotpbid'} = $linkprotpbid; - } - if ($linkprotpburl ne '') { - $env{'request.linkprotpburl'} = $linkprotpburl; - } } elsif ($linkkey ne '') { $env{'request.linkkey'} = $linkkey; } } - if (($r->uri eq '/adm/sso') && ($form{'origurl'} eq '/adm/email')) { - if ($form{'display'} && ($env{'form.mailrecip'} eq $user.':'.$domain)) { - $env{'request.display'} = $form{'display'}; - $env{'request.mailrecip'} = $env{'form.mailrecip'}; - } - } $env{'request.sso.login'} = 1; if (defined($r->dir_config("lonSSOReloginServer"))) { $env{'request.sso.reloginserver'} = @@ -570,22 +534,19 @@ sub sso_login { if ($otherserver ne '') { $redirecturl .= '?otherserver='.$otherserver; } - if ($form{'lcssowin'}) { - $redirecturl .= (($redirecturl=~/\?/)?'&':'?') . 'lcssowin=1'; - } $r->internal_redirect($redirecturl); $r->set_handlers('PerlHandler'=> undef); } else { # need to login them in, so generate the need data that # migrate expects to do login - my $ip = &Apache::lonnet::get_requestor_ip($r); + my $ip = &Apache::lonnet::get_requestor_ip($r); my %info=('ip' => $ip, 'domain' => $domain, 'username' => $user, 'server' => $r->dir_config('lonHostID'), 'sso.login' => 1 ); - foreach my $item ('role','symb','iptoken','origurl','lcssowin') { + foreach my $item ('role','symb','iptoken','origurl') { if (exists($form{$item})) { $info{$item} = $form{$item}; } elsif ($sessiondata{$item} ne '') { @@ -605,28 +566,10 @@ sub sso_login { if ($info{'deeplink.login'}) { if ($linkprot) { $info{'linkprot'} = $linkprot; - if ($linkprotuser ne '') { - $info{'linkprotuser'} = $linkprotuser; - } - if ($linkprotexit ne '') { - $info{'linkprotexit'} = $linkprotexit; - } - if ($linkprotpbid ne '') { - $info{'linkprotpbid'} = $linkprotpbid; - } - if ($linkprotpburl ne '') { - $info{'linkprotpburl'} = $linkprotpburl; - } } elsif ($linkkey ne '') { $info{'linkkey'} = $linkkey; } } - if (($r->uri eq '/adm/sso') && ($form{'origurl'} eq '/adm/email')) { - if ($form{'display'} && ($form{'mailrecip'} eq $user.':'.$domain)) { - $info{'display'} = &escape($form{'display'}); - $info{'mailrecip'} = &escape($form{'mailrecip'}); - } - } if ($r->dir_config("ssodirecturl") == 1) { $info{'origurl'} = $r->uri; } @@ -663,7 +606,7 @@ sub sso_login { $r->subprocess_env->set('SSOUserDomain' => $domain); if (grep(/^sso$/,@cancreate)) { #FIXME - need to preserve origurl, role and symb, or linkprot or linkkey for use after account -# creation. If lcssowin is 1, createaccount needs to close pop-up and display in main window. +# creation $r->set_handlers('PerlHandler'=> [\&Apache::createaccount::handler]); $r->handler('perl-script'); } else { @@ -784,6 +727,7 @@ sub handler { my $lonhost = &Apache::lonnet::host_from_dns($hostname); if ($lonhost) { my $actual = &Apache::lonnet::absolute_url($hostname,1,1); + my $exphostname = &Apache::lonnet::hostname($lonhost); my $expected = $Apache::lonnet::protocol{$lonhost}.'://'.$hostname; unless ($actual eq $expected) { $env{'request.use_absolute'} = $expected; @@ -841,9 +785,6 @@ sub handler { origurl => $requrl, linkprot => $info{'linkprot'}, linkprotuser => $info{'linkprotuser'}, - linkprotexit => $info{'linkprotexit'}, - linkprotpbid => $info{'linkprotpbid'}, - linkprotpburl => $info{'linkprotpburl'}, ); } elsif ($info{'ltoken'} ne '') { my %ltoken_info = &Apache::lonnet::tmpget($info{'ltoken'}); @@ -853,9 +794,6 @@ sub handler { origurl => $requrl, linkprot => $ltoken_info{'linkprot'}, linkprotuser => $ltoken_info{'linkprotuser'}, - linkprotexit => $ltoken_info{'linkprotexit'}, - linkprotpbid => $ltoken_info{'linkprotpbid'}, - linkprotpburl => $ltoken_info{'linkprotpburl'}, ); } } @@ -1179,8 +1117,8 @@ sub handler { my $mapsymb = &Apache::lonnet::symbread($map); ($map,$mid,$murl)=&Apache::lonnet::decode_symb($mapsymb); } - &Apache::lonnet::symblist($map,$murl =>[$murl,$mid], - 'last_known' =>[$murl,$mid]); + &Apache::lonnet::symblist($map,$murl =>[$murl,$mid], + 'last_known' =>[$murl,$mid]); } } } @@ -1233,7 +1171,7 @@ sub handler { # ------------------------------------ See if this is a viewable portfolio file if (&Apache::lonnet::is_portfolio_url($requrl)) { my $clientip = &Apache::lonnet::get_requestor_ip($r); - 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;