X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCommandmode.pm;h=798351773c998c62f603facd84c093c782873d34;hb=c02dc2d8b544b9d682c9a068ba13bdedf40ed3bf;hp=691e29b2d6b3fa928933a878ec07221b579957da;hpb=11d4503c67235600af279b57b785e5657faaf63c;p=spider.git

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index 691e29b2..79835177 100644
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -39,7 +39,7 @@ use VE7CC;
 use DXXml;
 
 use strict;
-use vars qw(%Cache %cmd_cache $errstr %aliases $scriptbase $maxerrors %nothereslug
+use vars qw(%Cache %cmd_cache $errstr %aliases $scriptbase %nothereslug
 	$maxbadcount $msgpolltime $default_pagelth $cmdimportdir);
 
 %Cache = ();					# cache of dynamically loaded routine's mod times
@@ -47,7 +47,6 @@ use vars qw(%Cache %cmd_cache $errstr %aliases $scriptbase $maxerrors %notheresl
 $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
 $msgpolltime = 3600;			# the time between polls for new messages 
 $cmdimportdir = "$main::root/cmd_import"; # the base directory for importing command scripts 
@@ -66,7 +65,7 @@ sub new
 	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]);
+	DXProt::_add_thingy($main::routeroot, [$call, 0, 0, 1, undef, undef, $self->{conn}->peerhost], );
 
 	# ALWAYS output the user
 	my $ref = Route::User::get($call);
@@ -90,7 +89,7 @@ sub start
 	my $name = $user->{name};
 	
 	# log it
-	my $host = $self->{conn}->{peerhost};
+	my $host = $self->{conn}->peerhost;
 	$host ||= "AGW Port #$self->{conn}->{agwport}" if exists $self->{conn}->{agwport};
 	$host ||= "unknown";
 	LogDbg('DXCommand', "$call connected from $host");
@@ -134,16 +133,8 @@ sub start
 		$self->{registered} = 1;
 	}
 
-
-	# decide which motd to send
-	my $motd;
-	unless ($self->{registered}) {
-		$motd = "${main::motd}_nor_$self->{lang}";
-		$motd = "${main::motd}_nor" unless -e $motd;
-	}
-	$motd = "${main::motd}_$self->{lang}" unless $motd && -e $motd;
-	$motd = $main::motd unless $motd && -e $motd;
-	$self->send_file($motd) if -e $motd;
+	# send the relevant MOTD
+	$self->send_motd;
 
 	# sort out privilege reduction
 	$self->{priv} = 0 if $line =~ /^(ax|te)/ && !$self->conn->{usedpasswd};
@@ -212,7 +203,7 @@ sub start
 	foreach my $call (@{$user->buddies}) {
 		my $ref = Route::User::get($call);
 		if ($ref) {
-			foreach my $node (@{$ref->parent}) {
+			foreach my $node ($ref->parents) {
 				$self->send($self->msg($node eq $main::mycall ? 'loginb' : 'loginbn', $call, $node));
 			} 
 		}
@@ -477,6 +468,7 @@ sub send_ans
 		}
 	} 
 }
+
 # 
 # this is the thing that runs the command, it is done like this for the 
 # benefit of remote command execution
@@ -490,19 +482,22 @@ sub run_cmd
 	my $cmdline = shift;
 	my @ans;
 	
-
 	return () if length $cmdline == 0;
 	
