--- loncom/auth/lonracc.pm	2002/01/17 19:25:31	1.4
+++ loncom/auth/lonracc.pm	2008/11/12 20:01:09	1.23
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Access Handler for File Transfers
 #
-# $Id: lonracc.pm,v 1.4 2002/01/17 19:25:31 harris41 Exp $
+# $Id: lonracc.pm,v 1.23 2008/11/12 20:01:09 jms Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,53 +25,8 @@
 #
 # http://www.lon-capa.org/
 #
-# (lonacc: Cookie Based Access Handler
-# 5/21/99,5/22,5/29,5/31,6/15 Gerd Kortemeyer)
-# 6/16,6/18,7/3,
-# 6/30/00 Gerd Kortemeyer
 
-package Apache::lonracc;
-
-use strict;
-use Apache::Constants qw(:common :remotehost);
-use Apache::File();
-
-sub handler {
-    my $r = shift;
-    my $reqhost;
-    unless ($reqhost=$r->get_remote_host(REMOTE_DOUBLE_REV)) {
-       $r->log_reason("Spoof request");
-       return FORBIDDEN;
-    }
-    my $readline;
-    my $lontabdir=$r->dir_config('lonTabDir');
-    {
-       my $fh;
-       unless ($fh=Apache::File->new("$lontabdir/hosts.tab")) {
-          $r->log_reason("Could not find host tab file");
-          return FORBIDDEN;
-       }
-       while ($readline=<$fh>) {
-          my ($id,$domain,$role,$name,$ip)=split(/:/,$readline);
-          if ($name =~ /$reqhost/i) {
-              my $filename=$r->filename;
-              if ((-e "$filename.$id") || ($filename=~/\.meta$/)) {
-	         return OK;
-              } else {
-                 $r->log_reason("$id not subscribed", $r->filename);
-                 return FORBIDDEN;
-              }
-          }
-       }
-
-    }
-    $r->log_reason("Invalid request for file transfer from $reqhost", 
-                   $r->filename); 
-    return FORBIDDEN;
-}
-
-1;
-__END__
+=pod
 
 =head1 NAME
 
@@ -118,6 +73,83 @@ access.
 
 =cut
 
+package Apache::lonracc;
+
+use strict;
+use Apache::Constants qw(:common :remotehost);
+use Apache::lonnet;
+use Apache::File();
+use IO::Socket;
+
+sub subscribed {
+    my ($filename,$id) = @_;
+
+    return 0 if (!-e "$filename.subscription");
+
+    my $hostname=&Apache::lonnet::hostname($id);
+    my (undef,undef,undef,undef,$ip) = gethostbyname($hostname);
+    
+    return 0 if (length($ip) != 4);
+
+    $ip=inet_ntoa($ip);
+
+    my $expr='^'.quotemeta($id).':'.quotemeta($ip).':';
+
+    my $found=0;
+    if (my $sh=Apache::File->new("$filename.subscription")) {
+	while (my $subline=<$sh>) { if ($subline =~ /$expr/) { $found=1; } }
+	$sh->close();
+    }
+    return $found;
+}
+
+sub handler {
+    my $r = shift;
+
+    my $filename=$r->filename;
+    if (!-e $filename) {
+	return NOT_FOUND;
+    }
+
+    my $reqhost = $r->get_remote_host(REMOTE_NOLOOKUP);
+    my @hostids= &Apache::lonnet::get_hosts_from_ip($reqhost);
+    if (!@hostids && $reqhost ne '127.0.0.1' ) {
+	$r->log_reason("Unable to find a host for ".
+		       $r->get_remote_host(REMOTE_NOLOOKUP));
+	return FORBIDDEN;
+    }
+    if ($reqhost eq '127.0.0.1') {
+	return OK;
+    }
+    my $return;
+    my @ids;
+
+    foreach my $id (@hostids) {
+	my $uri =$r->uri;
+	if (($filename=~/\.meta$/) ||
+	    ($uri=~m|^/raw/uploaded|) ||
+	    (-e "$filename.$id") ||
+	    &subscribed($filename,$id) ) {
+	    return OK;
+	} else {
+	    $return=FORBIDDEN;
+	    push(@ids,$id);
+	}
+    }
+    if ($return == FORBIDDEN) {
+	$r->log_reason(join(':',@ids)." not subscribed", $r->filename);
+	return FORBIDDEN;
+    }
+    $r->log_reason("Invalid request for file transfer from $reqhost", 
+                   $r->filename); 
+    return FORBIDDEN;
+}
+
+1;
+__END__
+
+
+