X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCommandmode.pm;h=bc362456f568d28f85f598ad0283aa8994b1a2e1;hb=d46e81d715d7d2050c924a608c31cf8ab5143e3f;hp=8ed74de4f256ff0c639a232a0463a3f09638fa31;hpb=cc49b8f8c2ec3a975c7ace3f5bd8679580288406;p=spider.git

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index 8ed74de4..bc362456 100644
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -49,7 +49,9 @@ use DXCIDR;
 
 use strict;
 use vars qw(%Cache %cmd_cache $errstr %aliases $scriptbase %nothereslug
-	$maxbadcount $msgpolltime $default_pagelth $cmdimportdir $users $maxusers);
+	$maxbadcount $msgpolltime $default_pagelth $cmdimportdir $users $maxusers
+    $maxcmdlth $maxcmdcount $cmdinterval
+);
 
 %Cache = ();					# cache of dynamically loaded routine's mod times
 %cmd_cache = ();				# cache of short names
@@ -62,6 +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
@@ -74,14 +79,15 @@ sub new
 	# routing, this must go out here to prevent race condx
 	my $pkg = shift;
 	my $call = shift;
-#	my @rout = $main::routeroot->add_user($call, Route::here(1));
-	DXProt::_add_thingy($main::routeroot, [$call, 0, 0, 1, undef, undef, $self->hostname], );
+	#	my @rout = $main::routeroot->add_user($call, Route::here(1));
+	my $ipaddr = alias_localhost($self->hostname);
+	DXProt::_add_thingy($main::routeroot, [$call, 0, 0, 1, undef, undef, $ipaddr], );
 
-	# ALWAYS output the user
+	# ALWAYS output the user (except if the updates not enabled)
 	my $ref = Route::User::get($call);
 	if ($ref) {
 		$main::me->route_pc16($main::mycall, undef, $main::routeroot, $ref);
-		$main::me->route_pc92a($main::mycall, undef, $main::routeroot, $ref) unless $DXProt::pc92_slug_changes;
+		$main::me->route_pc92a($main::mycall, undef, $main::routeroot, $ref) unless $DXProt::pc92_slug_changes || ! $DXProt::pc92_ad_enable;
 	}
 
 	return $self;
@@ -167,27 +173,14 @@ sub start
 	$self->send_motd;
 
 	# sort out privilege reduction
-	$self->{priv} = 0 unless $self->{hostname} eq '127.0.0.1' || $self->{hostname} eq '::1' || $self->conn->{usedpasswd};
+	$self->{priv} = 0 unless $self->{hostname} eq '127.0.0.1' || $self->conn->peerhost eq '127.0.0.1' || $self->{hostname} eq '::1' || $self->conn->{usedpasswd};
 
-	# get the filters
-	my $nossid = $call;
-	$nossid =~ s/-\d+$//;
 	
-	$self->{spotsfilter} = Filter::read_in('spots', $call, 0) 
-		|| Filter::read_in('spots', $nossid, 0)
-			|| Filter::read_in('spots', 'user_default', 0);
-	$self->{wwvfilter} = Filter::read_in('wwv', $call, 0) 
-		|| Filter::read_in('wwv', $nossid, 0) 
-			|| Filter::read_in('wwv', 'user_default', 0);
-	$self->{wcyfilter} = Filter::read_in('wcy', $call, 0) 
-		|| Filter::read_in('wcy', $nossid, 0) 
-			|| Filter::read_in('wcy', 'user_default', 0);
-	$self->{annfilter} = Filter::read_in('ann', $call, 0) 
-		|| Filter::read_in('ann', $nossid, 0) 
-			|| Filter::read_in('ann', 'user_default', 0) ;
-	$self->{rbnfilter} = Filter::read_in('rbn', $call, 0) 
-		|| Filter::read_in('rbn', $nossid, 0)
-		|| Filter::read_in('rbn', 'user_default', 0);
+	Filter::load_dxchan($self, 'spots', 0);
+	Filter::load_dxchan($self, 'wwv', 0);
+	Filter::load_dxchan($self, 'wcy', 0);
+	Filter::load_dxchan($self, 'ann', 0);
+	Filter::load_dxchan($self, 'rbn', 0);
 	
 	# clean up qra locators
 	my $qra = $user->qra;
