loncom/homework/lonhomework.pm - diff

Return to lonhomework.pm CVS log

Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/lonhomework.pm between versions 1.150 and 1.155

-version 1.150, 2003/09/19 20:29:29
+version 1.155, 2003/10/15 17:41:10
  Line 147  sub send_footer {
  $Apache::lonxml::browse='';
+ sub check_ip_acc {
+     my ($acc)=@_;
+     if (!defined($acc) || $acc =~ /^\s*$/) { return 1; }
+     my $allowed=0;
+     my $ip=$ENV{'REMOTE_ADDR'};
+     my $name;
+     foreach my $pattern (split(',',$acc)) {
+ 	if ($pattern =~ /\*$/) {
+ 	    #35.8.*
+ 	    $pattern=~s/\*//;
+ 	    if ($ip =~ /^\Q$pattern\E/) { $allowed=1; }
+ 	} elsif ($pattern =~ /(\d+\.\d+\.\d+)\.\[(\d+)-(\d+)\]$/) {
+ 	    #35.8.3.[34-56]
+ 	    my $low=$2;
+ 	    my $high=$3;
+ 	    $pattern=$1;
+ 	    if ($ip =~ /^\Q$pattern\E/) {
+ 		my $last=(split(/\./,$ip))[3];
+ 		if ($last <=$high && $last >=$low) { $allowed=1; }
+ 	    }
+ 	} elsif ($pattern =~ /^\*/) {
+ 	    #*.msu.edu
+ 	    $pattern=~s/\*//;
+ 	    if (!defined($name)) {
+ 		use Socket;
+ 		my $netaddr=inet_aton($ip);
+ 		($name)=gethostbyaddr($netaddr,AF_INET);
+ 		}
+ 	    if ($name =~ /\Q$pattern\E$/i) { $allowed=1; }
+ 	} elsif ($pattern =~ /\d+\.\d+\.\d+\.\d+/) {
+ 	    #127.0.0.1
+ 	    if ($ip =~ /^\Q$pattern\E/) { $allowed=1; }
+ 	} else {
+ 	    #some.name.com
+ 	    if (!defined($name)) {
+ 		use Socket;
+ 		my $netaddr=inet_aton($ip);
+ 		($name)=gethostbyaddr($netaddr,AF_INET);
+ 	    }
+ 	    if ($name =~ /\Q$pattern\E$/i) { $allowed=1; }
+ 	}
+ 	if ($allowed) { last; }
+     }
+     return $allowed;
+ }
  # JB, 9/24/2002: Any changes in this function may require a change
  # in lonnavmaps::resource::getDateStatus.
  sub check_access {
- Line 168  sub check_access {
+ Line 213  sub check_access {
      &Apache::lonxml::debug("checking for part :$id:");
      &Apache::lonxml::debug("time:".time);
+     my $allowed=&check_ip_acc(&Apache::lonnet::EXT("resource.$id.acc"));
+     if (!$allowed) {
+ 	$status='INVALID_ACCESS';
+ 	$date=&mt("can not be accessed from your location.");
+ 	return($status,$date);
+     }
      foreach $temp ("opendate","duedate","answerdate") {
  	$lastdate = $date;
  	$date = &Apache::lonnet::EXT("resource.$id.$temp");
- Line 307  sub setuppermissions {
+ Line 360  sub setuppermissions {
  sub setupheader {
      my $request=$_[0];
      if ($ENV{'browser.mathml'}) {
- 	$request->content_type('text/xml');
+ 	&Apache::loncommon::content_type($request,'text/xml');
      } else {
- 	$request->content_type('text/html');
+ 	&Apache::loncommon::content_type($request,'text/html');
      }
-     $request->content_encoding('UTF-8');
      if (!$Apache::lonxml::debug && ($ENV{'REQUEST_METHOD'} eq 'GET')) {
  	&Apache::loncommon::no_cache($request);
      }

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.150
changed lines
	Added in v.1.155