X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_export%2Fshellcommands.pm;h=9408d1454fc2f0c709ea88f38afa857d36e2aa2e;hb=63973c641c4be00765fa27e55c57cc5b9aa4da19;hp=edbe78f03a977ae46d0beb70774cceb76191757b;hpb=eee6d96f68294389e3e1659e18a945ff2e5c47e5;p=freeside.git
diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm
index edbe78f03..9408d1454 100644
--- a/FS/FS/part_export/shellcommands.pm
+++ b/FS/FS/part_export/shellcommands.pm
@@ -78,10 +78,14 @@ tie my %options, 'Tie::IxHash',
},
'groups_susp_reason' => { label =>
'Radius group mapping to reason (via template user)',
- type => 'textarea',
- },
- 'ignore_all_output' => {
- label => 'Ignore all output and errors from the command',
+ type => 'textarea',
+ },
+ 'fail_on_output' => {
+ label => 'Treat any output from the command as an error',
+ type => 'checkbox',
+ },
+ 'ignore_all_errors' => {
+ label => 'Ignore all errors from the command',
type => 'checkbox',
},
'ignored_errors' => { label => 'Regexes of specific errors to ignore, separated by newlines',
@@ -93,12 +97,12 @@ tie my %options, 'Tie::IxHash',
;
%info = (
- 'svc' => 'svc_acct',
- 'desc' =>
- 'Real-time export via remote SSH (i.e. useradd, userdel, etc.)',
- 'options' => \%options,
- 'nodomain' => 'Y',
- 'notes' => <<'END'
+ 'svc' => 'svc_acct',
+ 'desc' => 'Real-time export via remote SSH (i.e. useradd, userdel, etc.)',
+ 'options' => \%options,
+ 'nodomain' => 'Y',
+ 'svc_machine' => 1,
+ 'notes' => <<'END'
Run remote commands via SSH. Usernames are considered unique (also see
shellcommands_withdomain). You probably want this if the commands you are
running will not accept a domain as a parameter. You will need to
@@ -120,24 +124,7 @@ running will not accept a domain as a parameter. You will need to
this.form.unsuspend_stdin.value="";
'>
-
- Note: On FreeBSD versions before 5.3 and 4.10 (4.10 is after 4.9, not
- 4.1!), due to deficient locking in pw(1), you must disable the chpass(1),
- chsh(1), chfn(1), passwd(1), and vipw(1) commands, or replace them with
- wrappers that prepend "lockf /etc/passwd.lock". Alternatively, apply the
- patch in
- FreeBSD PR#23501
- and use the "FreeBSD 4.10 / 5.3 or later" button below.
-
- getfield($_) foreach $svc_acct->fields;
# snarfs are unused at this point?
- my $count = 1;
- foreach my $acct_snarf ( $svc_acct->acct_snarf ) {
- ${"snarf_$_$count"} = shell_quote( $acct_snarf->get($_) )
- foreach qw( machine username _password );
- $count++;
- }
+ # my $count = 1;
+ # foreach my $acct_snarf ( $svc_acct->acct_snarf ) {
+ # ${"snarf_$_$count"} = shell_quote( $acct_snarf->get($_) )
+ # foreach qw( machine username _password );
+ # $count++;
+ # }
}
my $cust_pkg = $svc_acct->cust_svc->cust_pkg;
@@ -356,18 +343,20 @@ sub _export_command {
my @ssh_cmd_args = (
user => $self->option('user') || 'root',
- host => $self->machine,
+ host => $self->svc_machine($svc_acct),
command => $command_string,
stdin_string => $stdin_string,
- ignore_all_output => $self->option('ignore_all_output'),
ignored_errors => $self->option('ignored_errors') || '',
- );
+ ignore_all_errors => $self->option('ignore_all_errors'),
+ fail_on_output => $self->option('fail_on_output'),
+ );
if($self->option($action . '_no_queue')) {
# discard return value just like freeside-queued.
eval { ssh_cmd(@ssh_cmd_args) };
$error = $@;
- return $error. ' ('. $self->exporttype. ' to '. $self->machine. ')'
+ $error = $error->full_message if ref $error; # Exception::Class::Base
+ return $error. ' ('. $self->exporttype. ' to '. $self->svc_machine($svc_acct). ')'
if $error;
}
else {
@@ -427,7 +416,7 @@ sub _export_replace {
# $error ||= "can't change RADIUS groups";
#}
}
- return $error. ' ('. $self->exporttype. ' to '. $self->machine. ')'
+ return $error. ' ('. $self->exporttype. ' to '. $self->svc_machine($new). ')'
if $error;
$new_agent_custid = $new_cust_main ? $new_cust_main->agent_custid : '';
@@ -451,18 +440,20 @@ sub _export_replace {
my @ssh_cmd_args = (
user => $self->option('user') || 'root',
- host => $self->machine,
+ host => $self->svc_machine($new),
command => $command_string,
stdin_string => $stdin_string,
- ignore_all_output => $self->option('ignore_all_output'),
- ignored_errors => $self->option('ignored_errors') || '',
+ ignored_errors => $self->option('ignored_errors') || '',
+ ignore_all_errors => $self->option('ignore_all_errors'),
+ fail_on_output => $self->option('fail_on_output'),
);
if($self->option('usermod_no_queue')) {
# discard return value just like freeside-queued.
eval { ssh_cmd(@ssh_cmd_args) };
$error = $@;
- return $error. ' ('. $self->exporttype. ' to '. $self->machine. ')'
+ $error = $error->full_message if ref $error; # Exception::Class::Base
+ return $error. ' ('. $self->exporttype. ' to '. $self->svc_machine($new). ')'
if $error;
}
else {
@@ -488,15 +479,18 @@ sub ssh_cmd { #subroutine, not method
$opt->{'user'}.'@'.$opt->{'host'},
'default_stdin_fh' => $def_in
);
- # ignore_all_output doesn't override this
+ # ignore_all_errors doesn't override SSH connection/auth errors--
+ # probably correct
die "Couldn't establish SSH connection: ". $ssh->error if $ssh->error;
my $ssh_opt = {};
$ssh_opt->{'stdin_data'} = $opt->{'stdin_string'}
if exists($opt->{'stdin_string'}) and length($opt->{'stdin_string'});
+
my ($output, $errput) = $ssh->capture2($ssh_opt, $opt->{'command'});
- return if $opt->{'ignore_all_output'};
- die "Error running SSH command: ". $ssh->error if $ssh->error;
+
+ return if $opt->{'ignore_all_errors'};
+ #die "Error running SSH command: ". $ssh->error if $ssh->error;
if ( ($output || $errput)
&& $opt->{'ignored_errors'} && length($opt->{'ignored_errors'})
@@ -506,12 +500,14 @@ sub ssh_cmd { #subroutine, not method
$output =~ s/$ignored_error//g;
$errput =~ s/$ignored_error//g;
}
- chomp($output);
- chomp($errput);
+ $output =~ s/[\s\n]//g;
+ $errput =~ s/[\s\n]//g;
}
- die $errput if $errput;
- die $output if $output;
+ die (($errput || $ssh->error). "\n") if $errput || $ssh->error;
+ #die "$errput\n" if $errput;
+
+ die "$output\n" if $output and $opt->{'fail_on_output'};
'';
}
@@ -522,5 +518,23 @@ sub ssh_cmd { #subroutine, not method
#sub shellcommands_delete { #subroutine, not method
#}
+sub _upgrade_exporttype {
+ my $class = shift;
+ $class =~ /^FS::part_export::(\w+)$/;
+ foreach my $self ( qsearch('part_export', { 'exporttype' => $1 }) ) {
+ my %options = $self->options;
+ my $changed = 0;
+ # 2011-12-13 - 2012-02-16: ignore_all_output option
+ if ( $options{'ignore_all_output'} ) {
+ # ignoring STDOUT is now the default
+ $options{'ignore_all_errors'} = 1;
+ delete $options{'ignore_all_output'};
+ $changed++;
+ }
+ my $error = $self->replace(%options) if $changed;
+ die $error if $error;
+ }
+}
+
1;