X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCommandmode.pm;h=cda7690415ce9f56539c009894eea3ca4c421268;hb=e18c9b8b9a003bfb56416ab1d2aee0f232146d25;hp=3972e8b5b6509ebab966b8aa5303cab3e3cb6e69;hpb=417f55d271551683dfe1a49fb754024ba4731363;p=spider.git

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index 3972e8b5..cda76904 100644
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -34,7 +34,7 @@ use Script;
 
 
 use strict;
-use vars qw(%Cache %cmd_cache $errstr %aliases $scriptbase $maxerrors %nothereslug);
+use vars qw(%Cache %cmd_cache $errstr %aliases $scriptbase $maxerrors %nothereslug $maxbadcount);
 
 %Cache = ();					# cache of dynamically loaded routine's mod times
 %cmd_cache = ();				# cache of short names
@@ -42,6 +42,8 @@ $errstr = ();					# error string from eval
 %aliases = ();					# aliases for (parts of) commands
 $scriptbase = "$main::root/scripts"; # the place where all users start scripts go
 $maxerrors = 20;				# the maximum number of concurrent errors allowed before disconnection
+$maxbadcount = 3;				# no of bad words allowed before disconnection
+
 
 use vars qw($VERSION $BRANCH);
 $VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
@@ -61,7 +63,10 @@ sub new
 	my $pkg = shift;
 	my $call = shift;
 	my @rout = $main::routeroot->add_user($call, Route::here(1));
-	DXProt::route_pc16($main::me, $main::routeroot, @rout) if @rout;
+
+	# ALWAYS output the user
+	my $ref = Route::User::get($call);
+	DXProt::route_pc16($main::me, $main::routeroot, $ref) if $ref;
 
 	return $self;
 }
@@ -83,13 +88,11 @@ sub start
 
 	$self->{name} = $name ? $name : $call;
 	$self->send($self->msg('l2',$self->{name}));
-	$self->send_file($main::motd) if (-e $main::motd);
 	$self->state('prompt');		# a bit of room for further expansion, passwords etc
 	$self->{priv} = $user->priv || 0;
 	$self->{lang} = $user->lang || $main::lang || 'en';
 	$self->{pagelth} = $user->pagelth || 20;
-	$self->{priv} = 0 if $line =~ /^(ax|te)/; # set the connection priv to 0 - can be upgraded later
-	($self->{width}) = $line =~ /width=(\d+)/;
+	($self->{width}) = $line =~ /width=(\d+)/; $line =~ s/\s*width=\d+\s*//;
 	$self->{width} = 80 unless $self->{width} && $self->{width} > 80;
 	$self->{consort} = $line;	# save the connection type
 	
@@ -104,6 +107,25 @@ sub start
 	$self->{logininfo} = $user->wantlogininfo;
 	$self->{ann_talk} = $user->wantann_talk;
 	$self->{here} = 1;
+	$self->{prompt} = $user->prompt if $user->prompt;
+
+	# sort out registration
+	if ($main::reqreg == 1) {
+		$self->{registered} = $user->registered;
+	} elsif ($main::reqreg == 2) {
+		$self->{registered} = !$user->registered;
+	} else {
+		$self->{registered} = 1;
+	}
+
+
+	# decide which motd to send
+	my $motd = "${main::motd}_nor" unless $self->{registered};
+	$motd = $main::motd unless $motd && -e $motd;
+	$self->send_file($motd) if -e $motd;
+
+	# sort out privilege reduction
+	$self->{priv} = 0 if $line =~ /^(ax|te)/ && !$self->conn->{usedpasswd};
 
 	# get the filters
 	$self->{spotsfilter} = Filter::read_in('spots', $call, 0) || Filter::read_in('spots', 'user_default', 0);
@@ -121,9 +143,11 @@ sub start
 	}
 
 	# decide on echo
