use WCY;
use Sun;
use Internet;
+use Script;
+
use strict;
-use vars qw(%Cache %cmd_cache $errstr %aliases $scriptbase $maxerrors %nothereslug $suppress_ann_to_talk);
+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
%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
-$suppress_ann_to_talk = 1; # don't announce 'to <call> ' or '<call> ' type announcements
+$maxbadcount = 3; # no of bad words allowed before disconnection
use vars qw($VERSION $BRANCH);
$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ || (0,0));
$main::build += $VERSION;
$main::branch += $BRANCH;
my $pkg = shift;
my $call = shift;
my @rout = $main::routeroot->add_user($call, Route::here(1));
- DXProt::route_pc16($DXProt::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;
}
$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
$self->{wx} = $user->wantwx;
$self->{dx} = $user->wantdx;
$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);
$user->qra(DXBearing::lltoqra($lat, $long)) if (defined $lat && defined $long);
}
- # send prompts and things
- my $info = Route::cluster();
- $self->send("Cluster:$info");
- $self->send($self->msg('namee1')) if !$user->name;
- $self->send($self->msg('qthe1')) if !$user->qth;
- $self->send($self->msg('qll')) if !$user->qra || (!$user->lat && !$user->long);
- $self->send($self->msg('hnodee1')) if !$user->qth;
- $self->send($self->msg('m9')) if DXMsg::for_me($call);
- $self->prompt;
-
# 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');
# 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) {
- run_cmd($DXProt::me, "forward/opernam $call");
- $user->lastoper($main::systime);
+ if ($homenode eq $main::mycall && $main::systime >= $lastoper + $DXUser::lastoperinterval) {
+ run_cmd($main::me, "forward/opernam $call");
+ $user->lastoper($main::systime + ((int rand(10)) * 86400));
}
+
+ # run a script send the output to the punter
+ my $script = new Script(lc $call) || new Script('user_default');
+ $script->run($self) if $script;
+
+ # send cluster info
+ my $info = Route::cluster();
+ $self->send("Cluster:$info");
+
+ # send prompts and things
+ $self->send($self->msg('namee1')) if !$user->name;
+ $self->send($self->msg('qthe1')) if !$user->qth;
+ $self->send($self->msg('qll')) if !$user->qra || (!$user->lat && !$user->long);
+ $self->send($self->msg('hnodee1')) if !$user->qth;
+ $self->send($self->msg('m9')) if DXMsg::for_me($call);
+ $self->prompt;
}
#
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/;
}
} 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/) {
} 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) {
}
$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 {
# for safety
$self->state('prompt');
}
+ } elsif (my $func = $self->{func}) {
+ no strict 'refs';
+ my @ans;
+ if (ref $self->{edit}) {
+ eval { @ans = $self->{edit}->$func($self, $rawline)};
+ } else {
+ 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(@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;
}
my $cmdline = shift;
my @ans;
- if ($self->{func}) {
- my $c = qq{ \@ans = $self->{func}(\$self, \$cmdline) };
- dbg("stored func cmd = $c\n") if isdbg('eval');
- eval $c;
- if ($@) {
- return ("Syserr: Eval err $errstr on stored func $self->{func}", $@);
- }
- } else {
- return () if length $cmdline == 0;
+ return () if length $cmdline == 0;
- # strip out //
- $cmdline =~ s|//|/|og;
+ # strip out //
+ $cmdline =~ s|//|/|og;
- # split the command line up into parts, the first part is the command
- my ($cmd, $args) = split /\s+/, $cmdline, 2;
- $args = "" unless defined $args;
+ # 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) {
+ if ($cmd) {
- my ($path, $fcmd);
+ my ($path, $fcmd);
- dbg("cmd: $cmd") if isdbg('command');
+ dbg("cmd: $cmd") if isdbg('command');
- # alias it if possible
- my $acmd = CmdAlias::get_cmd($cmd);
- if ($acmd) {
- ($cmd, $args) = split /\s+/, "$acmd $args", 2;
- $args = "" unless defined $args;
- dbg("aliased cmd: $cmd $args") if isdbg('command');
- }
+ # alias it if possible
+ my $acmd = CmdAlias::get_cmd($cmd);
+ if ($acmd) {
+ ($cmd, $args) = split /\s+/, "$acmd $args", 2;
+ $args = "" unless defined $args;
+ dbg("aliased cmd: $cmd $args") if isdbg('command');
+ }
- # first expand out the entry to a command
- ($path, $fcmd) = search($main::localcmd, $cmd, "pl");
- ($path, $fcmd) = search($main::cmd, $cmd, "pl") if !$path || !$fcmd;
+ # first expand out the entry to a command
+ ($path, $fcmd) = search($main::localcmd, $cmd, "pl");
+ ($path, $fcmd) = search($main::cmd, $cmd, "pl") if !$path || !$fcmd;
- if ($path && $cmd) {
- dbg("path: $cmd cmd: $fcmd") if isdbg('command');
+ if ($path && $cmd) {
+ dbg("path: $cmd cmd: $fcmd") if isdbg('command');
- my $package = find_cmd_name($path, $fcmd);
- @ans = (0) if !$package ;
+ my $package = find_cmd_name($path, $fcmd);
+ return ($@) if $@;
- if ($package) {
- dbg("package: $package") if isdbg('command');
- my $c;
- unless (exists $Cache{$package}->{'sub'}) {
- $c = eval $Cache{$package}->{'eval'};
- if ($@) {
- return DXDebug::shortmess($@);
- }
- $Cache{$package}->{'sub'} = $c;
- }
- $c = $Cache{$package}->{'sub'};
- eval {
- @ans = &{$c}($self, $args);
- };
-
- if ($@) {
- #cluck($@);
- return (DXDebug::shortmess($@));
- };
- }
+ if ($package) {
+ no strict 'refs';
+ dbg("package: $package") if isdbg('command');
+ eval { @ans = &$package($self, $args) };
+ return (DXDebug::shortmess($@)) if $@;
+ }
+ } else {
+ dbg("cmd: $cmd not found") if isdbg('command');
+ if (++$self->{errors} > $maxerrors) {
+ $self->send($self->msg('e26'));
+ $self->disconnect;
+ return ();
} 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->msg('e1'));
}
}
}
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($DXProt::me, $main::routeroot, @rout) if @rout;
-
# I was the last node visited
$self->user->node($main::mycall);
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]
$l = join '.', @lparts;
# chop $dirfn; # remove trailing /
$dirfn = "" unless $dirfn;
- $cmd_cache{"$short_cmd"} = join(',', ($path, "$dirfn$l")); # cache it
+ $cmd_cache{$short_cmd} = join(',', ($path, "$dirfn$l")); # cache it
dbg("got path: $path cmd: $dirfn$l\n") if isdbg('command');
return ($path, "$dirfn$l");
}
# clear the command name cache
sub clear_cmd_cache
{
+ no strict 'refs';
+
+ for (keys %Cache) {
+ undef *{$_} unless /cmd_cache/;
+ dbg("Undefining cmd $_") if isdbg('command');
+ }
%cmd_cache = ();
+ %Cache = ();
}
#
sub valid_package_name {
my($string) = @_;
- $string =~ s/([^A-Za-z0-9\/])/sprintf("_%2x",unpack("C",$1))/eg;
-
- #second pass only for words starting with a digit
- $string =~ s|/(\d)|sprintf("/_%2x",unpack("C",$1))|eg;
+ $string =~ s|([^A-Za-z0-9_/])|sprintf("_%2x",unpack("C",$1))|eg;
- #Dress it up as a real package name
- $string =~ s/\//_/og;
- return $string;
-}
-
-# find a cmd reference
-# this is really for use in user written stubs
-#
-# use the result as a symbolic reference:-
-#
-# no strict 'refs';
-# @out = &$r($self, $line);
-#
-sub find_cmd_ref
-{
- my $cmd = shift;
- my $r;
-
- if ($cmd) {
-
- # first expand out the entry to a command
- my ($path, $fcmd) = search($main::localcmd, $cmd, "pl");
- ($path, $fcmd) = search($main::cmd, $cmd, "pl") if !$path || !$fcmd;
-
- # make sure it is loaded
- $r = find_cmd_name($path, $fcmd);
- }
- return $r;
+ $string =~ s|/|_|g;
+ return "cmd_$string";
}
#
};
#wrap the code into a subroutine inside our unique package
- my $eval = qq( sub { $sub } );
+ my $eval = qq( sub $package { $sub } );
if (isdbg('eval')) {
my @list = split /\n/, $eval;
}
}
- $Cache{$package} = {mtime => $mtime, 'eval' => $eval };
+ # get rid of any existing sub and try to compile the new one
+ no strict 'refs';
+
+ if (exists $Cache{$package}) {
+ dbg("Redefining $package") if isdbg('command');
+ undef *$package;
+ } else {
+ dbg("Defining $package") if isdbg('command');
+ }
+ eval $eval;
+
+ $Cache{$package} = {mtime => $mtime };
+
}
return $package;
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";
my $text = shift;
my ($filter, $hops);
- if ($suppress_ann_to_talk && $to ne $self->{call}) {
+ if (!$self->{ann_talk} && $to ne $self->{call}) {
my $call = AnnTalk::is_talk_candidate($_[0], $text);
- return if $call && Route::get($call);
+ return if $call;
}
if ($self->{annfilter}) {
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);