--- loncom/auth/loncacc.pm	2007/10/02 01:09:59	1.46
+++ loncom/auth/loncacc.pm	2012/10/29 17:39:06	1.60
@@ -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.46 2007/10/02 01:09:59 albertel Exp $
+# $Id: loncacc.pm,v 1.60 2012/10/29 17:39:06 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -27,83 +27,7 @@
 # http://www.lon-capa.org/
 #
 
-package Apache::loncacc;
-
-use strict;
-use Apache::Constants qw(:common :http :methods REDIRECT);
-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\/)($match_username)\//);
-    unless (($ownername) && ($ownerdomain)) { return ''; }
-    # We do not allow editing of previous versions of files.
-    if ($url=~/\.(\d+)\.(\w+)$/) { return ''; }
-    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);
-	    }
-	}
-    }
-    
-    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 $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);
-
-# --------------------------------------------------------- Initialize Language
- 
-	&Apache::lonlocal::get_language_handle($r);
-
-# -------------------------------------------------------------- Resource State
-
-	$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;
-	}
-
-# -------------------------------------------------------- Load POST parameters
-
-	&Apache::lonacc::get_posted_cgi($r);
-
-	return OK; 
-    } else { 
-	$r->log_reason("Cookie $handle not valid", $r->filename) 
-    }
-
-# ----------------------------------------------- Store where they wanted to go
-
-    $env{'request.firsturl'}=$requrl;
-    return FORBIDDEN;
-}
-
-1;
-__END__
+=pod
 
 =head1 NAME
 
@@ -118,11 +42,11 @@ Invoked (for various locations) by /etc/
 =head1 INTRODUCTION
 
 This module enables cookie based authentication for construction area
-and is used to control access for three (essentially equivalent) URIs.
+and is used to control access for the following two types of URI 
+(one for files, and one for directories):
 
  <LocationMatch "^/priv.*">
- <LocationMatch "^/\~.*">
- <LocationMatch "^/\~.*/$">
+ <LocationMatch "^/priv.*/$">
 
 Whenever the client sends the cookie back to the server, 
 if the cookie is missing or invalid, the user is re-challenged
@@ -147,23 +71,72 @@ store where they wanted to go (first url
 
 =back
 
-=head1 OTHERSUBROUTINES
+=cut
 
-=over 4
 
-=item *
+package Apache::loncacc;
+
+use strict;
+use Apache::Constants qw(:common :http :methods REDIRECT);
+use Fcntl qw(:flock);
+use Apache::lonlocal;
+use Apache::lonnet;
+use Apache::lonacc;
+use LONCAPA qw(:DEFAULT :match);
 
-constructaccess($url,$ownerdomain) : See if the owner domain and name
-in the URL match those in the expected environment.  If so, return 
-two element list ($ownername,$ownerdomain).  Else, return null string.
+sub handler {
+    my $r = shift;
+    my $requrl=$r->uri;
+    $env{'request.editurl'}=$requrl;
 
-=back
+    my $handle =  &Apache::lonnet::check_for_valid_session($r);
+    if ($handle ne '') {
 
-=cut
+# ------------------------------------------------------ Initialize Environment
+        my $lonidsdir=$r->dir_config('lonIDsDir');
+	&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;
+
+	my $allowed;
+	my ($ownername,$ownerdom,$ownerhome) = 
+            &Apache::lonnet::constructaccess($requrl,'setpriv');
+        if (($ownername ne '') && ($ownerdom ne '') && ($ownerhome ne '')) {
+            unless ($ownerhome eq 'no_host') {
+                my @hosts = &Apache::lonnet::current_machine_ids();
+                if (grep(/^\Q$ownerhome\E$/,@hosts)) {
+                    $allowed = 1;
+                }
+            }
+        }
+
+        unless ($allowed) {
+	    $r->log_reason("Unauthorized $requrl", $r->filename); 
+	    return HTTP_NOT_ACCEPTABLE;
+	}
 
+# -------------------------------------------------------- Load POST parameters
 
+	&Apache::lonacc::get_posted_cgi($r);
 
+	return OK; 
+    } else {
+	$r->log_reason("Cookie $handle not valid", $r->filename) 
+    }
 
+# ----------------------------------------------- Store where they wanted to go
 
+    $env{'request.firsturl'}=$requrl;
+    return FORBIDDEN;
+}
 
+1;
+__END__