--- loncom/auth/lonacc.pm 2021/08/06 12:39:59 1.193
+++ loncom/auth/lonacc.pm 2022/09/17 23:38:50 1.207
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Cookie Based Access Handler
#
-# $Id: lonacc.pm,v 1.193 2021/08/06 12:39:59 raeburn Exp $
+# $Id: lonacc.pm,v 1.207 2022/09/17 23:38:50 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -160,7 +160,8 @@ sub get_posted_cgi {
if (length($value) == 1) {
$value=~s/[\r\n]$//;
}
- } elsif ($fname =~ /\.(xls|doc|ppt)(x|m)$/i) {
+ }
+ if ($fname =~ /\.(xls|doc|ppt)(x|m)$/i) {
$value=~s/[\r\n]$//;
}
if (ref($fields) eq 'ARRAY') {
@@ -280,10 +281,18 @@ sub upload_size_allowed {
be identified by the third arg ($usename), except when lonacc is called in
an internal redirect to /adm/switchserver (e.g., load-balancing following
successful authentication) -- no cookie set yet. For that particular case
- simply skip the call to sso_login().
+ simply skip the call to sso_login().
returns OK if it was SSO and user was handled.
returns undef if not SSO or no means to handle the user.
+
+ In the case where the session was started from /adm/launch/tiny/$domain/$id,
+ i.e., for a protected link, with launch from another CMS, and user information
+ is accepted from the LTI payload, then, if the user has privileged roles,
+ authentication will be required. If SSO authentication is with a username
+ and/or domain that differ from the username in the LTI payload and domain
+ in the launch URL, then $r->user() will be unset and /adm/relaunch will be
+ called.
=cut
@@ -305,7 +314,8 @@ sub sso_login {
my $query = $r->args;
my %form;
if ($query) {
- my @items = ('role','symb','iptoken','origurl');
+ my @items = ('role','symb','iptoken','origurl','ttoken',
+ 'ltoken','linkkey','logtoken','sso','lcssowin');
&Apache::loncommon::get_unprocessed_cgi($query,\@items);
foreach my $item (@items) {
if (defined($env{'form.'.$item})) {
@@ -323,10 +333,152 @@ sub sso_login {
}
}
+ my ($linkprot,$linkprotuser,$linkprotexit,$linkkey,$deeplinkurl);
+
+#
+# If Shibboleth auth is in use, and a dual SSO and non-SSO login page
+# is in use, then the query string will contain the logtoken item with
+# a value set to the name of a .tmp file in /home/httpd/perl/tmp
+# containing the url to display after authentication, and also,
+# optionally, role and symb, or linkprot or linkkey (deep-link access).
+#
+# If Shibboleth auth is in use, but a dual log-in page is not in use,
+# and the originally requested URL was /tiny/$domain/$id (i.e.,
+# for deeplinking), then the query string will contain the sso item
+# with a value set to the name of a .tmp file in /home/httpd/perl/tmp
+# containing the url to display after authentication, and also,
+# optionally, linkprot or linkkey (deep-link access).
+#
+# Otherwise the query string may contain role and symb, or if the
+# originally requested URL was /tiny/$domain/$id (i.e. for deeplinking)
+# then the query string may contain a ttoken item with a value set
+# to the name of a .tmp file in /home/httpd/perl/tmp containing either
+# linkprot or linkkey (deep-link access).
+#
+# If deep-linked, i.e., the originally requested URL was /tiny/$domain/$id
+# the linkkey may have originally been sent in POSTed data, which will
+# have been processed in lontrans.pm
+#
+
+ if ($form{'ttoken'}) {
+ my %info = &Apache::lonnet::tmpget($form{'ttoken'});
+ &Apache::lonnet::tmpdel($form{'ttoken'});
+ if ($info{'origurl'}) {
+ $form{'origurl'} = $info{'origurl'};
+ if ($form{'origurl'} =~ m{^/tiny/$match_domain/\w+$}) {
+ $deeplinkurl = $form{'origurl'};
+ }
+ }
+ if ($info{'linkprot'}) {
+ $linkprot = $info{'linkprot'};
+ $linkprotuser = $info{'linkprotuser'};
+ $linkprotexit = $info{'linkprotexit'};
+ } elsif ($info{'linkkey'} ne '') {
+ $linkkey = $info{'linkkey'};
+ }
+ } elsif ($form{'logtoken'}) {
+ my ($firsturl,@rest);
+ my $lonhost = $r->dir_config('lonHostID');
+ my $tmpinfo = &Apache::lonnet::reply('tmpget:'.$form{'logtoken'},$lonhost);
+ my $delete = &Apache::lonnet::tmpdel($form{'logtoken'});
+ unless (($tmpinfo=~/^error/) || ($tmpinfo eq 'con_lost') ||
+ ($tmpinfo eq 'no_such_host')) {
+ (undef,$firsturl,@rest) = split(/&/,$tmpinfo);
+ if ($firsturl ne '') {
+ $firsturl = &unescape($firsturl);
+ }
+ foreach my $item (@rest) {
+ my ($key,$value) = split(/=/,$item);
+ $form{$key} = &unescape($value);
+ }
+ 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'};
+ } elsif ($form{'linkkey'} ne '') {
+ $linkkey = $form{'linkkey'};
+ }
+ if ($form{'iptoken'}) {
+ %sessiondata = &Apache::lonnet::tmpget($form{'iptoken'});
+ my $delete = &Apache::lonnet::tmpdel($form{'iptoken'});
+ }
+ }
+ } elsif ($form{'sso'}) {
+ my $lonhost = $r->dir_config('lonHostID');
+ my $info = &Apache::lonnet::reply('tmpget:'.$form{'sso'},$lonhost);
+ &Apache::lonnet::tmpdel($form{'sso'});
+ unless (($info=~/^error/) || ($info eq 'con_lost') ||
+ ($info eq 'no_such_host')) {
+ my ($firsturl,@rest)=split(/\&/,$info);
+ if ($firsturl ne '') {
+ $form{'origurl'} = &unescape($firsturl);
+ if ($form{'origurl'} =~ m{^/tiny/$match_domain/\w+$}) {
+ $deeplinkurl = $form{'origurl'};
+ }
+ }
+ foreach my $item (@rest) {
+ my ($key,$value) = split(/=/,$item);
+ $form{$key} = &unescape($value);
+ }
+ if ($form{'linkprot'}) {
+ $linkprot = $form{'linkprot'};
+ $linkprotuser = $form{'linkprotuser'};
+ $linkprotexit = $form{'linkprotexit'};
+ } elsif ($form{'linkkey'} ne '') {
+ $linkkey = $form{'linkkey'};
+ }
+ }
+ } 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'};
+ }
+ }
+ my $delete = &Apache::lonnet::tmpdel($form{'ltoken'});
+ delete($form{'ltoken'});
+ if ($form{'origurl'} =~ m{^/tiny/$match_domain/\w+$}) {
+ $deeplinkurl = $form{'origurl'};
+ }
+ } elsif ($form{'linkkey'} ne '') {
+ $linkkey = $form{'linkkey'};
+ }
+
my $domain = $r->dir_config('lonSSOUserDomain');
if ($domain eq '') {
$domain = $r->dir_config('lonDefDomain');
}
+ if (($deeplinkurl) && ($linkprot) && ($linkprotuser ne '')) {
+ unless ($linkprotuser eq $user.':'.$domain) {
+ $r->user();
+ my %data = (
+ origurl => $deeplinkurl,
+ linkprot => $linkprot,
+ linkprotuser => $linkprotuser,
+ linkprotexit => $linkprotexit,
+ );
+ 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')) {
+ $r->internal_redirect('/adm/relaunch?rtoken='.$token);
+ $r->set_handlers('PerlHandler'=> undef);
+ return OK;
+ }
+ }
+ }
my $home=&Apache::lonnet::homeserver($user,$domain);
if ($home !~ /(con_lost|no_host|no_such_host)/) {
&Apache::lonnet::logthis(" SSO authorized user $user ");
@@ -372,6 +524,30 @@ sub sso_login {
$env{'form.origurl'} = $r->uri;
}
}
+ if (($r->uri eq '/adm/sso') && ($form{'origurl'} =~ m{^/+tiny/+$match_domain/+\w+$})) {
+ $env{'request.deeplink.login'} = $form{'origurl'};
+ } elsif ($r->uri =~ m{^/+tiny/+$match_domain/+\w+$}) {
+ $env{'request.deeplink.login'} = $r->uri;
+ }
+ if ($env{'request.deeplink.login'}) {
+ if ($linkprot) {
+ $env{'request.linkprot'} = $linkprot;
+ if ($linkprotuser ne '') {
+ $env{'request.linkprotuser'} = $linkprotuser;
+ }
+ if ($linkprotexit ne '') {
+ $env{'request.linkprotexit'} = $linkprotexit;
+ }
+ } 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'} =
@@ -381,6 +557,9 @@ 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 {
@@ -393,9 +572,11 @@ sub sso_login {
'server' => $r->dir_config('lonHostID'),
'sso.login' => 1
);
- foreach my $item ('role','symb','iptoken','origurl') {
+ foreach my $item ('role','symb','iptoken','origurl','lcssowin') {
if (exists($form{$item})) {
$info{$item} = $form{$item};
+ } elsif ($sessiondata{$item} ne '') {
+ $info{$item} = $sessiondata{$item};
}
}
unless (($info{'symb'}) || ($info{'origurl'})) {
@@ -403,6 +584,30 @@ sub sso_login {
$info{'origurl'} = $r->uri;
}
}
+ if (($r->uri eq '/adm/sso') && ($form{'origurl'} =~ m{^/+tiny/+$match_domain/+\w+$})) {
+ $info{'deeplink.login'} = $form{'origurl'};
+ } elsif ($r->uri =~ m{^/+tiny/+$match_domain/+\w+$}) {
+ $info{'deeplink.login'} = $r->uri;
+ }
+ if ($info{'deeplink.login'}) {
+ if ($linkprot) {
+ $info{'linkprot'} = $linkprot;
+ if ($linkprotuser ne '') {
+ $info{'linkprotuser'} = $linkprotuser;
+ }
+ if ($linkprotexit ne '') {
+ $info{'linkprotexit'} = $linkprotexit;
+ }
+ } 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;
}
@@ -413,9 +618,7 @@ sub sso_login {
if (($is_balancer) && ($hosthere)) {
$info{'noloadbalance'} = $hosthere;
}
- my $token =
- &Apache::lonnet::tmpput(\%info,
- $r->dir_config('lonHostID'));
+ my $token = &Apache::lonnet::tmpput(\%info,$r->dir_config('lonHostID'),'sso');
$env{'form.token'} = $token;
$r->internal_redirect('/adm/migrateuser');
$r->set_handlers('PerlHandler'=> undef);
@@ -440,6 +643,8 @@ sub sso_login {
$r->subprocess_env->set('SSOUserUnknown' => $user);
$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.
$r->set_handlers('PerlHandler'=> [\&Apache::createaccount::handler]);
$r->handler('perl-script');
} else {
@@ -479,7 +684,7 @@ sub handler {
if ($handle eq '') {
unless ((($requrl eq '/adm/switchserver') && (!$r->is_initial_req())) ||
($requrl =~ m{^/public/$match_domain/$match_courseid/syllabus}) ||
- ($requrl =~ m{^/adm/help/}) ||
+ ($requrl =~ m{^/adm/help/}) || ($requrl eq '/adm/sso') ||
($requrl =~ m{^/res/$match_domain/$match_username/})) {
$r->log_reason("Cookie not valid", $r->filename);
}
@@ -592,7 +797,7 @@ sub handler {
if (($found_server) && ($balancer_cookie =~ /^\Q$env{'user.domain'}\E_\Q$env{'user.name'}\E_/)) {
$otherserver = $found_server;
}
- unless ($requrl eq '/adm/switchserver') {
+ unless ($requrl eq '/adm/switchserver') {
$r->set_handlers('PerlResponseHandler'=>
[\&Apache::switchserver::handler]);
}
@@ -606,13 +811,55 @@ sub handler {
}
}
if ($requrl=~m{^/+tiny/+$match_domain/+\w+$}) {
+ if ($r->args) {
+ &Apache::loncommon::get_unprocessed_cgi($r->args,['ttoken']);
+ if (defined($env{'form.ttoken'})) {
+ my %info = &Apache::lonnet::tmpget($env{'form.ttoken'});
+ if (($info{'origurl'} ne '') && ($info{'origurl'} eq $requrl)) {
+ my %data;
+ if (($info{'linkprotuser'} ne '') && ($info{'linkprot'}) &&
+ ($info{'linkprotuser'} ne $env{'user.name'}.':'.$env{'user.domain'})) {
+ %data = (
+ origurl => $requrl,
+ linkprot => $info{'linkprot'},
+ linkprotuser => $info{'linkprotuser'},
+ linkprotexit => $info{'linkprotexit'},
+ );
+ } elsif ($info{'ltoken'} ne '') {
+ my %ltoken_info = &Apache::lonnet::tmpget($info{'ltoken'});
+ if (($ltoken_info{'linkprotuser'} ne '') && ($ltoken_info{'linkprot'}) &&
+ ($ltoken_info{'linkprotuser'} ne $env{'user.name'}.':'.$env{'user.domain'})) {
+ %data = (
+ origurl => $requrl,
+ linkprot => $ltoken_info{'linkprot'},
+ linkprotuser => $ltoken_info{'linkprotuser'},
+ linkprotexit => $ltoken_info{'linkprotexit'},
+ );
+ }
+ }
+ if (keys(%data)) {
+ my $delete = &Apache::lonnet::tmpdel($env{'form.ttoken'});
+ if ($info{'ltoken'} ne '') {
+ my $delete = &Apache::lonnet::tmpdel($info{'ltoken'});
+ }
+ my $token =
+ &Apache::lonnet::tmpput(\%data,$r->dir_config('lonHostID'),'retry');
+ unless (($token eq 'con_lost') || ($token eq 'refused') || ($token =~ /^error:/) ||
+ ($token eq 'unknown_cmd') || ($token eq 'no_such_host')) {
+ $r->internal_redirect('/adm/relaunch?rtoken='.$token);
+ $r->set_handlers('PerlHandler'=> undef);
+ return OK;
+ }
+ }
+ }
+ }
+ }
if ($env{'user.name'} eq 'public' &&
$env{'user.domain'} eq 'public') {
$env{'request.firsturl'}=$requrl;
return FORBIDDEN;
- } else {
- return OK;
}
+ return OK;
}
# ---------------------------------------------------------------- Check access
my $now = time;
@@ -696,7 +943,8 @@ sub handler {
}
}
}
- $access=&Apache::lonnet::allowed('bre',$requrl,'','','','','',$nodeeplinkcheck);
+ my $clientip = &Apache::lonnet::get_requestor_ip($r);
+ $access=&Apache::lonnet::allowed('bre',$requrl,'','',$clientip,'','',$nodeeplinkcheck);
}
}
if ($check_block) {
@@ -754,7 +1002,7 @@ sub handler {
}
}
} elsif (($handle =~ /^publicuser_\d+$/) && (&Apache::lonnet::is_portfolio_url($requrl))) {
- my $clientip = &Apache::lonnet::get_requestor_ip($r);
+ my $clientip = &Apache::lonnet::get_requestor_ip($r);
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;
@@ -823,7 +1071,7 @@ sub handler {
my ($map,$mid,$murl)=&Apache::lonnet::decode_symb($symb);
if ($map =~ /\.page$/) {
my $mapsymb = &Apache::lonnet::symbread($map);
- ($map,$mid,$murl)=&Apache::lonnet::decode_symb($mapsymb);
+ ($map,$mid,$murl)=&Apache::lonnet::decode_symb($mapsymb);
}
&Apache::lonnet::symblist($map,$murl => [$murl,$mid],
'last_known' =>[$murl,$mid]);
500 Internal Server Error
Internal Server Error
The server encountered an internal error or
misconfiguration and was unable to complete
your request.
Please contact the server administrator at
root@localhost to inform them of the time this error occurred,
and the actions you performed just before this error.
More information about this error may be available
in the server error log.