--- loncom/auth/lonacc.pm	2021/01/02 22:11:26	1.159.2.17
+++ loncom/auth/lonacc.pm	2022/08/30 11:58:44	1.159.2.21.2.3
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Cookie Based Access Handler
 #
-# $Id: lonacc.pm,v 1.159.2.17 2021/01/02 22:11:26 raeburn Exp $
+# $Id: lonacc.pm,v 1.159.2.21.2.3 2022/08/30 11:58:44 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -102,6 +102,7 @@ use Apache::loncommon();
 use Apache::lonlocal;
 use Apache::restrictedaccess();
 use Apache::blockedaccess();
+use Apache::lonprotected();
 use Fcntl qw(:flock);
 use LONCAPA qw(:DEFAULT :match);
 
@@ -159,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') {
@@ -271,10 +273,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
 
@@ -296,7 +306,9 @@ sub sso_login {
     my $query = $r->args;
     my %form;
     if ($query) {
-        my @items = ('role','symb','iptoken');
+
+        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})) {
@@ -314,10 +326,150 @@ 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;
+            }
+            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 ");
@@ -340,7 +492,7 @@ sub sso_login {
                     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);
+                        $otherserver = &Apache::lonnet::spareserver($r,$lowest_load,$lowest_load,1,$domain);
                     }
                     if ($otherserver ne '') {
                         my @hosts = &Apache::lonnet::current_machine_ids();
@@ -355,6 +507,32 @@ 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'}) || ($form{'origurl'})) {
+                unless (($r->uri eq '/adm/roles') || ($r->uri eq '/adm/sso')) {
+                    $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;
+                }
+            }
             $env{'request.sso.login'} = 1;
             if (defined($r->dir_config("lonSSOReloginServer"))) {
                 $env{'request.sso.reloginserver'} =
@@ -364,28 +542,51 @@ 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 = $r->get_remote_host();
+            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') {
+            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'}) {
+            unless (($info{'symb'}) || ($info{'origurl'})) {
                 unless (($r->uri eq '/adm/roles') || ($r->uri eq '/adm/sso')) {
                     $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->dir_config("ssodirecturl") == 1) {
                 $info{'origurl'} = $r->uri;
             }
@@ -396,9 +597,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);
@@ -423,6 +622,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 {
@@ -462,7 +663,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);
         }
@@ -541,7 +742,7 @@ sub handler {
             my $hostname = $r->hostname();
             my $lonhost = &Apache::lonnet::host_from_dns($hostname);
             if ($lonhost) {
-                my $actual = &Apache::lonnet::absolute_url($hostname);
+                my $actual = &Apache::lonnet::absolute_url($hostname,1,1);
                 my $expected = $Apache::lonnet::protocol{$lonhost}.'://'.$hostname;
                 unless ($actual eq $expected) {
                     $env{'request.use_absolute'} = $expected;
@@ -586,7 +787,57 @@ 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;
+            }
+            return OK;
+        }
 # ---------------------------------------------------------------- Check access
 	my $now = time;
         my ($check_symb,$check_access,$check_block,$access,$poss_symb);
@@ -598,7 +849,8 @@ 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/coursedocs/showdoc/}) ||
+                ($requrl=~m{^(/adm/wrapper|)/adm/$cdom/$cnum/\d+/ext\.tool$})) {
                 $check_block = 1;
             }
         }
@@ -611,7 +863,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+/ext\.tool$})) {
                 $check_symb = 1;
             }
         }
@@ -644,6 +897,9 @@ sub handler {
                         if ((!$env{'request.role.adv'}) && ($env{'acc.randomout'}) &&
                             ($env{'acc.randomout'}=~/\&\Q$poss_symb\E\&/)) {
                             undef($poss_symb);
+                        } elsif ((!$env{'request.role.adv'}) && ($env{'acc.deeplinkout'}) &&
+                                 ($env{'acc.deeplinkout'}=~/\&\Q$poss_symb\E\&/)) {
+                            undef($poss_symb);
                         }
                     }
                 }