-	if (!$user->wantecho) {
+	my $echo = $user->wantecho;
+	unless ($echo) {
 		$self->send_now('E', "0");
 		$self->send($self->msg('echow'));
+		$self->conn->echo($echo) if $self->conn->can('echo');
 	}
 	
 	$self->tell_login('loginu');
@@ -131,9 +155,9 @@ sub start
 	# do we need to send a forward/opernam?
 	my $lastoper = $user->lastoper || 0;
 	my $homenode = $user->homenode || ""; 
-	if ($homenode eq $main::mycall && $lastoper + $DXUser::lastoperinterval < $main::systime) {
+	if ($homenode eq $main::mycall && $main::systime >= $lastoper + $DXUser::lastoperinterval) {
 		run_cmd($main::me, "forward/opernam $call");
-		$user->lastoper($main::systime);
+		$user->lastoper($main::systime + ((int rand(10)) * 86400));
 	}
 
 	# run a script send the output to the punter
@@ -162,6 +186,9 @@ sub normal
 	my $self = shift;
 	my $cmdline = shift;
 	my @ans;
+
+	# save this for them's that need it
+	my $rawline = $cmdline;
 	
 	# remove leading and trailing spaces
 	$cmdline =~ s/^\s*(.*)\s*$/$1/;
@@ -193,8 +220,8 @@ sub normal
 		}
 	} elsif ($self->{state} eq 'sysop') {
 		my $passwd = $self->{user}->passwd;
-		my @pw = split / */, $passwd;
 		if ($passwd) {
+			my @pw = grep {$_ !~ /\s/} split //, $passwd;
 			my @l = @{$self->{passwd}};
 			my $str = "$pw[$l[0]].*$pw[$l[1]].*$pw[$l[2]].*$pw[$l[3]].*$pw[$l[4]]";
 			if ($cmdline =~ /$str/) {
@@ -205,7 +232,31 @@ sub normal
 		} else {
 			$self->send($self->msg('sorry'));
 		}
-		delete $self->{passwd};
+		$self->state('prompt');
+	} elsif ($self->{state} eq 'passwd') {
+		my $passwd = $self->{user}->passwd;
+		if ($passwd && $cmdline eq $passwd) {
+			$self->send($self->msg('pw1'));
+			$self->state('passwd1');
+		} else {
+			$self->conn->{echo} = $self->conn->{decho};
+			delete $self->conn->{decho};
+			$self->send($self->msg('sorry'));
+			$self->state('prompt');
+		}
+	} elsif ($self->{state} eq 'passwd1') {
+		$self->{passwd} = $cmdline;
+		$self->send($self->msg('pw2'));
+		$self->state('passwd2');
+	} elsif ($self->{state} eq 'passwd2') {
+		if ($cmdline eq $self->{passwd}) {
+			$self->{user}->passwd($cmdline);
+			$self->send($self->msg('pw3'));
+		} else {
+			$self->send($self->msg('pw4'));
+		}
+		$self->conn->{echo} = $self->conn->{decho};
+		delete $self->conn->{decho};
 		$self->state('prompt');
 	} elsif ($self->{state} eq 'talk') {
 		if ($cmdline =~ m{^(?:/EX|/ABORT)}i) {
@@ -214,14 +265,35 @@ sub normal
 			}
 			$self->state('prompt');
 			delete $self->{talklist};
-		} elsif ($cmdline =~ m(^/\w+)) {
-			$cmdline =~ s(^/)();
-			$self->send_ans(run_cmd($self, $cmdline));
+		} 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);
+						Log('DXCommand', "$self->{call} swore: $l");
+					} else {
+						for (@{$self->{talklist}}) {
+							$self->send_talks($_, $l);
+						}
+					}
+				}
+			}
 			$self->send($self->talk_prompt);
 		} elsif ($self->{talklist} && @{$self->{talklist}}) {
 			# send what has been said to whoever is in this person's talk list
-			for (@{$self->{talklist}}) {
-				$self->send_talks($_, $cmdline);
+			my @bad;
+			if (@bad = BadWords::check($cmdline)) {
+				$self->badcount(($self->badcount||0) + @bad);
+				Log('DXCommand', "$self->{call} swore: $cmdline");
+			} else {
+				for (@{$self->{talklist}}) {
+					$self->send_talks($_, $rawline);
+				}
 			}
 			$self->send($self->talk_prompt) if $self->{state} eq 'talk';
 		} else {
@@ -232,16 +304,28 @@ sub normal
 		no strict 'refs';
 		my @ans;
 		if (ref $self->{edit}) {
-			eval { @ans = $self->{edit}->$func($self, $cmdline)};
+			eval { @ans = $self->{edit}->$func($self, $rawline)};
 		} else {
-			eval {	@ans = &{$self->{func}}($self, $cmdline) };
+			eval {	@ans = &{$self->{func}}($self, $rawline) };
+		}
+		if ($@) {
+			$self->send_ans("Syserr: on stored func $self->{func}", $@);
+			delete $self->{func};
+			$self->state('prompt');
+			undef $@;
 		}
-		$self->send_ans("Syserr: on stored func $self->{func}", $@) if $@;
 		$self->send_ans(@ans);
 	} else {
 		$self->send_ans(run_cmd($self, $cmdline));
 	} 
-	
+
+	# check for excessive swearing
+	if ($self->{badcount} && $self->{badcount} >= $maxbadcount) {
+		Log('DXCommand', "$self->{call} logged out for excessive swearing");
+		$self->disconnect;
+		return;
+	}
+
 	# send a prompt only if we are in a prompt state
 	$self->prompt() if $self->{state} =~ /^prompt/o;
 }
