X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fpart_export%2Fshellcommands.pm;h=418ff14ac15d247d7de440add0b0681526a6d42a;hp=ec861d3b2677492d2929a0f4fda4e0ab14f425c3;hb=09df4e8790fe3ed8e233d2c198ea524465c0096e;hpb=624b2d44625f69d71175c3348cae635d580c890b

diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm
index ec861d3b2..418ff14ac 100644
--- a/FS/FS/part_export/shellcommands.pm
+++ b/FS/FS/part_export/shellcommands.pm
@@ -80,6 +80,13 @@ tie my %options, 'Tie::IxHash',
                              'Radius group mapping to reason (via template user)',
 			    type  => 'textarea',
 			  },
+  'ignore_all_output' => { 
+      label => 'Ignore all output and errors from the command',
+      type  => 'checkbox',
+  },
+  'ignored_errors' => { label   => 'Regexes of specific errors to ignore, separated by newlines',
+                        type    => 'textarea'
+                      },
 #  'no_queue' => { label => 'Run command immediately',
 #                   type  => 'checkbox',
 #                },
@@ -193,7 +200,7 @@ old_ for replace operations):
   <LI><code>$pkgnum</code>
   <LI><code>$custnum</code>
   <LI>All other fields in <b>svc_acct</b> are also available.
-  <LI>The following fields from <b>cust_main</b> are also available (except during replace): company, address1, address2, city, state, zip, county, daytime, night, fax, otaker.  When used on the command line (rather than STDIN), they will be quoted for the shell already (do not add additional quotes).
+  <LI>The following fields from <b>cust_main</b> are also available (except during replace): company, address1, address2, city, state, zip, county, daytime, night, fax, otaker, agent_custid, locale.  When used on the command line (rather than STDIN), they will be quoted for the shell already (do not add additional quotes).
 </UL>
 END
 );
@@ -263,7 +270,7 @@ sub _export_command {
     {
       no strict 'refs';
       foreach my $custf (qw( company address1 address2 city state zip country
-                             daytime night fax otaker
+                             daytime night fax otaker agent_custid locale
                         ))
       {
         ${$custf} = $cust_pkg->cust_main->$custf();
@@ -342,6 +349,8 @@ sub _export_command {
   $night = shell_quote $night;
   $fax = shell_quote $fax;
   $otaker = shell_quote $otaker; 
+  $agent_custid = shell_quote $agent_custid;
+  $locale = shell_quote $locale;
 
   my $command_string = eval(qq("$command"));
   my @ssh_cmd_args = (
@@ -349,6 +358,8 @@ sub _export_command {
     host          => $self->machine,
     command       => $command_string,
     stdin_string  => $stdin_string,
+    ignore_all_output => $self->option('ignore_all_output'),
+    ignored_errors    => $self->option('ignored_errors') || '',
   );
 
   if($self->option($action . '_no_queue')) {
@@ -375,6 +386,8 @@ sub _export_replace {
   }
   my $old_cust_pkg = $old->cust_svc->cust_pkg;
   my $new_cust_pkg = $new->cust_svc->cust_pkg;
+  my $new_cust_main = $new_cust_pkg ? $new_cust_pkg->cust_main : '';
+
   $new_finger =~ /^(.*)\s+(\S+)$/ or $new_finger =~ /^((.*))$/;
   ($new_first, $new_last ) = ( $1, $2 );
   $quoted_new__password = shell_quote $new__password; #old, wrong?
@@ -415,6 +428,13 @@ sub _export_replace {
   return $error. ' ('. $self->exporttype. ' to '. $self->machine. ')'
     if $error;
 
+  $new_agent_custid = $new_cust_main ? $new_cust_main->agent_custid : '';
+  $new_locale = $new_cust_main ? $new_cust_main->locale : '';
+  $old_pkgnum = $old_cust_pkg ? $old_cust_pkg->pkgnum : '';
+  $old_custnum = $old_cust_pkg ? $old_cust_pkg->custnum : '';
+  $new_pkgnum = $new_cust_pkg ? $new_cust_pkg->pkgnum : '';
+  $new_custnum = $new_cust_pkg ? $new_cust_pkg->custnum : '';
+
   my $stdin_string = eval(qq("$stdin"));
 
   $new_first = shell_quote $new_first;
@@ -422,10 +442,8 @@ sub _export_replace {
   $new_finger = shell_quote $new_finger;
   $new_crypt_password = shell_quote $new_crypt_password;
   $new_ldap_password  = shell_quote $new_ldap_password;
-  $old_pkgnum = $old_cust_pkg ? $old_cust_pkg->pkgnum : '';
-  $old_custnum = $old_cust_pkg ? $old_cust_pkg->custnum : '';
-  $new_pkgnum = $new_cust_pkg ? $new_cust_pkg->pkgnum : '';
-  $new_custnum = $new_cust_pkg ? $new_cust_pkg->custnum : '';
+  $new_agent_custid = shell_quote $new_agent_custid;
+  $new_locale = shell_quote $new_locale;
 
   my $command_string = eval(qq("$command"));
 
@@ -434,6 +452,8 @@ sub _export_replace {
     host          => $self->machine,
     command       => $command_string,
     stdin_string  => $stdin_string,
+    ignore_all_output => $self->option('ignore_all_output'),
+    ignored_errors => $self->option('ignored_errors') || '',
   );
 
   if($self->option('usermod_no_queue')) {
@@ -459,8 +479,33 @@ sub shellcommands_queue {
 }
 
 sub ssh_cmd { #subroutine, not method
-  use Net::SSH '0.08';
-  &Net::SSH::ssh_cmd( { @_ } );
+  use Net::OpenSSH;
+  my $opt = { @_ };
+  open my $def_in, '<', '/dev/null' or die "unable to open /dev/null\n";
+  my $ssh = Net::OpenSSH->new(
+    $opt->{'user'}.'@'.$opt->{'host'},
+    'default_stdin_fh' => $def_in
+  );
+  # ignore_all_output doesn't override this
+  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;
+
+  if ($errput && $opt->{'ignored_errors'} && length($opt->{'ignored_errors'})) {
+    my @ignored_errors = split('\n',$opt->{'ignored_errors'});
+    foreach my $ignored_error ( @ignored_errors ) {
+        $errput =~ s/$ignored_error//g;
+    }
+    chomp($errput);
+  }
+  die $errput if $errput;
+  die $output if $output;
+  '';
 }
 
 #sub shellcommands_insert { #subroutine, not method