@@ -653,7 +909,19 @@ sub handler {
                     $access=&Apache::lonnet::allowed('bre',$requrl,'','','','',1);
                 }
             } else {
-                $access=&Apache::lonnet::allowed('bre',$requrl);
+                my $nodeeplinkcheck;
+                if (($check_access) && ($requrl =~ /\.(sequence|page)$/)) {
+                    unless ($env{'form.navmap'}) {
+                        if ($r->args ne '') {
+                            &Apache::loncommon::get_unprocessed_cgi($r->args,['navmap']);
+                            unless ($env{'form.navmap'}) {
+                                $nodeeplinkcheck = 1;
+                            }
+                        }
+                    }
+                }
+                my $clientip = &Apache::lonnet::get_requestor_ip($r);
+                $access=&Apache::lonnet::allowed('bre',$requrl,'','',$clientip,'','',$nodeeplinkcheck);
             }
         }
         if ($check_block) {
@@ -691,6 +959,10 @@ sub handler {
                 &Apache::blockedaccess::setup_handler($r);
                 return OK;
             }
+            if ($access eq 'D') {
+                &Apache::lonprotected::setup_handler($r);
+                return OK;
+            }
 	    if (($access ne '2') && ($access ne 'F')) {
                 if ($requrl =~ m{^/res/}) {
                     $access = &Apache::lonnet::allowed('bro',$requrl);
@@ -707,7 +979,7 @@ sub handler {
                         }
                     }
                 } elsif (($handle =~ /^publicuser_\d+$/) && (&Apache::lonnet::is_portfolio_url($requrl))) {
-                    my $clientip = $r->get_remote_host();
+                    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;
@@ -756,18 +1028,32 @@ sub handler {
 		}
 		if ($env{'form.symb'}) {
 		    $symb=&Apache::lonnet::symbclean($env{'form.symb'});
-                    if ($requrl eq '/adm/navmaps') {
-                        my ($map,$mid,$murl)=&Apache::lonnet::decode_symb($symb);
-                        &Apache::lonnet::symblist($map,$murl => [$murl,$mid]);
-                    } elsif ($requrl =~ m|^/adm/wrapper/|
-			|| $requrl =~ m|^/adm/coursedocs/showdoc/|) {
-			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);
+                    if (($requrl eq '/adm/navmaps') ||
+                        ($requrl =~ m{^/adm/wrapper/}) ||
+                        ($requrl =~ m{^/adm/coursedocs/showdoc/})) {
+                        unless (&Apache::lonnet::symbverify($symb,$requrl)) {
+                            if (&Apache::lonnet::is_on_map($requrl)) {
+                                $symb = &Apache::lonnet::symbread($requrl);
+                                unless (&Apache::lonnet::symbverify($symb,$requrl)) {
+                                    undef($symb);
+                                }
+                            }
+                        }
+                        if ($symb) {
+                            if ($requrl eq '/adm/navmaps') {
+                                my ($map,$mid,$murl)=&Apache::lonnet::decode_symb($symb);
+                                &Apache::lonnet::symblist($map,$murl => [$murl,$mid]);
+                            } elsif (($requrl =~ m{^/adm/wrapper/}) ||
+                                     ($requrl =~ m{^/adm/coursedocs/showdoc/})) {
+                                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);
+                                }
+                                &Apache::lonnet::symblist($map,$murl => [$murl,$mid],
+                                                          'last_known' =>[$murl,$mid]);
+                            }
                         }
-			&Apache::lonnet::symblist($map,$murl => [$murl,$mid],
-						  'last_known' =>[$murl,$mid]);
 		    } elsif ((&Apache::lonnet::symbverify($symb,$requrl)) ||
 			     (($requrl=~m|(.*)/smpedit$|) &&
 			      &Apache::lonnet::symbverify($symb,$1)) ||
@@ -827,10 +1113,14 @@ sub handler {
                                 }
                             }
                             if ($invalidsymb) {
-                                $r->log_reason('Invalid symb for '.$requrl.': '.$symb);
-                                $env{'user.error.msg'}=
-                                    "$requrl:bre:1:1:Invalid Access";
-                                return HTTP_NOT_ACCEPTABLE;
+                                if ($requrl eq '/adm/navmaps') {
+                                    undef($symb);
+                                } else {
+                                    $r->log_reason('Invalid symb for '.$requrl.': '.$symb);
+                                    $env{'user.error.msg'}=
+                                        "$requrl:bre:1:1:Invalid Access";
+                                    return HTTP_NOT_ACCEPTABLE;
+                                }
                             }
                         }
                     }
@@ -897,7 +1187,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 $clientip = &Apache::lonnet::get_requestor_ip($r);
 	my $access=&Apache::lonnet::allowed('bre',$requrl,undef,undef,$clientip);
 	if ($access eq 'A') {
 	    &Apache::restrictedaccess::setup_handler($r);