@@ -433,13 +517,13 @@ sub disconnect
 	if ($uref) {
 		@rout = $main::routeroot->del_user($uref);
 		dbg("B/C PC17 on $main::mycall for: $call") if isdbg('route');
+
+		# issue a pc17 to everybody interested
+		DXProt::route_pc17($main::me, $main::routeroot, $uref);
 	} else {
 		confess "trying to disconnect a non existant user $call";
 	}
 
-	# issue a pc17 to everybody interested
-	DXProt::route_pc17($main::me, $main::routeroot, @rout) if @rout;
-
 	# I was the last node visited
     $self->user->node($main::mycall);
 		
@@ -458,7 +542,11 @@ sub disconnect
 sub prompt
 {
 	my $self = shift;
-	$self->send($self->msg($self->here ? 'pr' : 'pr2', $self->call, cldate($main::systime), ztime($main::systime)));
+	if ($self->{prompt}) {
+		$self->send($self->{prompt});
+	} else {
+		$self->send($self->msg($self->here ? 'pr' : 'pr2', $self->call, cldate($main::systime), ztime($main::systime)));
+	}
 }
 
 # broadcast a message to all users [except those mentioned after buffer]
@@ -662,7 +750,7 @@ sub talk
 	my ($self, $from, $to, $via, $line) = @_;
 	$line =~ s/\\5E/\^/g;
 	$self->local_send('T', "$to de $from: $line") if $self->{talk};
-	Log('talk', $to, $from, $main::mycall, $line);
+	Log('talk', $to, $from, $via?$via:$main::mycall, $line);
 	# send a 'not here' message if required
 	unless ($self->{here} && $from ne $to) {
 		my $key = "$to$from";
@@ -724,7 +812,13 @@ sub dx_spot
 		return unless $filter;
 	}
 
-	my $buf = Spot::formatb($self->{user}->wantgrid, $_[0], $_[1], $_[2], $_[3], $_[4]);
+
+	my $t = ztime($_[2]);
+	my $ref = DXUser->get_current($_[4]);
+	my $loc = $ref->qra if $ref && $ref->qra && $self->{user}->wantgrid;
+	$loc = ' ' . substr($loc, 0, 4) if $loc;
+	$loc = "" unless $loc;
+	my $buf = sprintf "DX de %-7.7s%11.1f  %-12.12s %-*s $t$loc", "$_[4]:", $_[0], $_[1], $self->{consort} eq 'local' ? 29 : 30, $_[3];
 	$buf .= "\a\a" if $self->{beep};
 	$buf =~ s/\%5E/^/g;
 	$self->local_send('X', $buf);