use Script;
use DXProtHandle;
+use Time::HiRes qw(gettimeofday tv_interval);
+use Mojo::IOLoop::Subprocess;
+
use strict;
use vars qw($pc11_max_age $pc23_max_age $last_pc50 $eph_restime $eph_info_restime $eph_pc34_restime
sub init
{
- do "$main::data/hop_table.pl" if -e "$main::data/hop_table.pl";
+ my $fn = localdata("hop_table.pl");
+ do $fn if -e $fn;
confess $@ if $@;
my $user = DXUser::get($main::mycall);
my $host = $self->{conn}->peerhost;
$host ||= "AGW Port #$self->{conn}->{agwport}" if exists $self->{conn}->{agwport};
$host ||= "unknown";
+ $self->{hostname} = $host if is_ipaddr($host);
Log('DXProt', "$call connected from $host");
sub process_rcmd
{
my ($self, $tonode, $fromnode, $user, $cmd) = @_;
+
if ($tonode eq $main::mycall) {
my $ref = DXUser::get_current($fromnode);
unless ($ref && UNIVERSAL::isa($ref, 'DXUser')) {
$self->send_rcmd_reply($main::mycall, $fromnode, $user, "sorry...!");
return;
}
+ Log('rcmd', 'in', ($ref->{priv}||0), $fromnode, $cmd, $user);
my $cref = Route::Node::get($fromnode);
unless ($cref && UNIVERSAL::isa($cref, 'Route')) {
dbg("DXProt process_rcmd: Route $fromnode isn't a reference (tell G1TLH)");
$self->send_rcmd_reply($main::mycall, $fromnode, $user, "sorry...!");
return;
}
- Log('rcmd', 'in', ($ref->{priv}||0), $fromnode, $cmd);
if ($cmd !~ /^\s*rcmd/i && $ref->homenode && $cref->call eq $ref->homenode) { # not allowed to relay RCMDS!
if ($ref->{priv}) { # you have to have SOME privilege, the commands have further filtering
$self->{remotecmd} = 1; # for the benefit of any command that needs to know
my $oldpriv = $self->{priv};
- $self->{priv} = $ref->{priv}; # assume the user's privilege level
+ $self->{priv} = 1; # set a maximum privilege
+
+ # park homenode and user for any spawned command that run_cmd may do.
+ $self->{_rcmd_user} = $user;
+ $self->{_rcmd_fromnode} = $fromnode;
my @in = (DXCommandmode::run_cmd($self, $cmd));
+ delete $self->{_rcmd_fromnode};
+ delete $self->{_rcmd_user};
$self->{priv} = $oldpriv;
$self->send_rcmd_reply($main::mycall, $fromnode, $user, @in);
delete $self->{remotecmd};
}
}
+
+sub send_rcmd_reply
+{
+ my $self = shift;
+ my $tonode = shift;
+ my $fromnode = shift;
+ my $user = shift;
+ while (@_) {
+ my $line = shift;
+ $line =~ s/\s*$//;
+ Log('rcmd', 'out', $fromnode, $line, $user);
+ if ($self->is_clx) {
+ $self->send(pc85($main::mycall, $fromnode, $user, "$main::mycall:$line"));
+ } else {
+ $self->send(pc35($main::mycall, $fromnode, "$main::mycall:$line"));
+ }
+ }
+}
+
+# Punt off a long running command into a separate process - this will be caused by an rcmd from outside
+#
+# This is called from commands to run some potentially long running
+# function. The process forks and then runs the function and returns
+# the result back to the cmd.
+#
+# NOTE: this merely forks the current process and then runs the cmd in that (current) context.
+# IT DOES NOT START UP SOME NEW PROGRAM AND RELIES ON THE FACT THAT IT IS RUNNING DXSPIDER
+# THE CURRENT CONTEXT!!
+#
+# call: $self->spawn_cmd($original_cmd_line, \<function>, [cb => sub{...}], [prefix => "cmd> "], [progress => 0|1], [args => [...]]);
+sub spawn_cmd
+{
+ my $self = shift;
+ my $line = shift;
+ my $cmdref = shift;
+ my $call = $self->{call};
+ my %args = @_;
+ my @out;
+
+ my $cb = delete $args{cb};
+ my $prefix = delete $args{prefix};
+ my $progress = delete $args{progress};
+ my $args = delete $args{args} || [];
+ my $t0 = [gettimeofday];
+
+ # remembered from process_cmd when spawn_cmd was called thru DXCommandmode::run_cmd which was called by process_rcmd
+ my $fromnode = $self->{_rcmd_fromnode};
+ my $user = $self->{_rcmd_user};
+
+ no strict 'refs';
+
+ my $fc = Mojo::IOLoop::Subprocess->new;
+
+ # just behave normally if something has set the "one-shot" _nospawn in the channel
+ return ($cmdref->(@$args)) if $self->{_nospawn};
+
+ # $fc->serializer(\&encode_json);
+# $fc->deserializer(\&decode_json);
+ $fc->run(
+ sub {
+ my $subpro = shift;
+ if (isdbg('chan')) {
+ my $s = "line: $line";
+ $s .= ", args: " . join(', ', @$args) if $args && @$args;
+ }
+
+ my @res = $cmdref->(@$args);
+# diffms("by $call 1", $line, $t0, scalar @res) if isdbg('chan');
+ return @res;
+ },
+# $args,
+ sub {
+ my ($fc, $err, @res) = @_;
+ my $self = DXChannel::get($call);
+ return unless $self;
+
+ if ($err) {
+ my $s = "DXCommand::spawn_cmd: call $call error $err";
+ dbg($s) if isdbg('chan');
+ if ($fromnode && $user) {
+ $self->send_rcmd_reply($main::mycall, $fromnode, $user, $s);
+ } else {
+ $self->send($s);
+ }
+ return;
+ }
+ if ($cb) {
+ # transform output if required
+ @res = $cb->($self, @res);
+ }
+ if (@res) {
+ if ($fromnode && $user) {
+ $self->send_rcmd_reply($main::mycall, $fromnode, $user, @res);
+ } else {
+ $self->send(@res);
+ }
+ }
+ diffms("rcmd from $user on $call", $line, $t0, scalar @res) if isdbg('chan');
+ });
+
+ return @out;
+}
+
sub process_rcmd_reply
{
my ($self, $tonode, $fromnode, $user, $line) = @_;
}
}
-sub send_rcmd_reply
-{
- my $self = shift;
- my $tonode = shift;
- my $fromnode = shift;
- my $user = shift;
- while (@_) {
- my $line = shift;
- $line =~ s/\s*$//;
- Log('rcmd', 'out', $fromnode, $line);
- if ($self->is_clx) {
- $self->send(pc85($main::mycall, $fromnode, $user, "$main::mycall:$line"));
- } else {
- $self->send(pc35($main::mycall, $fromnode, "$main::mycall:$line"));
- }
- }
-}
+
# add a rcmd request to the rcmd queues
sub addrcmd
{
}
+
+
+
1;
__END__
projects / spider.git / blobdiff