--- loncom/xml/run.pm 2002/04/10 14:46:30 1.25 +++ loncom/xml/run.pm 2003/03/25 03:00:31 1.33 @@ -1,6 +1,6 @@ package Apache::run; # -# $Id: run.pm,v 1.25 2002/04/10 14:46:30 matthew Exp $ +# $Id: run.pm,v 1.33 2003/03/25 03:00:31 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -25,49 +25,80 @@ package Apache::run; # http://www.lon-capa.org/ # +use HTML::Entities; + $Apache::run::EVALUATE_STRING=<<'ENDEVALUATE'; my %_LONCAPA_INTERNAL_oldexpressions=(); - my $i=0; while (!$_LONCAPA_INTERNAL_oldexpressions{$_}) { $_LONCAPA_INTERNAL_oldexpressions{$_}=1; $_ =~s/((?:\$|\&)(?:[\#|\$]*[A-Za-z][\w]*|\{[A-Za-z][\w]*\}))([\[\{][^\$\&\]\}]+[\]\}])*?(\([^\$\&\)]+\))*?(?=[^\[\{\(]|$)/eval(defined(eval($1.$2))?eval('$1.$2.$3'):'$1.$2.$3')/seg; - if ($i++ > 10 ) { last; } + if (scalar(values(%_LONCAPA_INTERNAL_oldexpressions))>10) {last;} } ENDEVALUATE sub evaluate { - my ($expression,$safeeval,$decls) = @_; - unless (defined($expression)) { return ''; } - if (!$Apache::lonxml::evaluate) { return $expression; } - my $result = ''; - $@=''; - $safeeval->reval('{'.$decls.';$_=<<\'EXPRESSION\';'."\n".$expression. - "\n".'EXPRESSION'."\n".$EVALUATE_STRING.'}'); -# $safeeval->reval('{'.$decls.';<< &evaluate(q|'.$expression.'|);}'); - if ($@ eq '') { - $result = $safeeval->reval('return $_;'); - chomp $result; - } else { - &Apache::lonxml::error("substitution on:$expression:with:$decls:caused $@"); - } - return $result + my ($expression,$safeeval,$decls) = @_; + unless (defined($expression)) { return ''; } + if ($Apache::lonxml::evaluate < 1) { return $expression; } + my $result = ''; + $@=''; + $Apache::run::timeout=0; + $main::SIG{'ALRM'} = sub { + $Apache::run::timeout=1; + die("timeout"); + }; + eval { + alarm(Apache->request->server->timeout); + $safeeval->reval('{'.$decls.';$_=<<\'EXPRESSION\';'."\n".$expression. + "\n".'EXPRESSION'."\n".$EVALUATE_STRING.'}'); + alarm(0); + }; + my $error=$@; + if ($error eq '' && !$Apache::run::timeout) { + $result = $safeeval->reval('return $_;'); + chomp $result; + } else { + if ($Apache::run::timeout) { + $error = 'Code ran too long. It ran for more than '. + Apache->request->server->timeout.' seconds'; + } + &Apache::lonxml::error('substitution on
'.$expression.
+			       '
with
'.$decls.
+			       '
caused
'.$error);
+    }
+    return $result
 }
 
 sub run {
-  my ($code,$safeeval,$hideerrors) = @_;
-#  print "inside run\n";
-  $@='';
-  my (@result)=$safeeval->reval($code);
-  if ($@ ne '' && !$hideerrors) {
-    # Put in newline to make display of code easier to read.
-    &Apache::lonxml::error(":$@: occured while running :\n$code");
-  }
-  if ( $#result < '1') {
-    return $result[0];
-  } else {
-    &Apache::lonxml::debug("Got lots results:$#result:");
-    return (@result);
-  }
+    my ($code,$safeeval,$hideerrors) = @_;
+    my @result;
+    $@='';
+    $Apache::run::timeout=0;
+    $main::SIG{'ALRM'} = sub {
+	$Apache::run::timeout=1;
+	die("timeout");
+    };
+    eval {
+	alarm(Apache->request->server->timeout);
+	@result=$safeeval->reval($code);
+	alarm(0);
+    };
+    my $error=$@;
+    if (($Apache::run::timeout || $error ne '') && !$hideerrors) {
+	if ($Apache::run::timeout) {
+	    $error = 'Code ran too long. It ran for more than '.
+		Apache->request->server->timeout.' seconds';
+	}
+	&Apache::lonxml::error('
'.&HTML::Entities::encode($error).
+			       '
occured while running
'.
+			       &HTML::Entities::encode($code).'
'); + } + if ( $#result < '1') { + return $result[0]; + } else { + &Apache::lonxml::debug("Got lots results:$#result:"); + return (@result); + } } sub dump { @@ -75,19 +106,21 @@ sub dump { my $dump=''; foreach my $symname (sort keys %{$safeeval->varglob('main::')}) { if (($symname!~/^\_/) && ($symname!~/\:$/)) { + my $line; if ($safeeval->reval('defined($'.$symname.')')) { - $dump.='$'.$symname.'='.$safeeval->reval('$'.$symname)."\n"; + $line='$'.$symname.'='.$safeeval->reval('$'.$symname); } if ($safeeval->reval('defined(@'.$symname.')')) { - $dump.='@'.$symname.'=('. - $safeeval->reval('join(",",@'.$symname.')').")\n"; + $line='@'.$symname.'=('. + $safeeval->reval('join(",",@'.$symname.')').")"; } if ($safeeval->reval('defined(%'.$symname.')')) { - $dump.='%'.$symname.'=('; - $dump.=$safeeval->reval('join(",",map { $_."=>".$'. + $line='%'.$symname.'=('; + $line.=$safeeval->reval('join(",",map { $_."=>".$'. $symname.'{$_} } sort keys %'. - $symname.')').")\n"; + $symname.')').")" } + if ($line ne '') { $dump.=&HTML::Entities::encode($line)."
\n"; } } } $dump.='';