'.&mt('Transferring to login page.').'
'. + &Apache::loncommon::end_page()); } - &Apache::loncommon::content_type($r,'text/html'); - $r->send_http_header; - my $url = '/adm/login'; - if ($domain) { - $url .= '?domain='.$domain; - } - $r->print(&Apache::loncommon::start_page('Going to login',undef, - {'redirect' => [0,$url,'',$write_to_opener],}). - ''.&mt('Transferring to login page.').'
'. - &Apache::loncommon::end_page()); return OK; } @@ -72,6 +73,47 @@ sub sso_check { return \%extra_env; } +sub lti_check { + my ($data) = @_; + my %lti_env; + if (ref($data) eq 'HASH') { + if ($data->{'lti.login'}) { + $lti_env{'request.lti.login'} = $data->{'lti.login'}; + if ($data->{'lti.reqcrs'}) { + $lti_env{'request.lti.reqcrs'} = $data->{'lti.reqcrs'}; + } + if ($data->{'lti.reqrole'}) { + $lti_env{'request.lti.reqrole'} = $data->{'lti.reqrole'}; + } + if ($data->{'lti.selfenrollrole'}) { + $lti_env{'request.lti.selfenrollrole'} = $data->{'lti.selfenrollrole'}; + } + if ($data->{'lti.uri'}) { + $lti_env{'request.lti.uri'} = $data->{'lti.uri'}; + } + if ($data->{'lti.target'}) { + $lti_env{'request.lti.target'} = $data->{'lti.target'}; + } + if ($data->{'lti.sourcecrs'}) { + $lti_env{'request.lti.sourcecrs'} = $data->{'lti.sourcecrs'}; + } + } + if ($data->{'lti.passbackid'}) { + $lti_env{'request.lti.passbackid'} = $data->{'lti.passbackid'}; + } + if ($data->{'lti.passbackurl'}) { + $lti_env{'request.lti.passbackurl'} = $data->{'lti.passbackurl'}; + } + if ($data->{'lti.rosterid'}) { + $lti_env{'request.lti.rosterid'} = $data->{'lti.rosterid'}; + } + if ($data->{'lti.rosterurl'}) { + $lti_env{'request.lti.rosterurl'} = $data->{'lti.rosterurl'}; + } + } + return \%lti_env; +} + sub ip_changed { my ($r,$udom,$camefrom,$dataref) = @_; &Apache::loncommon::content_type($r,'text/html'); @@ -165,8 +207,6 @@ sub ip_changed { if ($hostname) { my $protocol = $Apache::lonnet::protocol{$switchto}; $protocol = 'http' if ($protocol ne 'https'); - my $alias = &Apache::lonnet::use_proxy_alias($r,$switchto); - $hostname = $alias if ($alias ne ''); $url = $protocol.'://'.$hostname; if ($rule_in_effect eq 'balancer') { $message .= ''.$message.'
'. &Apache::loncommon::end_page()); @@ -228,13 +257,13 @@ sub ip_changed { } sub logout { - my ($r,$ip,$handle,$data,$lti_env,$linkprot_info) = @_; - my $lonidsdir=$r->dir_config('lonIDsDir'); - if (unlink("$lonidsdir/$handle.id")) { - if (($env{'user.linkedenv'} =~ /^[a-f0-9]+_linked$/) && - (-l "$lonidsdir/$env{'user.linkedenv'}.id") && - (readlink("$lonidsdir/$env{'user.linkedenv'}.id") eq "$lonidsdir/$handle.id")) { - unlink("$lonidsdir/$env{'user.linkedenv'}.id"); + my ($r,$handle,$data,$lti_env) = @_; + unlink($handle); + if ($env{'user.linkedenv'} ne '') { + my $lonidsdir=$r->dir_config('lonIDsDir'); + if ((-l $env{'user.linkedenv'}) && + (readlink($env{'user.linkedenv'}) eq "$lonidsdir/$handle.id")) { + unlink($env{'user.linkedenv'}); } } my %temp=('logout' => time); @@ -242,74 +271,45 @@ sub logout { &Apache::lonnet::log($env{'user.domain'}, $env{'user.name'}, $env{'user.home'}, - "Logout $ip"); + "Logout $ENV{'REMOTE_ADDR'}"); &Apache::loncommon::content_type($r,'text/html'); - #expire the cookies - my %cookies=CGI::Cookie->parse($r->header_in('Cookie')); - foreach my $name (keys(%cookies)) { - next unless ($name =~ /^lon(|S|Link|Pub)ID$/); - my $c = new CGI::Cookie(-name => $name, - -value => '', - -expires => '-10y',); - $r->headers_out->add('Set-cookie' => $c); + #expire the cookie + my $c = new CGI::Cookie(-name => 'lonID', + -value => '', + -expires => '-10y',); + $r->headers_out->add('Set-cookie' => $c); + if ($env{'user.linkedenv'}) { + my $linked = new CGI::Cookie(-name => 'lonLinkID', + -value => '', + -expires => '-10y',); + $r->headers_out->add('Set-cookie' => $linked); + } + my $lonhost = $r->dir_config('lonHostID'); + my (%info,%user_info,%lti_info); + if (ref($lti_env) eq 'HASH') { + %lti_info = %{$lti_env}; } my $lonhost = $r->dir_config('lonHostID'); - my ($url,$token,$delay,$write_to_opener,%info,%user_info); if (ref($data) eq 'HASH') { - %user_info=('ip' => $ip, + %user_info=('ip' => $ENV{'REMOTE_ADDR'}, 'domain' => $data->{'domain'}, 'username' => $data->{'username'}, - 'home' => $data->{'home'}, 'role' => $data->{'role'}, 'origurl' => $data->{'origurl'}, 'symb' => $data->{'symb'}, 'server' => $lonhost); - $write_to_opener = $data->{'lcssowin'}; - } - $delay = 0.1; - if (ref($linkprot_info) eq 'HASH') { - if ($linkprot_info->{'linkprotuser'} ne '') { - $token = &Apache::lonnet::tmpput($linkprot_info,$lonhost); - $url = '/adm/login?ltoken='.$token; - } else { - foreach my $key (keys(%user_info)) { - if ($user_info{$key} eq '') { - delete($user_info{$key}); - } - } - %info = (%user_info,%{$linkprot_info}); - $token = &Apache::lonnet::tmpput(\%info,$lonhost); - $url = '/adm/migrateuser?token='.$token; - } - $delay = 0; - } else { - my %lti_info; - if (ref($lti_env) eq 'HASH') { - foreach my $key (sort(keys(%{$lti_env}))) { - if ($key =~ /^request\.(.+)$/) { - $lti_info{$1} = $lti_env->{$key}; - } - } - } - %info = (%user_info,%lti_info); - $token = &Apache::lonnet::tmpput(\%info,$lonhost); - $url = '/adm/migrateuser?token='.$token; } + %info = (%user_info,%lti_info); + my $token = &Apache::lonnet::tmpput(\%info,$lonhost); + my $url = '/adm/migrateuser?token='.$token; $r->send_http_header; $r->print( &Apache::loncommon::start_page('Updating Session ...',undef, - {'redirect' => [$delay,$url,'',$write_to_opener], + {'redirect' => [0.1,$url], 'only_body' => 1,}). &Apache::loncommon::end_page()); - if ($env{'request.balancercookie'}) { - my ($balancer,$cookie) = split(/:/,$env{'request.balancercookie'}); - if ((&Apache::lonnet::hostname($balancer)) && ($cookie =~ /^[a-f0-9]{32}$/)) { - $cookie = $env{'user.domain'}.'_'.$env{'user.name'}.'_'.$cookie; - &Apache::lonnet::delbalcookie($cookie,$balancer); - } - } $r->register_cleanup(\&flush_course_logs); return; } @@ -321,7 +321,7 @@ sub flush_course_logs { sub handler { my ($r) = @_; - + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['token']); my %data = &Apache::lonnet::tmpget($env{'form.token'}); if (keys(%data) == 0) { @@ -332,16 +332,15 @@ sub handler { &Apache::lonlocal::get_language_handle($r); if ($delete ne 'ok') { - return &goto_login($r,'',\%data); + return &goto_login($r,undef,\%data); } if (!defined($data{'username'}) || !defined($data{'domain'})) { - return &goto_login($r,'',\%data); + return &goto_login($r,undef,\%data); } - my $ip = &Apache::lonnet::get_requestor_ip($r,REMOTE_NOLOOKUP); - if ($data{'ip'} ne $ip) { + if ($data{'ip'} ne $ENV{'REMOTE_ADDR'}) { &Apache::lonnet::logthis('IP change when session migration requested -- was: '. - $data{'ip'}.'; now: '.$ip.' for '.$data{'username'}.':'.$data{'domain'}); + $data{'ip'}.'; now: '.$ENV{'REMOTE_ADDR'}.' for '.$data{'username'}.':'.$data{'domain'}); return &ip_changed($r,$data{'domain'},$data{'server'},\%data); } @@ -353,30 +352,17 @@ sub handler { } if ($home =~ /(con_lost|no_such_host)/) { return &goto_login($r,$udom,\%data); } - my $extra_env = &sso_check(\%data); - if (($data{'balancer'}) && ($data{'server'}) && ($data{'balcookie'})) { - if (ref($extra_env) eq 'HASH') { - $extra_env->{'request.balancercookie'} = $data{'server'}.':'.$data{'balcookie'}; - } else { - $extra_env = { 'request.balancercookie' => $data{'server'}.':'.$data{'balcookie'} }; - } - } elsif (($data{'server'}) && ($data{'otherbalcookie'})) { - my ($balancer,$balcookie) = split(/:/,$data{'otherbalcookie'}); - if (defined(&Apache::lonnet::hostname($balancer)) && $balcookie =~ /^[a-f0-9]{32}$/) { - my $baldom = &Apache::lonnet::host_domain($balancer); - if (&Apache::lonnet::shared_institution($baldom)) { - my $cookieid = join('_',$udom,$data{'username'},$balcookie); - &Apache::lonnet::updatebalcookie($cookieid,$balancer,$data{'server'}); - if (ref($extra_env) eq 'HASH') { - $extra_env->{'request.balancercookie'} = $data{'otherbalcookie'}; - } else { - $extra_env = { 'request.balancercookie' => $data{'otherbalcookie'} }; - } - } - } + my $sso_env = &sso_check(\%data); + my $lti_env = <i_check(\%data); + + my $extra_env; + if ((ref($sso_env) eq 'HASH') && (keys(%{$sso_env}))) { + $extra_env = $sso_env; + } elsif ((ref($lti_env) eq 'HASH') && (keys(%{$lti_env}))) { + $extra_env = $lti_env; } - my (%form,$cid); + my %form; if ($data{'symb'} ne '') { $form{'symb'} = $data{'symb'}; } @@ -386,145 +372,90 @@ sub handler { if ($data{'noloadbalance'} ne '') { $form{'noloadbalance'} = $data{'noloadbalance'}; } - if ($data{'role'}) { - if ($data{'role'} =~ m{\./($match_domain)/($match_courseid)(?:/\w+|$)}) { - unless (&Apache::lonnet::homeserver($2,$1) eq 'no_host') { - $cid = $1.'_'.$2; - } - } - } else { - my ($handle,$expirepub); - $handle = &Apache::lonnet::check_for_valid_session($r); -# For "public user" - remove any existing "public" cookie so actual user is logged in. - if ($handle) { - if ($handle=~/^publicuser\_/) { - my $lonidsdir=$r->dir_config('lonIDsDir'); - if ($lonidsdir ne '') { - unlink("$lonidsdir/$handle.id"); - } - undef($handle); - $expirepub = 1; - } - } + if (!$data{'role'}) { + my $handle = &Apache::lonnet::check_for_valid_session($r); if ($handle) { &Apache::lonnet::transfer_profile_to_env($r->dir_config('lonIDsDir'), $handle); - my $checklaunch; - if ($data{'origurl'} =~ m{^/tiny/$match_domain/\w+$}) { - unless ($env{'request.linkprot'} eq $data{'linkprot'}) { - $checklaunch = 1; - } - unless ($env{'request.linkprotexit'} eq $data{'linkprotexit'}) { - $checklaunch = 1; - } - unless ($env{'request.linkkey'} eq $data{'linkkey'}) { - $checklaunch = 1; - } - unless ($env{'request.deeplink.login'} eq $data{'deeplink.login'}) { - $checklaunch = 1; - } - } - if ($data{'linkprot'} ne '') { - if (($env{'user.name'} ne $data{'username'}) || - ($env{'user.domain'} ne $data{'domain'})) { - my %linkprot_env; - foreach my $item ('linkprot','linkprotexit','deeplink.login') { - if ($data{$item}) { - $linkprot_env{$item} = $data{$item}; - } - } - &logout($r,$ip,$handle,\%data,undef,\%linkprot_env); - return OK; - } - &Apache::lonnet::appenv({'request.linkprot' => $data{'linkprot'}}); - if ($data{'linkprotexit'}) { - &Apache::lonnet::appenv({'request.linkprotexit' => $data{'linkprotexit'}}); - } - if ($env{'request.linkkey'}) { - &Apache::lonnet::delenv('request.linkkey'); - } - my ($linkprotector,$deeplink) = split(/:/,$data{'linkprot'},2); - if ($env{'user.linkprotector'}) { - my @protectors = split(/,/,$env{'user.linkprotector'}); - unless (grep(/^\Q$linkprotector\E$/,@protectors)) { - push(@protectors,$linkprotector); - @protectors = sort { $a <=> $b } @protectors; - &Apache::lonnet::appenv({'user.linkprotector' => join(',',@protectors)}); + if ($data{'lti.login'}) { + my $needslogout; + if ($env{'request.lti.login'}) { + if (($env{'user.name'} ne $data{'username'}) || + ($env{'user.domain'} ne $data{'domain'})) { + $needslogout = 1; } } else { - &Apache::lonnet::appenv({'user.linkprotector' => $linkprotector }); + $needslogout = 1; } - if ($env{'user.linkproturi'}) { - my @proturis = split(/,/,$env{'user.linkproturi'}); - unless(grep(/^\Q$deeplink\E$/,@proturis)) { - push(@proturis,$deeplink); - @proturis = sort @proturis; - &Apache::lonnet::appenv({'user.linkproturi' => join(',',@proturis)}); - } - } else { - &Apache::lonnet::appenv({'user.linkproturi' => $deeplink}); - } - } elsif ($data{'linkkey'} ne '') { - &Apache::lonnet::appenv({'request.linkkey' => $data{'linkkey'}}); - if ($env{'request.linkprot'}) { - &Apache::lonnet::delenv('request.linkprot'); - } - my $deeplink = $data{'deeplink.login'}; - my $linkkey = $data{'linkkey'}; - if ($env{'user.deeplinkkey'} ne '') { - my @linkkeys = split(/,/,$env{'user.deeplinkkey'}); - unless (grep(/^\Q$linkkey\E$/,@linkkeys)) { - push(@linkkeys,$linkkey); - &Apache::lonnet::appenv({'user.deeplinkkey' => join(',',sort(@linkkeys))}); - } +# If access is via LTI, and user already has a non-LTI session cookie +# (and session) or has an LTI session cookie for a different username, +# logout the existing session, and start a new one + if ($needslogout) { + &logout($r,$handle,\%data,$lti_env); + } elsif (($data{'lti.reqcrs'}) && ($data{'lti.reqrole'} eq 'cc')) { + $form{'lti.reqcrs'} = $data{'lti.reqcrs'}; + $form{'lti.reqrole'} = $data{'lti.reqrole'}; + $form{'lti.sourcecrs'} = $data{'lti.sourcecrs'}; + $form{'lti.uri'} = $data{'lti.uri'}; + if ($data{'lti.passbackid'}) { + $form{'lti.passbackid'} = $data{'lti.passbackid'}; + } + if ($data{'lti.passbackurl'}) { + $form{'lti.passbackurl'} = $data{'lti.passbackurl'}; + } + if ($data{'lti.rosterid'}) { + $form{'lti.rosterid'} = $data{'lti.rosterid'}; + } + if ($data{'lti.rosterurl'}) { + $form{'lti.rosterurl'} = $data{'lti.rosterurl'}; + } + if ($data{'lti.target'}) { + $form{'lti.target'} = $data{'lti.target'}; + } + &Apache::loncommon::content_type($r,'text/html'); + $r->send_http_header; + &Apache::ltiauth::lti_reqcrs($r,$data{'domain'},\%form,$data{'username'},$data{'domain'}); } else { - &Apache::lonnet::appenv({'user.deeplinkkey' => $linkkey}); - } - if ($deeplink) { - if ($env{'user.keyedlinkuri'}) { - my @keyeduris = split(/,/,$env{'user.keyedlinkuri'}); - unless (grep(/^\Q$deeplink\E$/,@keyeduris)) { - push(@keyeduris,$deeplink); - &Apache::lonnet::appenv({'user.keyedlinkuri' => join(',',sort(@keyeduris))}); + if (ref($lti_env) eq 'HASH') { + delete($lti_env->{'reqcrs'}); + delete($lti_env->{'reqrole'}); + delete($lti_env->{'selfenrollrole'}); + } + if ($data{'lti.selfenrollrole'}) { + if (&Apache::ltiauth::lti_enroll($data{'username'},$data{'domain'}, + $data{'lti.selfenrollrole'}) eq 'ok') { + my $url = '/adm/roles?selectrole=1&'. + &escape($data{'lti.selfenrollrole'}).'=1'; + if ($data{'origurl'} =~ m{/default_\d+\.sequence$}) { + $url .= '&orgurl='.$data{'origurl'}.'&navmap=1'; + } elsif ($data{'origurl'} ne '') { + $url .= '&orgurl='.$data{'origurl'}; + } + if (ref($lti_env) eq 'HASH') { + &Apache::lonnet::appenv($lti_env); + } + $r->internal_redirect($url); + } else { + &Apache::ltiauth::invalid_request($r,23); } + } elsif ($data{'origurl'} ne '') { + my $url = $data{'origurl'}; + if ($url =~ m{/default_\d+\.sequence$}) { + $url .= (($url =~/\?/)?'&':'?').'navmap=1'; + } + if (ref($lti_env) eq 'HASH') { + &Apache::lonnet::appenv($lti_env); + } + $r->internal_redirect($url); } else { - &Apache::lonnet::appenv({'user.keyedlinkuri' => $deeplink}); - } - } - } - if ($data{'deeplink.login'}) { - &Apache::lonnet::appenv({'request.deeplink.login' => $data{'deeplink.login'}}); - if ($env{'environment.remote'} eq 'on') { - &Apache::lonnet::appenv({'environment.remote' => 'off'}); - } - } - if ($data{'origurl'} ne '') { - my $dest = $data{'origurl'}; - if (($env{'request.deeplink.login'} eq $data{'origurl'}) && - (($env{'request.linkprot'}) || ($env{'request.linkkey'} ne ''))) { - my %info; - if ($env{'request.linkprot'}) { - $info{'linkprot'} = $env{'request.linkprot'}; - foreach my $item ('linkprotuser','linkprotexit') { - if ($data{$item}) { - $info{$item} = $data{$item}; - } + if (ref($lti_env) eq 'HASH') { + &Apache::lonnet::appenv($lti_env); } - } elsif ($env{'request.linkkey'} ne '') { - $info{'linkkey'} = $env{'request.linkkey'}; - } - $info{'origurl'} = $data{'origurl'}; - if ($checklaunch) { - $info{'checklaunch'} = 1; - } - my $token = &Apache::lonnet::tmpput(\%info,$r->dir_config('lonHostID'),'link'); - unless (($token eq 'con_lost') || ($token eq 'refused') || ($token =~ /^error:/) || - ($token eq 'unknown_cmd') || ($token eq 'no_such_host')) { - $dest .= (($dest =~ /\?/) ? '&' : '?') . 'ttoken='.$token; } } - $r->internal_redirect($dest); + } elsif ($data{'origurl'} ne '') { + $r->internal_redirect($data{'origurl'}); } elsif ($env{'request.course.id'}) { $r->internal_redirect('/adm/navmaps'); } else { @@ -534,56 +465,20 @@ sub handler { my $desturl = '/adm/roles'; if ($data{'origurl'} ne '') { $desturl = $data{'origurl'}; - if ($data{'linkprot'}) { - my ($linkprotector,$linkuri) = split(/:/,$data{'linkprot'},2); - if ($linkprotector) { - if (ref($extra_env) eq 'HASH') { - $extra_env->{'user.linkprotector'} = $linkprotector; - $extra_env->{'user.linkproturi'} = $linkuri; - $extra_env->{'request.linkprot'} = $data{'linkprot'}; - } else { - $extra_env = {'user.linkprotector' => $linkprotector, - 'user.linkproturi' => $linkuri, - 'request.linkprot' => $data{'linkprot'}}; - } - if ($data{'linkprotexit'}) { - $extra_env->{'request.linkprotexit'} = $data{'linkprotexit'}; - } - } - foreach my $item ('linkprotuser','linkprotexit') { - if ($data{$item} ne '') { - $form{$item} = $data{$item}; - } - } - } elsif ($data{'linkkey'}) { - if (ref($extra_env) eq 'HASH') { - $extra_env->{'user.deeplinkkey'} = $data{'linkkey'}; - $extra_env->{'user.keyedlinkuri'} = $data{'deeplink.login'}; - $extra_env->{'request.linkkey'} = $data{'linkkey'}; - } else { - $extra_env = {'user.deeplinkkey' => $data{'linkkey'}, - 'user.keyedlinkuri' => $data{'deeplink.login'}, - 'request.linkkey' => $data{'linkkey'}}; - } - } - if ($data{'deeplink.login'}) { - if (ref($extra_env) eq 'HASH') { - $extra_env->{'request.deeplink.login'} = $data{'deeplink.login'}; - } else { - $extra_env = {'request.deeplink.login' => $data{'deeplink.login'}}; - } - } - if ($desturl eq '/adm/email') { - if (($data{'display'}) && ($data{'mailrecip'})) { - if (&unescape($data{'mailrecip'}) eq "$data{'username'}:$data{'domain'}") { - $form{'display'} = &unescape($data{'display'}); - } + if ($data{'lti.login'}) { + $desturl = $data{'origurl'}; + if ($desturl =~ m{/default_\d+\.sequence$}) { + $desturl .= (($desturl =~/\?/)?'&':'?').'navmap=1'; } } } + my $skipcritical; + if (($data{'lti.login'}) && ($data{'lti.reqcrs'}) && + ($data{'lti.reqrole'} eq 'cc')) { + $skipcritical = 1; + } &Apache::lonauth::success($r,$data{'username'},$data{'domain'}, - $home,$desturl,$extra_env,\%form,'', - $expirepub,$data{'lcssowin'}); + $home,$desturl,$extra_env,\%form,$skipcritical); } return OK; } @@ -591,29 +486,15 @@ sub handler { my $next_url='/adm/roles?selectrole=1&'.&escape($data{'role'}).'=1'; if ($data{'origurl'} ne '') { $next_url .= '&orgurl='.&escape($data{'origurl'}); - } - if ($data{'deeplink.login'}) { - if (ref($extra_env) eq 'HASH') { - $extra_env->{'request.deeplink.login'} = $data{'deeplink.login'}; - } else { - $extra_env = {'request.deeplink.login' => $data{'deeplink.login'}}; - } - if ($data{'linkprot'}) { - $extra_env->{'request.linkprot'} = $data{'linkprot'}; - if ($data{'linkprotexit'}) { - $extra_env->{'request.linkprotexit'} = $data{'linkprotexit'}; - } - foreach my $item ('linkprotuser','linkprotexit') { - if ($data{$item}) { - $form{'request.'.$item} = $data{$item}; - } + if ($data{'lti.login'}) { + if (($data{'origurl'} =~ m{/default_\d+\.sequence$}) || + ($data{'origurl'} =~ m{^/res/.+\.sequence$})) { + $next_url .= '&navmap=1'; } - } elsif ($data{'linkkey'} ne '') { - $extra_env->{'request.linkkey'} = $data{'linkkey'}; } } &Apache::lonauth::success($r,$data{'username'},$data{'domain'},$home, - $next_url,$extra_env,\%form,$cid,'',$data{'lcssowin'}); + $next_url,$extra_env,\%form); return OK; }