--- loncom/auth/lonacc.pm	2005/02/21 18:22:04	1.60.2.1
+++ loncom/auth/lonacc.pm	2006/06/16 22:54:30	1.80
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Cookie Based Access Handler
 #
-# $Id: lonacc.pm,v 1.60.2.1 2005/02/21 18:22:04 albertel Exp $
+# $Id: lonacc.pm,v 1.80 2006/06/16 22:54:30 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,16 +25,6 @@
 #
 # http://www.lon-capa.org/
 #
-# YEAR=1999
-# 5/21/99,5/22,5/29,5/31,6/15,16/11,22/11,
-# YEAR=2000
-# 01/06,01/13,05/31,06/01,09/06,09/25,09/28,10/30,11/6,
-# 12/25,12/26,
-# YEAR=2001
-# 01/06/01,05/28,8/11,9/26,11/29 Gerd Kortemeyer
-# YEAR=2002
-# 1/4,2/25 Gerd Kortemeyer
-#
 ###
 
 package Apache::lonacc;
@@ -48,19 +38,169 @@ use Apache::lonlocal;
 use CGI::Cookie();
 use Fcntl qw(:flock);
 
+sub cleanup {
+    my ($r)=@_;
+    if (! $r->is_initial_req()) { return DECLINED; }
+    &Apache::lonnet::save_cache();
+    return OK;
+}
+
+sub goodbye {
+    my ($r)=@_;
+    &Apache::lonnet::goodbye();
+    return DONE;
+}
+
+###############################################
+
+sub get_posted_cgi {
+    my ($r) = @_;
+
+    my $buffer;
+    if ($r->header_in('Content-length')) {
+	$r->read($buffer,$r->header_in('Content-length'),0);
+    }
+    unless ($buffer=~/^(\-+\w+)\s+Content\-Disposition\:\s*form\-data/si) {
+	my @pairs=split(/&/,$buffer);
+	my $pair;
+	foreach $pair (@pairs) {
+	    my ($name,$value) = split(/=/,$pair);
+	    $value =~ tr/+/ /;
+	    $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
+	    $name  =~ tr/+/ /;
+	    $name  =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
+	    &Apache::loncommon::add_to_env("form.$name",$value);
+	}
+    } else {
+	my $contentsep=$1;
+	my @lines = split (/\n/,$buffer);
+	my $name='';
+	my $value='';
+	my $fname='';
+	my $fmime='';
+	my $i;
+	for ($i=0;$i<=$#lines;$i++) {
+	    if ($lines[$i]=~/^$contentsep/) {
+		if ($name) {
+		    chomp($value);
+		    if ($fname) {
+			$env{"form.$name.filename"}=$fname;
+			$env{"form.$name.mimetype"}=$fmime;
+		    } else {
+			$value=~s/\s+$//s;
+		    }
+		    &Apache::loncommon::add_to_env("form.$name",$value);
+		}
+		if ($i<$#lines) {
+		    $i++;
+		    $lines[$i]=~
+		/Content\-Disposition\:\s*form\-data\;\s*name\=\"([^\"]+)\"/i;
+		    $name=$1;
+		    $value='';
+		    if ($lines[$i]=~/filename\=\"([^\"]+)\"/i) {
+			$fname=$1;
+			if 
+                            ($lines[$i+1]=~/Content\-Type\:\s*([\w\-\/]+)/i) {
+				$fmime=$1;
+				$i++;
+			    } else {
+				$fmime='';
+			    }
+		    } else {
+			$fname='';
+			$fmime='';
+		    }
+		    $i++;
+		}
+	    } else {
+		$value.=$lines[$i]."\n";
+	    }
+	}
+    }
+#
+# Digested POSTed values
+#
+# Remember the way this was originally done (GET or POST)
+#
+    $env{'request.method'}=$ENV{'REQUEST_METHOD'};
+#
+# There may also be stuff in the query string
+# Tell subsequent handlers that this was GET, not POST, so they can access query string.
+# Also, unset POSTed content length to cover all tracks.
+#
+
+    $r->method_number(M_GET);
+
+    $r->method('GET');
+    $r->headers_in->unset('Content-length');
+}
+
+sub portfolio_access {
+    my ($udom,$unum,$file_name,$group) = @_;
+    my $current_perms = &Apache::lonnet::get_portfile_permissions($udom,$unum);
+    my %access_controls = &Apache::lonnet::get_access_controls(
+                                             $current_perms,$group,$file_name);
+    my ($public);
+    my $now = time;
+    my $access_hash = $access_controls{$file_name};
+    if (ref($access_hash) eq 'HASH') {
+        foreach my $key (keys(%{$access_hash})) {
+            my ($num,$scope,$end,$start) = ($key =~ /^([^:]+):([a-z]+)_(\d*)_?(\d*)$/);
+            if ($start > $now) {
+                next;
+            }
+            if ($end && $end<$now) {
+                next;
+            }
+            if ($scope eq 'public') {
+                $public = $key;
+                last;
+            }
+        }
+        if ($public) {
+            return 'ok';
+        }
+    }
+    return;
+}
+
 sub handler {
     my $r = shift;
     my $requrl=$r->uri;
     my %cookies=CGI::Cookie->parse($r->header_in('Cookie'));
-    if ($r->header_in('User-Agent')=~/NSDL\_Search\_Bot/) {
-       return OK;
-    }
     my $lonid=$cookies{'lonID'};
     my $cookie;
+    my $lonidsdir=$r->dir_config('lonIDsDir');
+
+    my $handle;
     if ($lonid) {
-	my $handle=$lonid->value;
+	$handle=$lonid->value;
         $handle=~s/\W//g;
-        my $lonidsdir=$r->dir_config('lonIDsDir');
+    }
+      
+    my ($sso_login);
+    if ($r->user 
+	&& (!$lonid || !-e "$lonidsdir/$handle.id" || $handle eq '') ) {
+	$sso_login = 1;
+	my $domain = $r->dir_config('lonDefDomain');
+	my $home=&Apache::lonnet::homeserver($r->user,$domain);
+	if ($home !~ /(con_lost|no_such_host)/) {
+	    $handle=&Apache::lonauth::success($r,$r->user,$domain,
+					     $home,'noredirect');
+	    $r->header_out('Set-cookie',"lonID=$handle; path=/");
+	}
+    }
+
+    if ($sso_login) {
+	&Apache::lonnet::appenv('request.sso.login' => 1);
+    }
+
+    if ($r->dir_config("lonBalancer") eq 'yes') {
+	$r->set_handlers('PerlResponseHandler'=>
+			 [\&Apache::switchserver::handler]);
+    }
+
+    if ($handle ne '') {
         if ((-e "$lonidsdir/$handle.id") && ($handle ne '')) {
 
 # ------------------------------------------------------ Initialize Environment
@@ -74,44 +214,64 @@ sub handler {
 # -------------------------------------------------------------- Resource State
 
             if ($requrl=~/^\/+(res|uploaded)\//) {
-               $ENV{'request.state'} = "published";
+               $env{'request.state'} = "published";
 	    } else {
-	       $ENV{'request.state'} = 'unknown';
+	       $env{'request.state'} = 'unknown';
             }
-            $ENV{'request.filename'} = $r->filename;
-            $ENV{'request.noversionuri'} = &Apache::lonnet::deversion($requrl);
+            $env{'request.filename'} = $r->filename;
+            $env{'request.noversionuri'} = &Apache::lonnet::deversion($requrl);
 # -------------------------------------------------------- Load POST parameters
 
-	    &Apache::loncommon::get_posted_cgi($r);
+	    &Apache::lonacc::get_posted_cgi($r);
 
 # ---------------------------------------------------------------- Check access
-
+            my $now = time;
+            if ($requrl =~ m|/+uploaded/([^/]+)/([^/]+)/portfolio(/.+)$|) {
+                my $result = &portfolio_access($1,$2,$3);
+                if ($result eq 'ok') {
+                    return OK;
+                }
+            } elsif ($requrl =~ m|/+uploaded/([^/]+)/([^/]+)/groups/([^/]+)/portfolio/(.+)$|) {
+                my $result = &portfolio_access($1,$2,$4.'/'.$3,$3);
+                if ($result eq 'ok') {
+                    return OK;
+                }
+            }
             if ($requrl!~/^\/adm|public|prtspool\//) {
 		my $access=&Apache::lonnet::allowed('bre',$requrl);
                 if ($access eq '1') {
-		   $ENV{'user.error.msg'}="$requrl:bre:0:0:Choose Course";
+		   $env{'user.error.msg'}="$requrl:bre:0:0:Choose Course";
 	           return HTTP_NOT_ACCEPTABLE; 
                 }
                 if (($access ne '2') && ($access ne 'F')) {
-		   $ENV{'user.error.msg'}="$requrl:bre:1:1:Access Denied";
+		   $env{'user.error.msg'}="$requrl:bre:1:1:Access Denied";
 	           return HTTP_NOT_ACCEPTABLE; 
                 }
             }
 	    if ($requrl =~ m|^/prtspool/|) {
-		my $start='/prtspool/'.$ENV{'user.name'}.'_'.
-		    $ENV{'user.domain'};
+		my $start='/prtspool/'.$env{'user.name'}.'_'.
+		    $env{'user.domain'};
 		if ($requrl !~ /^\Q$start\E/) {
-		    $ENV{'user.error.msg'}="$requrl:bre:1:1:Access Denied";
+		    $env{'user.error.msg'}="$requrl:bre:1:1:Access Denied";
 		    return HTTP_NOT_ACCEPTABLE;
 		}
 	    }
+	    if ($env{'user.name'} eq 'public' && 
+		$env{'user.domain'} eq 'public' &&
+		$requrl !~ m{^/+(res|public)/} &&
+		$requrl !~ m{^/+adm/(help|logout|randomlabel\.png)}) {
+		$env{'request.querystring'}=$r->args;
+		$env{'request.firsturl'}=$requrl;
+		return FORBIDDEN;
+	    }
 # ------------------------------------------------------------- This is allowed
-          if ($ENV{'request.course.id'}) {
+          if ($env{'request.course.id'}) {
 	    &Apache::lonnet::countacc($requrl);
             $requrl=~/\.(\w+)$/;
             if ((&Apache::loncommon::fileembstyle($1) eq 'ssi') ||
  ($requrl=~/^\/adm\/.*\/(aboutme|navmaps|smppg|bulletinboard)(\?|$)/) ||
  ($requrl=~/^\/adm\/wrapper\//) ||
+ ($requrl=~m|^/adm/coursedocs/showdoc/|) ||
  ($requrl=~m|\.problem/smpedit$|) ||
  ($requrl=~/^\/public\/.*\/syllabus$/)) {
 # ------------------------------------- This is serious stuff, get symb and log
@@ -120,22 +280,23 @@ sub handler {
                 if ($query) {
 		    &Apache::loncommon::get_unprocessed_cgi($query,['symb']);
                 }
-                if ($ENV{'form.symb'}) {
-		    $symb=&Apache::lonnet::symbclean($ENV{'form.symb'});
-                    if ($requrl =~ m|^/adm/wrapper/|) {
+                if ($env{'form.symb'}) {
+		    $symb=&Apache::lonnet::symbclean($env{'form.symb'});
+                    if ($requrl =~ m|^/adm/wrapper/|
+			|| $requrl =~ m|^/adm/coursedocs/showdoc/|) {
                         my ($map,$mid,$murl)=&Apache::lonnet::decode_symb($symb);
-                        &Apache::lonnet::symblist($map,$murl => $mid,
-                                               'last_known' => $murl);
+                        &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))) {
                       my ($map,$mid,$murl)=&Apache::lonnet::decode_symb($symb);
-                      &Apache::lonnet::symblist($map,$murl => $mid,
-                                               'last_known' => $murl);
+		      &Apache::lonnet::symblist($map,$murl => [$murl,$mid],
+						'last_known' =>[$murl,$mid]);
 		    } else {
 			$r->log_reason('Invalid symb for '.$requrl.': '.
                                        $symb);
-		        $ENV{'user.error.msg'}=
+		        $env{'user.error.msg'}=
                                 "$requrl:bre:1:1:Invalid Access";
   	                return HTTP_NOT_ACCEPTABLE; 
                     }
@@ -144,15 +305,18 @@ sub handler {
 		    if (&Apache::lonnet::is_on_map($requrl) && $symb &&
 			!&Apache::lonnet::symbverify($symb,$requrl)) {
 			$r->log_reason('Invalid symb for '.$requrl.': '.$symb);
-		        $ENV{'user.error.msg'}=
+		        $env{'user.error.msg'}=
                                 "$requrl:bre:1:1:Invalid Access";
   	                return HTTP_NOT_ACCEPTABLE; 
 		    }
-                    my ($map,$mid,$murl)=split(/\_\_\_/,$symb);
-		    &Apache::lonnet::symblist($map,$murl => $mid,
-                                              'last_known' => $murl);
+		    if ($symb) {
+			my ($map,$mid,$murl)=
+			    &Apache::lonnet::decode_symb($symb);
+			&Apache::lonnet::symblist($map,$murl =>[$murl,$mid],
+						'last_known' =>[$murl,$mid]);
+		    }
                 }
-                $ENV{'request.symb'}=$symb;
+                $env{'request.symb'}=$symb;
                 &Apache::lonnet::courseacclog($symb);
             } else {
 # ------------------------------------------------------- This is other content
@@ -161,39 +325,50 @@ sub handler {
 	  }
             return OK; 
         } else { 
-            $r->log_reason("Cookie $handle not valid", $r->filename) 
-        };
+            $r->log_reason("Cookie $handle not valid", $r->filename); 
+        }
     }
 
 # -------------------------------------------- See if this is a public resource
     if ($requrl=~m|^/public/|
 	|| (&Apache::lonnet::metadata($requrl,'copyright') eq 'public')) {
         &Apache::lonnet::logthis('Granting public access: '.$requrl);
-	&Apache::loncommon::get_posted_cgi($r);
-	$ENV{'user.name'}='public';
-        $ENV{'user.domain'}='public';
-        $ENV{'request.state'} = "published";
-        $ENV{'request.publicaccess'} = 1;
-        $ENV{'request.filename'} = $r->filename;
-	my ($httpbrowser,  $clientbrowser, $clientversion,
-	    $clientmathml, $clientunicode, $clientos) =
-		&Apache::loncommon::decode_user_agent($r);
-	$ENV{'browser.type'}=$clientbrowser;
-        $ENV{'browser.version'}=$clientversion;
-        $ENV{'browser.mathml'}=$clientmathml;
-        $ENV{'browser.unicode'}=$clientunicode;
-        $ENV{'browser.os'}=$clientos;
+        &Apache::lonlocal::get_language_handle($r);
+	my $cookie=
+	    &Apache::lonauth::success($r,'public','public','public');
+        my $lonidsdir=$r->dir_config('lonIDsDir');
+	&Apache::lonnet::transfer_profile_to_env($lonidsdir,$cookie);
+	&Apache::lonacc::get_posted_cgi($r);
+        $env{'request.state'} = "published";
+        $env{'request.publicaccess'} = 1;
+        $env{'request.filename'} = $r->filename;
 
+	$r->header_out('Set-cookie',"lonID=$cookie; path=/");
         return OK;
     }
+    if ($requrl=~m|^/+adm/+help/+|) {
+	return OK;
+    }
+# ------------------------------------- See if this is a viewable portfolio file
+    if ($requrl =~ m|/+uploaded/([^/]+)/([^/]+)/portfolio(/.+)$|) {
+        my $result = &portfolio_access($1,$2,$3);
+        if ($result eq 'ok') {
+            return OK;
+        }
+    } elsif ($requrl =~ m|/+uploaded/([^/]+)/([^/]+)/groups/([^/]+)/portfolio/(.+)$|) {
+        my $result = &portfolio_access($1,$2,$4.'/'.$3,$3);
+        if ($result eq 'ok') {
+            return OK;
+        }
+    }
 # -------------------------------------------------------------- Not authorized
     $requrl=~/\.(\w+)$/;
 #    if ((&Apache::loncommon::fileembstyle($1) eq 'ssi') ||
 #        ($requrl=~/^\/adm\/(roles|logout|email|menu|remote)/) ||
 #        ($requrl=~m|^/prtspool/|)) {
 # -------------------------- Store where they wanted to go and get login screen
-	$ENV{'request.querystring'}=$r->args;
-	$ENV{'request.firsturl'}=$requrl;
+	$env{'request.querystring'}=$r->args;
+	$env{'request.firsturl'}=$requrl;
        return FORBIDDEN;
 #   } else {
 # --------------------------------------------------------------------- Goodbye