--- loncom/auth/lontokacc.pm	2005/02/06 07:23:40	1.12
+++ loncom/auth/lontokacc.pm	2020/12/18 15:23:03	1.20
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Access Handler for User File Transfers
 #
-# $Id: lontokacc.pm,v 1.12 2005/02/06 07:23:40 albertel Exp $
+# $Id: lontokacc.pm,v 1.20 2020/12/18 15:23:03 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -32,40 +32,21 @@ 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_NOLOOKUP);
-    my $netaddr=inet_aton($reqhost);
-    ($reqhost) = gethostbyaddr($netaddr,AF_INET);
-    if (!$reqhost) {
-	$r->log_reason("Unable to do hostname $reqhost lookup for ".$r->get_remote_host(REMOTE_NOLOOKUP));
+    my $reqhost = &Apache::lonnet::get_requestor_ip($r,REMOTE_NOLOOKUP,1);
+    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 'localhost.localdomain') {
+    if ($reqhost eq '127.0.0.1') {
        return OK;
     }
-    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>) {
-	   $readline=~s/\s*$//;
-	   my ($id,$domain,$role,$name)=split(/:/,$readline);
-	   if ($name =~ /\Q$reqhost\E/i) {
-	       return OK; 
-	   }
-       }
-
-    }
-    $r->log_reason("Invalid request for user file transfer from $reqhost", 
-                   $r->filename); 
-    return FORBIDDEN;
+    return OK;
 }
 
 sub removefile {
@@ -76,6 +57,7 @@ sub removefile {
     } else {
         &Apache::lonnet::logthis('Failed to transfer '.$r->filename);
     }
+    return OK;
 }
 1;
 __END__