@@ -247,7 +240,12 @@ 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
+
 }
 
 #
@@ -259,6 +257,7 @@ sub normal
 	my $self = shift;
 	my $cmdline = shift;
 	my @ans;
+	my @bad;
 
 	# save this for them's that need it
 	my $rawline = $cmdline;
@@ -336,29 +335,36 @@ sub normal
 			for (@{$self->{talklist}}) {
 				if ($self->{state} eq 'talk') {
 					$self->send_talks($_,  $self->msg('talkend'));
+				} elsif ($self->{state} eq 'chat') {
+					$self->send_talks($_,  $self->msg('chatend'));
 				} else {
 					$self->local_send('C', $self->msg('chatend', $_));
 				}
 			}
 			$self->state('prompt');
 			delete $self->{talklist};
-		} elsif ($cmdline =~ m|^/+\w+|) {
+		} elsif ($cmdline =~ m|^[/\w\\]+|) {
 			$cmdline =~ s|^/||;
-			my $sendit = $cmdline =~ s|^/+||;
-			my @in = $self->run_cmd($cmdline);
-			$self->send_ans(@in);
-			if ($sendit && $self->{talklist} && @{$self->{talklist}}) {
-				foreach my $l (@in) {
-					my @bad;
-					if (@bad = BadWords::check($l)) {
-						$self->badcount(($self->badcount||0) + @bad);
-						LogDbg('DXCommand', "$self->{call} swore: $l with words:" . join(',', @bad) . ")");
-					} else {
-						for (@{$self->{talklist}}) {
-							if ($self->{state} eq 'talk') {
-								$self->send_talks($_, $l);
-							} else {
-								send_chats($self, $_, $l)
+			my $sendit = ($cmdline = unpad($cmdline));
+			if (@bad = BadWords::check($cmdline)) {
+				$self->badcount(($self->badcount||0) + @bad);
+				LogDbg('DXCommand', "$self->{call} swore: '$cmdline' with badwords: '" . join(',', @bad) . "'");
+			} else {
+				my $c;
+				my @in;
+				if (($c) = $cmdline =~ /^cmd\s+(.*)$/) {
+					@in = $self->run_cmd($c);
+					$self->send_ans(@in);
+				} else {
+					push @in, $cmdline;
+					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)
+								}
 							}
 						}
 					}
@@ -367,10 +373,9 @@ sub normal
 			$self->send($self->{state} eq 'talk' ? $self->talk_prompt : $self->chat_prompt);
 		} elsif ($self->{talklist} && @{$self->{talklist}}) {
 			# send what has been said to whoever is in this person's talk list
-			my @bad;
 			if (@bad = BadWords::check($cmdline)) {
 				$self->badcount(($self->badcount||0) + @bad);
-				LogDbg('DXCommand', "$self->{call} swore: $cmdline with words:" . join(',', @bad) . ")");
+				LogDbg('DXCommand', "$self->{call} swore: '$cmdline' with badwords: '" . join(',', @bad) . "'");
 			} else {
 				for (@{$self->{talklist}}) {
 					if ($self->{state} eq 'talk') {
@@ -402,11 +407,33 @@ sub normal
 		}
 		$self->send_ans(@ans);
 	} else {
-		$self->send_ans(run_cmd($self, $cmdline));
+#		if (@bad = BadWords::check($cmdline)) {
+#			$self->badcount(($self->badcount||0) + @bad);
+#			LogDbg('DXCommand', "$self->{call} swore: '$cmdline' with badwords: '" . join(',', @bad) . "'");
+		#		} 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));
+		}
+#		}
 	} 
 
 	# check for excessive swearing
-	if ($self->{badcount} && $self->{badcount} >= $maxbadcount) {
+	if ($maxbadcount && $self->{badcount} && $self->{badcount} >= $maxbadcount) {
 		LogDbg('DXCommand', "$self->{call} logged out for excessive swearing");
 		$self->disconnect;
 		return;
@@ -416,40 +443,6 @@ sub normal
 	$self->prompt() if $self->{state} =~ /^prompt/o;
 }
 
-# send out the talk messages taking into account vias and connectivity
-sub send_talks
-{
-	my ($self, $ent, $line) = @_;
-	
-	my ($to, $via) = $ent =~ /(\S+)>(\S+)/;
-	$to = $ent unless $to;
-	my $call = $via && $via ne '*' ? $via : $to;
-	my $clref = Route::get($call);
-	my $dxchan = $clref->dxchan if $clref;
-	if ($dxchan) {
-		$dxchan->talk($self->{call}, $to, undef, $line);
-	} else {
-		$self->send($self->msg('disc2', $via ? $via : $to));
-		my @l = grep { $_ ne $ent } @{$self->{talklist}};
-		if (@l) {
-			$self->{talklist} = \@l;
-		} else {
-			delete $self->{talklist};
-			$self->state('prompt');
-		}
-	}
-}
-
-sub send_chats
-{
-	my $self = shift;
-	my $target = shift;
-	my $text = shift;
-
-	my $msgid = DXProt::nextchatmsgid();
-	$text = "#$msgid $text";
-	$main::me->normal(DXProt::pc93($target, $self->{call}, undef, $text));
-}
 
 sub special_prompt
 {
@@ -527,15 +520,15 @@ sub run_cmd
 		
 	if ($cmd) {
 
-		# check cmd
-		if ($cmd =~ m|^/| || $cmd =~ m|[^-?\w/]|) {
+		# strip out // on command only
+		$cmd =~ s|//+|/|g;
+
+		# check for length of whole command line and any invalid characters
+		if (length $cmdline > $maxcmdlth || $cmd =~ m|\.| || $cmd !~ m|^\w+(?:/\w+){0,1}(?:/\d+)?$|) {
 			LogDbg('DXCommand', "cmd: $self->{call} - invalid characters in '$cmd'");
-			return $self->_error_out('e1');
+			return $self->_error_out('e40');
 		}
 
-		# strip out // on command only
-		$cmd =~ s|//|/|g;
-					
 		my ($path, $fcmd);
 			
 		dbg("cmd: $cmd") if isdbg('command');
@@ -578,7 +571,7 @@ sub run_cmd
 				return $self->_error_out('e1');
 			}
 		} else {
-			dbg("cmd: $cmd not found") if isdbg('command');
+			LogDbg('DXCommand', "$self->{call} cmd: '$cmd' not found");
 			return $self->_error_out('e1');
 		}
 	}
@@ -587,11 +580,11 @@ sub run_cmd
 	if ($ok) {
 		delete $self->{errors};
 	} else {
-		if (++$self->{errors} > $DXChannel::maxerrors) {
+		if ($self != $main::me && ++$self->{errors} > $DXChannel::maxerrors) {
 			$self->send($self->msg('e26'));
 			$self->disconnect;
 			return ();
-		}
+		} 
 	}
 	return map {s/([^\s])\s+$/$1/; $_} @ans;
 }
@@ -617,7 +610,7 @@ sub process
 		}
 		
 		# send a prompt if no activity out on this channel
-		if ($t >= $dxchan->t + $main::user_interval) {
+		if ($t >= $dxchan->t + $dxchan->{user_interval}) {
 			$dxchan->prompt() if $dxchan->{state} =~ /^prompt/o;
 			$dxchan->t($t);
 		}
@@ -663,7 +656,7 @@ sub disconnect
 
 		# issue a pc17 to everybody interested
 		$main::me->route_pc17($main::mycall, undef, $main::routeroot, $uref);
-		$main::me->route_pc92d($main::mycall, undef, $main::routeroot, $uref) unless $DXProt::pc92_slug_changes;
+		$main::me->route_pc92d($main::mycall, undef, $main::routeroot, $uref) unless $DXProt::pc92_slug_changes || ! $DXProt::pc92_ad_enable;
 	} else {
 		confess "trying to disconnect a non existant user $call";
 	}
@@ -871,7 +864,6 @@ sub find_cmd_name {
 		
 		if (isdbg('eval')) {
 			my @list = split /\n/, $eval;
-			my $line;
 			for (@list) {
 				dbg($_ . "\n") if isdbg('eval');
 			}
@@ -922,33 +914,6 @@ sub local_send
 	}
 }
 
-# send a talk message here
-sub talk
-{
-	my ($self, $from, $to, $via, $line, $onode) = @_;
-	$line =~ s/\\5E/\^/g;
-	if ($self->{talk}) {
-		if ($self->{gtk}) {
-			$self->local_send('T', dd(['talk',$to,$from,$via,$line]));
-		} else {
-			$self->local_send('T', "$to de $from: $line");
-		}
-	}
-	Log('talk', $to, $from, '<' . ($onode || '*'), $line);
-	# send a 'not here' message if required
-	unless ($self->{here} && $from ne $to) {
-		my $key = "$to$from";
-		unless (exists $nothereslug{$key}) {
-			my ($ref, $dxchan);
-			if (($ref = Route::get($from)) && ($dxchan = $ref->dxchan)) {
-				my $name = $self->user->name || $to;
-				my $s = $self->user->nothere || $dxchan->msg('nothere', $name);
-				$nothereslug{$key} = $main::systime;
-				$dxchan->talk($to, $from, undef, $s);
-			}
-		}
-	}
-}
 
 # send an announce
 sub announce
@@ -986,6 +951,22 @@ sub announce
 	$self->local_send($target eq 'WX' ? 'W' : 'N', $buf);
 }
 
+# send a talk message here
+sub talk
+{
+	my ($self, $from, $to, $via, $line, $onode) = @_;
+	$line =~ s/^\#\d+ //;
+	$line =~ s/\\5E/\^/g;
+	if ($self->{talk}) {
+		if ($self->{gtk}) {
+			$self->local_send('T', dd(['talk',$to,$from,$via,$line]));
+		} else {
+			$self->local_send('T', "$to de $from: $line");
+		}
+	}
+	Log('talk', $to, $from, '<' . ($onode || '*'), $line);
+}
+
 # send a chat
 sub chat
 {
@@ -1011,6 +992,31 @@ sub chat
 	$self->local_send('C', $buf);
 }
 
+# send out the talk messages taking into account vias and connectivity
+sub send_talks
+{
+	my ($self, $target, $text) = @_;
+	
+	my $msgid = DXProt::nextchatmsgid();
+	$text = "#$msgid $text";
+	my $ipaddr = alias_localhost($self->hostname || '127.0.0.1');
+	$main::me->normal(DXProt::pc93($target, $self->{call}, undef, $text, undef, $ipaddr));	
+
+}
+
+sub send_chats
+{
+	my $self = shift;
+	my $target = shift;
+	my $text = shift;
+
+	my $msgid = DXProt::nextchatmsgid();
+	$text = "#$msgid $text";
+	my $ipaddr = alias_localhost($self->hostname || '127.0.0.1');
+	$main::me->normal(DXProt::pc93($target, $self->{call}, undef, $text, undef, $ipaddr));
+}
+
+
 sub format_dx_spot
 {
 	my $self = shift;
@@ -1023,41 +1029,45 @@ sub format_dx_spot
 	$c =~ s/\t/ /g;
 	my $comment = substr (($c || ''), 0, $clth);
 	$comment .= ' ' x ($clth - (length($comment)));
-	
-    if (!$slot1 && $self->{user}->wantgrid) {
-		my $ref = DXUser::get_current($_[1]);
-		if ($ref && $ref->qra) {
-			$slot1 = ' ' . substr($ref->qra, 0, 4);
+
+	if ($self->{user}) {		# to allow the standalone program 'showdx' to work
+		if (!$slot1 && $self->{user}->wantgrid) {
+			my $ref = DXUser::get_current($_[1]);
+			if ($ref && $ref->qra) {
+				$slot1 = ' ' . substr($ref->qra, 0, 4);
+			}
 		}
-	}
-	if (!$slot1 && $self->{user}->wantusstate) {
-		$slot1 = " $_[12]" if $_[12];
-	}
-	unless ($slot1) {
-		if ($self->{user}->wantdxitu) {
-			$slot1 = sprintf(" %2d", $_[8]) if defined $_[8]; 
-		} elsif ($self->{user}->wantdxcq) {
-			$slot1 = sprintf(" %2d", $_[9]) if defined $_[9];
+		if (!$slot1 && $self->{user}->wantusstate) {
+			$slot1 = " $_[12]" if $_[12];
 		}
-	}
-	$comment = substr($comment, 0,  $clth-length($slot1)) . $slot1 if $slot1;
+		unless ($slot1) {
+			if ($self->{user}->wantdxitu) {
+				$slot1 = sprintf(" %2d", $_[8]) if defined $_[8]; 
+			}
+			elsif ($self->{user}->wantdxcq) {
+				$slot1 = sprintf(" %2d", $_[9]) if defined $_[9];
+			}
+		}
+		$comment = substr($comment, 0,  $clth-length($slot1)) . $slot1 if $slot1;
 	
-    if (!$slot2 && $self->{user}->wantgrid) {
-		my $origin = $_[4];
-		$origin =~ s/-#$//;			# sigh......
-		my $ref = DXUser::get_current($origin);
-		if ($ref && $ref->qra) {
-			$slot2 = ' ' . substr($ref->qra, 0, 4);
+		if (!$slot2 && $self->{user}->wantgrid) {
+			my $origin = $_[4];
+			$origin =~ s/-#$//;	# sigh......
+			my $ref = DXUser::get_current($origin);
+			if ($ref && $ref->qra) {
+				$slot2 = ' ' . substr($ref->qra, 0, 4);
+			}
 		}
-	}
-	if (!$slot2 && $self->{user}->wantusstate) {
-		$slot2 = " $_[13]" if $_[13];
-	}
-	unless ($slot2) {
-		if ($self->{user}->wantdxitu) {
-			$slot2 = sprintf(" %2d", $_[10]) if defined $_[10]; 
-		} elsif ($self->{user}->wantdxcq) {
-			$slot2 = sprintf(" %2d", $_[11]) if defined $_[11]; 
+		if (!$slot2 && $self->{user}->wantusstate) {
+			$slot2 = " $_[13]" if $_[13];
+		}
+		unless ($slot2) {
+			if ($self->{user}->wantdxitu) {
+				$slot2 = sprintf(" %2d", $_[10]) if defined $_[10]; 
+			}
+			elsif ($self->{user}->wantdxcq) {
+				$slot2 = sprintf(" %2d", $_[11]) if defined $_[11]; 
+			}
 		}
 	}
 
@@ -1368,7 +1378,7 @@ sub spawn_cmd
 	no strict 'refs';
 
 	# just behave normally if something has set the "one-shot" _nospawn in the channel
-	if ($self->{_nospawn}) {
+	if ($self->{_nospawn} || $main::is_win == 1) {
 		eval { @out = $cmdref->(@$args); };
 		if ($@) {
 			DXDebug::dbgprintring(25);
@@ -1434,5 +1444,20 @@ sub user_count
     return ($users, $maxusers);
 }
 
+# alias localhost if required. This is designed to repress all localhost and other
+# internal interfaces to a fixed (outside) IPv4 or IPV6 address
+sub alias_localhost
+{
+	my $hostname = shift;
+	if ($hostname =~ /./) {
+		return $hostname unless $main::localhost_alias_ipv4;
+		return (grep $hostname eq $_, @main::localhost_names) ? $main::localhost_alias_ipv4 : $hostname;
+	} elsif ($hostname =~ /:/) {
+		return $hostname unless $main::localhost_alias_ipv6;
+		return (grep $hostname eq $_, @main::localhost_names) ? $main::localhost_alias_ipv6 : $hostname;
+	}
+	return $hostname;
+}
+
 1;
 __END__