[freeside-commits] freeside/FS/FS/part_export shellcommands.pm, 1.57.4.1, 1.57.4.2

[Mark Wells]

Update of /home/cvs/cvsroot/freeside/FS/FS/part_export
In directory wavetail.420.am:/tmp/cvs-serv9909/FS/FS/part_export

Modified Files:
      Tag: FREESIDE_2_3_BRANCH
	shellcommands.pm 
Log Message:
fix stdin options on shellcommands export, from #831

Index: shellcommands.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_export/shellcommands.pm,v
retrieving revision 1.57.4.1
retrieving revision 1.57.4.2
diff -u -w -d -r1.57.4.1 -r1.57.4.2
--- shellcommands.pm	16 Sep 2011 00:15:47 -0000	1.57.4.1
+++ shellcommands.pm	3 Oct 2011 22:37:00 -0000	1.57.4.2
@@ -80,6 +80,9 @@
                              'Radius group mapping to reason (via template user)',
 			    type  => 'textarea',
 			  },
+  'ignored_errors' => { label   => 'Regexes of errors to ignore, separated by newlines',
+                        type    => 'textarea'
+                      },
 #  'no_queue' => { label => 'Run command immediately',
 #                   type  => 'checkbox',
 #                },
@@ -351,6 +354,7 @@
     host          => $self->machine,
     command       => $command_string,
     stdin_string  => $stdin_string,
+    ignored_errors => $self->option('ignored_errors') || '',
   );
 
   if($self->option($action . '_no_queue')) {
@@ -443,6 +447,7 @@
     host          => $self->machine,
     command       => $command_string,
     stdin_string  => $stdin_string,
+    ignored_errors => $self->option('ignored_errors') || '',
   );
 
   if($self->option('usermod_no_queue')) {
@@ -468,8 +473,27 @@
 }
 
 sub ssh_cmd { #subroutine, not method
-  use Net::SSH '0.08';
-  &Net::SSH::ssh_cmd( { @_ } );
+  use Net::OpenSSH;
+  my $opt = { @_ };
+  my $ssh = Net::OpenSSH->new($opt->{'user'}.'@'.$opt->{'host'});
+  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'});
+  my ($output, $errput) = $ssh->capture2($ssh_opt, $opt->{'command'});
+  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