--- loncom/auth/lontokacc.pm	2003/08/01 17:25:40	1.9
+++ loncom/auth/lontokacc.pm	2006/02/07 19:46:26	1.16
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Access Handler for User File Transfers
 #
-# $Id: lontokacc.pm,v 1.9 2003/08/01 17:25:40 www Exp $
+# $Id: lontokacc.pm,v 1.16 2006/02/07 19:46:26 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -32,19 +32,19 @@ use strict;
 use Apache::Constants qw(:common :remotehost);
 use Apache::lonnet();
 use Apache::File();
-
+use IO::Socket;
 
 sub handler {
     my $r = shift;
-    my $reqhost = $r->get_remote_host(REMOTE_DOUBLE_REV);
-    if (!$reqhost && $r->get_remote_host(REMOTE_NOLOOKUP) eq $r->get_server_name()) { 
-        $reqhost = $r->get_server_name(); 
-    }
-    unless ($reqhost) {
-        $r->log_reason("Spoof request from ". $reqhost);
-        return FORBIDDEN;
+    my $reqhost = $r->get_remote_host(REMOTE_NOLOOKUP);
+    my %iphost=&Apache::lonnet::get_iphost();
+    my $hostids=$iphost{$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 'localhost.localdomain') {
+    if ($reqhost eq '127.0.0.1') {
        return OK;
     }
     my $readline;
@@ -56,14 +56,18 @@ sub handler {
           return FORBIDDEN;
        }
        while ($readline=<$fh>) {
-          my ($id,$domain,$role,$name,$ip)=split(/:/,$readline);
-          if ($name =~ /$reqhost/i) {
-             return OK; 
-          }
+	   $readline=~s/\s*$//;
+	   my ($id,$domain,$role,$name)=split(/:/,$readline);
+	   foreach my $hostid (@{$hostids}) {
+	       my $hostname=$Apache::lonnet::hostname{$hostid};
+	       if ($name =~ /^\Q$hostname\E$/i) {
+		   return OK; 
+	       }
+	   }
        }
 
     }
-    $r->log_reason("Invalid request for user file transfer from $reqhost", 
+    $r->log_reason("Invalid request for user file transfer from $reqhost (".join(",",@{$hostids}).")", 
                    $r->filename); 
     return FORBIDDEN;
 }
@@ -72,10 +76,11 @@ sub removefile {
     my $r=shift;
     if ($r->status==200) {
         unlink($r->filename);
-	&Apache::lonnet::logthis('Unlinking '.$r->filename);
+	#&Apache::lonnet::logthis('Unlinking '.$r->filename);
     } else {
         &Apache::lonnet::logthis('Failed to transfer '.$r->filename);
     }
+    return OK;
 }
 1;
 __END__