Changeset 16055 for misc/runpugs

Timestamp:

04/21/07 15:42:06 (19 months ago)

Author:

andara

Message:

[runpugs] use local copy of devel version to avoid versions with broken PUGS_SAFEMODE

Location:

misc/runpugs

Files:

• lib/Web/Terminal/Server.pm (modified) (12 diffs)
• lib/Web/Terminal/Settings.pm (modified) (2 diffs)
• perl/runpugs.pl (modified) (1 diff)

misc/runpugs/lib/Web/Terminal/Server.pm

@@ -1 +1 @@
 package Web::Terminal::Server;
 
-=pod
-The inactive sessions queue starts with n_inactive_max sessions.
-Ideally, once it drops to n_inactive_min, it should gradually create 
-n_inactive_max-n_inactive_min sessions
-To do this reallu asynchronously, we need to let the child handle this
-The problem is that the child can't access the counters of the parent.
-So I'd just have the child create n_inactive_max-n_inactive_min sessions, gradually e.g. one every 5 minutes
-But that might interfere with the cleanup:
-The child sleeps for some time, then cleans up
-So if we use the same time constant (makes sense),
-the we need a counter which is set by the signal, that's all
-
-
-So child gets a SIGUSR
-=> it sets n_new_sessions to max-min if n_new_sessions was 0
-=cut
+#The inactive sessions queue starts with n_inactive_max sessions.
+#Ideally, once it drops to n_inactive_min, it should gradually create 
+#n_inactive_max-n_inactive_min sessions
+#To do this reallu asynchronously, we need to let the child handle this
+#The problem is that the child can't access the counters of the parent.
+#So I'd just have the child create n_inactive_max-n_inactive_min sessions, gradually e.g. one every 5 minutes
+#But that might interfere with the cleanup:
+#The child sleeps for some time, then cleans up
+#So if we use the same time constant (makes sense),
+#the we need a counter which is set by the signal, that's all
+#So child gets a SIGUSR
+#=> it sets n_new_sessions to max-min if n_new_sessions was 0
 
 use vars qw( $VERSION );
@@ -49 +45 @@
 my $v                 = (1 - $Web::Terminal::Settings::daemon)*(1-$Web::Terminal::Settings::test);
 
-#Datastructures per app, so $session{$app}{...}, $inactive[$app][...] or @{$inactive[$app]}
-my @active_sessions             = (); # id => session_number for active sessions
+# Datastructures per app, so $session{$app}{...}, $inactive[$app][...] or @{$inactive[$app]}
+my @active_sessions       = (); # id => session_number for active sessions
 my @sessions              = (); # session_number (from stack) =>  actual session object
 my @session_numbers_stack = ();  # stack for session numbers, i.e. those not active or inactive!
@@ -61 +57 @@
 my @n_inactive_sessions = ();
 
-#�imit number of session from a single IP.
+# Limit number of session from a single IP.
 # Problem for folks behind a gateway, but otherwise too easy for DoS 
 my %n_sessions_ip = ();    # ip -> nsessions 
 
-# for use by child to know how many new sessions to create
+# For use by child to know how many new sessions to create
 my @n_new_sessions = ();
 
@@ -82 +78 @@
         my $host = $Web::Terminal::Settings::host;
         my $port = $Web::Terminal::Settings::port;
-        $SIG{USR1} = \&clean_up_timed_out_sessions;
+
+    $SIG{USR1} = \&clean_up_timed_out_sessions;
         $SIG{USR2} = \&init_create;
