X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCommandmode.pm;h=ffad39cf1506a6ced64cb3e948d1498a7a4605af;hb=refs%2Fheads%2Fstaging;hp=8abd8d4eeadc586b387b71974c38951be9f3069e;hpb=d5bbb8b5085e57870503e56c79cdebb26122c915;p=spider.git

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index 8abd8d4e..ffad39cf 100644
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -49,7 +49,8 @@ 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
+);
 
 %Cache = ();					# cache of dynamically loaded routine's mod times
 %cmd_cache = ();				# cache of short names
@@ -74,8 +75,9 @@ 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
 	my $ref = Route::User::get($call);
@@ -106,6 +108,7 @@ sub start
 
 	$self->{name} = $name ? $name : $call;
 	$self->send($self->msg('l2',$self->{name}));
+	$self->send("Capabilities: ve7cc rbn");
 	$self->state('prompt');		# a bit of room for further expansion, passwords etc
 	$self->{priv} = $user->priv || 0;
 	$self->{lang} = $user->lang || $main::lang || 'en';
@@ -142,12 +145,14 @@ sub start
 	$self->{here} = 1;
 	$self->{prompt} = $user->prompt if $user->prompt;
 	$self->{lastmsgpoll} = 0;
-
+	$self->{rbnseeme} = $user->rbnseeme;
+	RBN::add_seeme($call) if $self->{rbnseeme};
+	
 	# sort out new dx spot stuff
 	$user->wantdxcq(0) unless defined $user->{wantdxcq};
 	$user->wantdxitu(0) unless defined $user->{wantdxitu};	
 	$user->wantusstate(0) unless defined $user->{wantusstate};
-
+	
 	# sort out registration
 	if ($main::reqreg == 2) {
 		$self->{registered} = !$user->registered;
@@ -164,7 +169,7 @@ 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;
@@ -256,6 +261,7 @@ sub normal
 	my $self = shift;
 	my $cmdline = shift;
 	my @ans;
+	my @bad;
 
 	# save this for them's that need it
 	my $rawline = $cmdline;
@@ -342,15 +348,14 @@ sub normal
 		} 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 {
+			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);
@@ -364,10 +369,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') {
@@ -399,11 +403,16 @@ 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 {
+			$self->send_ans(run_cmd($self, $cmdline));
+#		}
 	} 
 
 	# 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;
@@ -648,6 +657,7 @@ sub disconnect
 	return if $self->{disconnecting}++;
 
 	delete $self->{senddbg};
+	RBN::del_seeme($call);
 
 	my $uref = Route::User::get($call);
 	my @rout;
@@ -1430,5 +1440,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__