X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCommandmode.pm;h=b3718721c69a843fe947c8a06d0725f0f36c37dc;hb=f43ac25669a7b9368d9537eed2043a864a906303;hp=d1feb3e18eb2e6dea892108a3eb15d2a8977d81f;hpb=56b93915d65c299a5f2d2e555ee361c056773843;p=spider.git

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index d1feb3e1..b3718721 100644
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -50,7 +50,7 @@ use DXCIDR;
 use strict;
 use vars qw(%Cache %cmd_cache $errstr %aliases $scriptbase %nothereslug
 	$maxbadcount $msgpolltime $default_pagelth $cmdimportdir $users $maxusers
-    $maxcmdlth
+    $maxcmdlth $maxcmdcount $cmdinterval
 );
 
 %Cache = ();					# cache of dynamically loaded routine's mod times
@@ -64,8 +64,9 @@ $cmdimportdir = "$main::root/cmd_import"; # the base directory for importing com
                                           # this does not exist as default, you need to create it manually
 $users = 0;					  # no of users on this node currently
 $maxusers = 0;				  # max no users on this node for this run
-
 $maxcmdlth = 512;				# max length of incoming cmd line (including the command and any arguments
+$maxcmdcount = 27;				# max no cmds entering $cmdinterval seconds
+$cmdinterval = 20;				# if user enters more than $maxcmdcount in $cmdinterval seconds, they are logged off
 
 #
 # obtain a new connection this is derived from dxchannel
@@ -254,6 +255,10 @@ sub start
 	$self->lastmsgpoll($main::systime);
 	$self->{user_interval} = $self->user->user_interval || $main::user_interval; # allow user to change idle time between prompts
 	$self->prompt;
+
+	$self->{cmdintstart} = 0; # set when systime > this + cmdinterval and a command entered, cmdcount set to 0
+	$self->{cmdcount} = 0;		   # incremented on a coming in. If this value > $maxcmdcount, disconnect
+
 }
 
 #
@@ -349,22 +354,25 @@ sub normal
 			}
 			$self->state('prompt');
 			delete $self->{talklist};
-		} elsif ($cmdline =~ m|^/+\w+|) {
+		} elsif ($cmdline =~ m|^[/\w\\]+|) {
 			$cmdline =~ s|^/||;
 			my $sendit = $cmdline =~ s|^/+||;
 			if (@bad = BadWords::check($cmdline)) {
 				$self->badcount(($self->badcount||0) + @bad);
 				LogDbg('DXCommand', "$self->{call} swore: '$cmdline' with badwords: '" . join(',', @bad) . "'");
 			} else {
-				my @in = $self->run_cmd($cmdline);
-				$self->send_ans(@in);
-				if ($sendit && $self->{talklist} && @{$self->{talklist}}) {
-					foreach my $l (@in) {
-						for (@{$self->{talklist}}) {
-							if ($self->{state} eq 'talk') {
-								$self->send_talks($_, $l);
-							} else {
-								send_chats($self, $_, $l)
+				my @cmd = split /\s*\\n\s*/, $cmdline;
+				foreach my $l (@cmd) {
+					my @in = $self->run_cmd($l);
+					$self->send_ans(@in);
+					if ($sendit && $self->{talklist} && @{$self->{talklist}}) {
+						foreach my $l (@in) {
+							for (@{$self->{talklist}}) {
+								if ($self->{state} eq 'talk') {
+									$self->send_talks($_, $l);
+								} else {
+									send_chats($self, $_, $l)
+								}
 							}
 						}
 					}
@@ -410,8 +418,25 @@ sub normal
 #		if (@bad = BadWords::check($cmdline)) {
 #			$self->badcount(($self->badcount||0) + @bad);
 #			LogDbg('DXCommand', "$self->{call} swore: '$cmdline' with badwords: '" . join(',', @bad) . "'");
-#		} else {
-			$self->send_ans(run_cmd($self, $cmdline));
+		#		} else {
+		my @cmd = split /\s*\\n\s*/, $cmdline;
+		foreach my $l (@cmd) {
+
+			# rate limiting code
+			
+			if (($self->{cmdintstart} + $cmdinterval <= $main::systime) || $self->{inscript}) {
+				$self->{cmdintstart} = $main::systime;
+				$self->{cmdcount} = 1;
+				dbg("$self->{call} started cmdinterval") if isdbg('cmdcount');
+			} else {
+				if (++$self->{cmdcount} > $maxcmdcount) {
+					LogDbg('baduser', qq{User $self->{call} sent $self->{cmdcount} (>= $maxcmdcount) cmds in $cmdinterval seconds starting at } . atime($self->{cmdintstart}) . ", disconnected" );
+					$self->disconnect;
+				}
+				dbg("$self->{call} cmd: '$l' cmdcount = $self->{cmdcount} in $cmdinterval secs") if isdbg('cmdcount');
+			}
+			$self->send_ans(run_cmd($self, $l));
+		}
 #		}
 	}