--- loncom/auth/loncacc.pm	2007/10/02 01:09:59	1.46
+++ loncom/auth/loncacc.pm	2013/06/04 23:12:13	1.61
@@ -1,8 +1,8 @@
 # The LearningOnline Network
-# Cookie Based Access Handler for Construction Area
+# Cookie Based Access Handler for Authoring Spaces
 # (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.61 2013/06/04 23:12:13 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -27,6 +27,53 @@
 # http://www.lon-capa.org/
 #
 
+=pod
+
+=head1 NAME
+
+Apache::lonacc - Cookie Based Access Handler for Authoring Spaces 
+
+=head1 SYNOPSIS
+
+Invoked (for various locations) by /etc/httpd/conf/loncapa_apache.conf:
+
+ PerlAccessHandler       Apache::loncacc
+
+=head1 INTRODUCTION
+
+This module enables cookie based authentication for construction area
+and is used to control access for the following two types of URI 
+(one for files, and one for directories):
+
+ <LocationMatch "^/priv.*">
+ <LocationMatch "^/priv.*/$">
+
+Whenever the client sends the cookie back to the server, 
+if the cookie is missing or invalid, the user is re-challenged
+for login information.
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+=head1 HANDLER SUBROUTINE
+
+This routine is called by Apache and mod_perl.
+
+=over 4
+
+=item *
+
+load POST parameters
+
+=item *
+
+store where they wanted to go (first url entered)
+
+=back
+
+=cut
+
+
 package Apache::loncacc;
 
 use strict;
@@ -37,30 +84,6 @@ 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;
@@ -82,7 +105,19 @@ sub handler {
 	$env{'request.state'}    = "construct";
 	$env{'request.filename'} = $r->filename;
 
-	unless (&constructaccess($requrl,$r->dir_config('lonDefDomain'))) {
+	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;
 	}
@@ -92,7 +127,7 @@ sub handler {
 	&Apache::lonacc::get_posted_cgi($r);
 
 	return OK; 
-    } else { 
+    } else {
 	$r->log_reason("Cookie $handle not valid", $r->filename) 
     }
 
@@ -105,65 +140,3 @@ sub handler {
 1;
 __END__
 
-=head1 NAME
-
-Apache::lonacc - Cookie Based Access Handler for Construction Area
-
-=head1 SYNOPSIS
-
-Invoked (for various locations) by /etc/httpd/conf/loncapa_apache.conf:
-
- PerlAccessHandler       Apache::loncacc
-
-=head1 INTRODUCTION
-
-This module enables cookie based authentication for construction area
-and is used to control access for three (essentially equivalent) URIs.
-
- <LocationMatch "^/priv.*">
- <LocationMatch "^/\~.*">
- <LocationMatch "^/\~.*/$">
-
-Whenever the client sends the cookie back to the server, 
-if the cookie is missing or invalid, the user is re-challenged
-for login information.
-
-This is part of the LearningOnline Network with CAPA project
-described at http://www.lon-capa.org.
-
-=head1 HANDLER SUBROUTINE
-
-This routine is called by Apache and mod_perl.
-
-=over 4
-
-=item *
-
-load POST parameters
-
-=item *
-
-store where they wanted to go (first url entered)
-
-=back
-
-=head1 OTHERSUBROUTINES
-
-=over 4
-
-=item *
-
-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.
-
-=back
-
-=cut
-
-
-
-
-
-
-