-	
 	# split the command line up into parts, the first part is the command
 	my ($cmd, $args) = split /\s+/, $cmdline, 2;
 	$args = "" unless defined $args;
 		
 	if ($cmd) {
+
+		# check cmd
+		if ($cmd =~ m|^/| || $cmd =~ m|[^-?\w/]|) {
+			LogDbg('DXCommand', "cmd: invalid characters in '$cmd'");
+			return $self->_error_out('e1');
+		}
+
 		# strip out // on command only
 		$cmd =~ s|//|/|g;
-		$cmd =~ s|^/||g;		# no leading / either
-		$cmd =~ s|[^-?\w/]||g;		# and no funny characters either
 					
 		my ($path, $fcmd);
 			
@@ -513,7 +508,7 @@ sub run_cmd
 		if ($acmd) {
 			($cmd, $args) = split /\s+/, "$acmd $args", 2;
 			$args = "" unless defined $args;
-			dbg("aliased cmd: $cmd $args") if isdbg('command');
+			dbg("cmd: aliased $cmd $args") if isdbg('command');
 		}
 			
 		# first expand out the entry to a command
@@ -521,26 +516,23 @@ sub run_cmd
 		($path, $fcmd) = search($main::cmd, $cmd, "pl") unless $path && $fcmd;
 
 		if ($path && $cmd) {
-			dbg("path: $cmd cmd: $fcmd") if isdbg('command');
+			dbg("cmd: path $cmd cmd: $fcmd") if isdbg('command');
 			
 			my $package = find_cmd_name($path, $fcmd);
 			return ($@) if $@;
 				
-			if ($package) {
+			if ($package && DXCommandmode->can($package)) {
 				no strict 'refs';
-				dbg("package: $package") if isdbg('command');
+				dbg("cmd: package $package") if isdbg('command');
 				eval { @ans = &$package($self, $args) };
 				return (DXDebug::shortmess($@)) if $@;
+			} else {
+				dbg("cmd: $package not present") if isdbg('command');
+				return $self->_error_out('e1');
 			}
 		} else {
 			dbg("cmd: $cmd not found") if isdbg('command');
-			if (++$self->{errors} > $maxerrors) {
-				$self->send($self->msg('e26'));
-				$self->disconnect;
-				return ();
-			} else {
-				return ($self->msg('e1'));
-			}
+			return $self->_error_out('e1');
 		}
 	}
 	
@@ -548,7 +540,7 @@ sub run_cmd
 	if ($ok) {
 		delete $self->{errors};
 	} else {
-		if (++$self->{errors} > $maxerrors) {
+		if (++$self->{errors} > $DXChannel::maxerrors) {
 			$self->send($self->msg('e26'));
 			$self->disconnect;
 			return ();
@@ -824,14 +816,15 @@ sub find_cmd_name {
 		no strict 'refs';
 
 		if (exists $Cache{$package}) {
-			dbg("Redefining $package") if isdbg('command');
+			dbg("find_cmd_name: Redefining $package") if isdbg('command');
 			undef *$package;
 		} else {
-			dbg("Defining $package") if isdbg('command');
+			dbg("find_cmd_name: Defining $package") if isdbg('command');
 		}
+
 		eval $eval;
-		
-		$Cache{$package} = {mtime => $mtime };
+
+		$Cache{$package} = {mtime => $mtime } unless $@;
 	    
 	}
 
@@ -963,7 +956,7 @@ sub format_dx_spot
 	my $comment = substr (($_[3] || ''), 0, $clth);
 	$comment .= ' ' x ($clth - length($comment));
 	if ($self->{user}->wantgrid) {
-		my $ref = DXUser->get_current($_[4]);
+		my $ref = DXUser::get_current($_[4]);
 		if ($ref) {
 			$loc = $ref->qra || '';
 			$loc = ' ' . substr($loc, 0, 4) if $loc;
@@ -1007,7 +1000,7 @@ sub dx_spot
 	} elsif ($self->{gtk}) {
 		my ($dxloc, $byloc);
 
-		my $ref = DXUser->get_current($_[4]);
+		my $ref = DXUser::get_current($_[4]);
 		if ($ref) {
 			$byloc = $ref->qra;
 			$byloc = substr($byloc, 0, 4) if $byloc;
@@ -1015,7 +1008,7 @@ sub dx_spot
 
 		my $spot = $_[1];
 		$spot =~ s|/\w{1,4}$||;
-		$ref = DXUser->get_current($spot);
+		$ref = DXUser::get_current($spot);
 		if ($ref) {
 			$dxloc = $ref->qra;
 			$dxloc = substr($dxloc, 0, 4) if $dxloc;
@@ -1183,7 +1176,7 @@ sub import_cmd
 			    if ($dxchan) {
 					@out = $s->run($dxchan, 1);
 				} else {
-					my $u = DXUser->get($call);
+					my $u = DXUser::get($call);
 					if ($u) {
 						$dxchan = $main::me;
 						my $old = $dxchan->{call};
@@ -1218,5 +1211,27 @@ sub print_find_reply
 	my $sort = $flag == 2 ? "External" : "Local";
 	$self->send("$sort $target found at $node in $ms ms" );
 }
+
+# send the most relevant motd
+sub send_motd
+{
+	my $self = shift;
+	my $motd;
+
+	unless ($self->{registered}) {
+		$motd = "${main::motd}_nor_$self->{lang}";
+		$motd = "${main::motd}_nor" unless -e $motd;
+	}
+	$motd = "${main::motd}_$self->{lang}" unless $motd && -e $motd;
+	$motd = $main::motd unless $motd && -e $motd;
+	if ($self->conn->ax25) {
+		if ($motd) {
+			$motd = "${motd}_ax25" if -e "${motd}_ax25";
+		} else {
+			$motd = "${main::motd}_ax25" if -e "${main::motd}_ax25";
+		}
+	}
+	$self->send_file($motd) if -e $motd;
+}
 1;
 __END__