--- loncom/auth/loncacc.pm	2003/05/13 00:52:46	1.28
+++ loncom/auth/loncacc.pm	2007/10/02 01:09:59	1.46
@@ -2,7 +2,7 @@
 # Cookie Based Access Handler for Construction Area
 # (lonacc: 5/21/99,5/22,5/29,5/31 Gerd Kortemeyer)
 #
-# $Id: loncacc.pm,v 1.28 2003/05/13 00:52:46 www Exp $
+# $Id: loncacc.pm,v 1.46 2007/10/02 01:09:59 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -26,95 +26,79 @@
 #
 # http://www.lon-capa.org/
 #
-# YEAR=2000
-# 6/15,16/11,22/11,
-# YEAR=2001
-# 01/06,01/11,6/1,9/25,9/28,11/22,12/25,12/26,
-# 01/06/01,05/04,05/05,05/09 Gerd Kortemeyer
-# YEAR=2002
-# 1/4 Gerd Kortemeyer
-###
 
 package Apache::loncacc;
 
 use strict;
 use Apache::Constants qw(:common :http :methods REDIRECT);
-use Apache::File;
-use CGI::Cookie();
 use Fcntl qw(:flock);
+use Apache::lonlocal;
+use Apache::lonnet;
+use Apache::lonacc;
+use LONCAPA qw(:DEFAULT :match);
 
 sub constructaccess {
     my ($url,$ownerdomain)=@_;
-    my ($ownername)=($url=~/\/(?:\~|priv\/|home\/)(\w+)/);
+    my ($ownername)=($url=~/\/(?:\~|priv\/|home\/)($match_username)\//);
     unless (($ownername) && ($ownerdomain)) { return ''; }
     # We do not allow editing of previous versions of files.
     if ($url=~/\.(\d+)\.(\w+)$/) { return ''; }
-    if (($ownername eq $ENV{'user.name'}) &&
-        ($ownerdomain eq $ENV{'user.domain'})) {
-	return ($ownername,$ownerdomain);
+    my @possibledomains = &Apache::lonnet::current_machine_domains();
+    if ($ownername eq $env{'user.name'}) {
+	foreach my $domain (@possibledomains) {
+	    if ($domain eq $env{'user.domain'}) {
+		return ($ownername,$domain);
+	    }
+	}
     }
-
-    my $capriv='user.priv.ca./'.
-               $ownerdomain.'/'.$ownername.'./'.
-	       $ownerdomain.'/'.$ownername;
-    foreach (keys %ENV) {
-        if ($_ eq $capriv) {
-           return ($ownername,$ownerdomain);
-        }
+    
+    foreach my $domain (@possibledomains) {
+	if (exists($env{'user.priv.ca./'.$domain.'/'.$ownername.'./'}) ||
+	    exists($env{'user.priv.aa./'.$domain.'/'.$ownername.'./'}) ) {
+	    return ($ownername,$domain);
+	}
     }
-
     return '';
 }
 
 sub handler {
     my $r = shift;
     my $requrl=$r->uri;
-    $ENV{'request.editurl'}=$requrl;
-    my %cookies=CGI::Cookie->parse($r->header_in('Cookie'));
-    my $lonid=$cookies{'lonID'};
-    my $cookie;
-    if ($lonid) {
-	my $handle=$lonid->value;
-        $handle=~s/\W//g;
-        my $lonidsdir=$r->dir_config('lonIDsDir');
-        if ((-e "$lonidsdir/$handle.id") && ($handle ne '')) {
+    $env{'request.editurl'}=$requrl;
+
+    my $handle =  &Apache::lonnet::check_for_valid_session($r);
+    if ($handle ne '') {
 
 # ------------------------------------------------------ Initialize Environment
+        my $lonidsdir=$r->dir_config('lonIDsDir');
+	&Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle);
 
-            &Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle);
+# --------------------------------------------------------- Initialize Language
+ 
+	&Apache::lonlocal::get_language_handle($r);
 
 # -------------------------------------------------------------- Resource State
 
-            $ENV{'request.state'}    = "construct";
-            $ENV{'request.filename'} = $r->filename;
+	$env{'request.state'}    = "construct";
+	$env{'request.filename'} = $r->filename;
 
-            unless (&constructaccess($requrl,$r->dir_config('lonDefDomain'))) {
-                $r->log_reason("Unauthorized $requrl", $r->filename); 
-	        return HTTP_NOT_ACCEPTABLE;
-            }
-# Construction space needs Remote to work
-            if ($ENV{'environment.remote'} eq 'off') {
-	        $r->content_type('text/html');
-                $r->header_out(Location => 
-                    'http://'.$r->server->server_hostname.
-                    '/adm/remote?action=launch&url='.
-                    &Apache::lonnet::escape($requrl));
-                return REDIRECT;
-            }
+	unless (&constructaccess($requrl,$r->dir_config('lonDefDomain'))) {
+	    $r->log_reason("Unauthorized $requrl", $r->filename); 
+	    return HTTP_NOT_ACCEPTABLE;
+	}
 
 # -------------------------------------------------------- Load POST parameters
 
-	    &Apache::loncommon::get_posted_cgi($r);
+	&Apache::lonacc::get_posted_cgi($r);
 
-            return OK; 
-        } else { 
-            $r->log_reason("Cookie $handle not valid", $r->filename) 
-        };
+	return OK; 
+    } else { 
+	$r->log_reason("Cookie $handle not valid", $r->filename) 
     }
 
 # ----------------------------------------------- Store where they wanted to go
 
-    $ENV{'request.firsturl'}=$requrl;
+    $env{'request.firsturl'}=$requrl;
     return FORBIDDEN;
 }