-        if ($Web::Terminal::Settings::daemon) {
+        
+    if ($Web::Terminal::Settings::daemon) {
                 Proc::Daemon::Init;
         }
@@ -90 +88 @@
         # fork/exec by the book:
         use Errno qw(EAGAIN);
-  FORK: {
+
+    FORK: {
                 if ( $childpid = fork ) {
 
@@ -120 +119 @@
                         }
 
-                        # normally the child restarts the parent if it dies
+                        # The child can restart the parent
                         if ($Web::Terminal::Settings::test==1) {
                         die "No restarting, test phase\n";
@@ -130 +129 @@
                         }
                 } elsif ( $! == EAGAIN ) {
-
                         # Maybe ulimit might take us here
                         sleep 30;
                         redo FORK;
                 } else {
-
                         # Or ulimit could take us here
                         print "Couldn't fork" if $v;
@@ -147 +144 @@
 # Advanced Perl Programming
 sub login_proc {
-
         # Unconditionally accept.
         \&rcvd_msg_from_client;
@@ -531 +527 @@
 
 #-------------------------------------------------------------------------------
+# deactivate_session() was meant to take a running session and recycle it
+# using a reset_command.
+# Unfortunately, if the user leaves the session on an unfinished multi-line,
+# the reset_command doesn't get through. 
+# So we should check that based on the value of prompt.
+# If it's multi-line we need kill & create
 sub deactivate_session {
         my $app   = shift;
@@ -536 +538 @@
         my $ip    = shift;
         my $term  = $sessions[$app]{ $active_sessions[$app]{$id} };
+    my $unfinished_multi_line=0;
+    my $tprompt=$term->{prompt};
+    if ($tprompt=~/$Web::Terminal::Settings::prompt_pattern/ and $tprompt ne
+    $Web::Terminal::Settings::prompt) {
+    my $unfinished_multi_line=1;
+    }
         my $ncmd  = $Web::Terminal::Settings::reset_command;
         my $lines = $term->write($ncmd);
@@ -649 +657 @@
                   %{ $sessions[$app]}=();
                   
+if (&sane($app)) {
                 for my $i ( 1 .. $Web::Terminal::Settings::npreloaded_sessions[$app] ) {
-                        my $ret = &create_session($app);
+            my $ret = &create_session($app);
                         print $ret>0?'OK: $ret':'NOK',': #sesssions: ', scalar( @{ $inactive_sessions[$app] } ), ' for app ',
                           $app, "\n"
@@ -657 +666 @@
         assert(scalar(@{ $inactive_sessions[$app] })==$Web::Terminal::Settings::npreloaded_sessions[$app]);
         }
-}    # END of init_session()
-
-#-------------------------------------------------------------------------------
-# init_create gets called by SIGUSR2
+    }
+}    # END of init_sessions()
+#------------------------------------------------------------------------------
+# check if command is sane (FSDO sane)
+sub sane {
+    my $app=shift;
+    my $cmd=$Web::Terminal::Settings::commands[$app];
+    $cmd=~s/^.*nice\s+//; # de-nice
+    my $reply=`PUGS_SAFEMODE=1 $cmd -e \"print 42\" 2>/dev/null`;
+    if ($reply==42) {
+        return 1;
+    } else {
+        return 0;
+    }
+}
+#-------------------------------------------------------------------------------
+# init_create gets called by SIGUSR2, as raised by async_init_create()
 # all it does is set the counter @n_new_sessions (count zero!)
 # if counter is 0, it gets reset to max-min
-#�his avoids potential race hazards 
+# this avoids potential race hazards 
 sub init_create {
 

misc/runpugs/lib/Web/Terminal/Settings.pm

@@ -61 +61 @@
 
 #Pugs
+my $ulimit='ulimit -m 64000; ulimit -v 64000;';
+my $nice='/usr/bin/nice';
+my $pugs='/usr/bin/pugs';
+my $rel_root='/home/andara/pugs-rel';
+my $dev_root='/home/andara/pugs-dev';
+
 our @commands=(
-#'/usr/bin/nice /home/andara/pugs-rel/pugs -I/home/andara/pugs-rel/blib6/lib',
-'/usr/bin/pugs',
-'/usr/bin/nice /usr/bin/pugs'
+"$ulimit $nice $rel_root/pugs -I$rel_root/blib6/lib",
+"$ulimit $nice $dev_root/pugs -I$dev_root/blib6/lib"
 );
 
@@ -81 +86 @@
 our $filter=0;
 our $filter_pattern='';
-#my $root='/home/andara/apache';
-my $root='/Users/wim/Builds/pugs/misc/runpugs';
+my $root='/home/andara/apache';
+#my $root='/Users/wim/Builds/pugs/misc/runpugs';
 our $cgi_path="$root/cgi-bin/";
 our $lib_path="$root/lib/";

misc/runpugs/perl/runpugs.pl

@@ -64 +64 @@
             && do {
                 $cmd=$cmdline;
+                # a ';' on a single-line command confuses pugs
+                if($cmd=~/$prompt/) {$cmd=~s/;\s*$//}
                 $cmd=~s/$Web::Terminal::Settings::prompt_pattern//;
                 chomp $cmd;