X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FObject%2FRemote%2FConnector%2FLocalSudo.pm;h=81868fc0ea536788da8d9aef68008286d68ec109;hb=8c3529062a426181861d58ee59fb8f10e0be68e5;hp=1bd6d6e7c26182dcf9aa8209f667fea1a08bbb62;hpb=859f44514ab7fa00b25a56d72dafc802720eec33;p=scpubgit%2FObject-Remote.git

diff --git a/lib/Object/Remote/Connector/LocalSudo.pm b/lib/Object/Remote/Connector/LocalSudo.pm
index 1bd6d6e..81868fc 100644
--- a/lib/Object/Remote/Connector/LocalSudo.pm
+++ b/lib/Object/Remote/Connector/LocalSudo.pm
@@ -1,20 +1,35 @@
 package Object::Remote::Connector::LocalSudo;
-
+	
+use Object::Remote::Logging qw (:log :dlog);
 use Symbol qw(gensym);
+use Module::Runtime qw(use_module);
 use IPC::Open3;
 use Moo;
 
 extends 'Object::Remote::Connector::Local';
 
-has password_callback => (is => 'ro');
+has target_user => (is => 'ro', required => 1);
+
+has password_callback => (is => 'lazy');
+
+sub _build_password_callback {
+  my ($self) = @_;
+  my $pw_prompt = use_module('Object::Remote::Prompt')->can('prompt_pw');
+  my $user = $self->target_user;
+  return sub {
+    $pw_prompt->("sudo password for ${user}", undef, { cache => 1 })
+  }
+}
 
-sub _sudo_perl_command {
-  my ($self, $target_user) = @_;
+has sudo_perl_command => (is => 'lazy');
+
+sub _build_sudo_perl_command {
+  my ($self) = @_;
   return
-    'sudo', '-S', '-u', $target_user, '-p', "[sudo] password please\n",
+    'sudo', '-S', '-u', $self->target_user, '-p', "[sudo] password please\n",
     'perl', '-MPOSIX=dup2',
             '-e', 'print STDERR "GO\n"; exec(@ARGV);',
-    $self->_perl_command($target_user);
+    $self->perl_command;
 }
 
 sub _start_perl {
@@ -24,7 +39,7 @@ sub _start_perl {
     my $foreign_stdin,
     my $foreign_stdout,
     $sudo_stderr,
-    $self->_sudo_perl_command(@_)
+    @{$self->sudo_perl_command}
   ) or die "open3 failed: $!";
   chomp(my $line = <$sudo_stderr>);
   if ($line eq "GO") {
@@ -35,11 +50,14 @@ sub _start_perl {
       unless $cb;
     print $foreign_stdin $cb->($line, @_), "\n";
     chomp($line = <$sudo_stderr>);
-    die "sent password and expected newline from sudo, got ${line}"
-      if $line;
-    chomp($line = <$sudo_stderr>);
-    die "sent password but next line was ${line}"
-      unless $line eq "GO";
+    if ($line and $line ne 'GO') {
+      die "sent password and expected newline from sudo, got ${line}";
+    }
+    elsif (not $line) {
+      chomp($line = <$sudo_stderr>);
+      die "sent password but next line was ${line}"
+        unless $line eq "GO";
+    }
   } else {
     die "Got inexplicable line ${line} trying to sudo";
   };
@@ -47,9 +65,13 @@ sub _start_perl {
                 ->watch_io(
                     handle => $sudo_stderr,
                     on_read_ready => sub {
-                      if (sysread($sudo_stderr, my $buf, 1024) > 0) {
+                      Dlog_debug { "LocalSudo: Preparing to read data from $_" } $sudo_stderr;
+                      if (sysread($sudo_stderr, my $buf, 32768) > 0) {
+                        log_trace { "LocalSudo: successfully read data, printing it to STDERR" };
                         print STDERR $buf;
+                        log_trace { "LocalSudo: print() to STDERR is done" };                   
                       } else {
+                        log_debug { "LocalSudo: received EOF or error on file handle, unwatching it" };
                         Object::Remote->current_loop
                                       ->unwatch_io(
                                           handle => $sudo_stderr,
@@ -67,7 +89,8 @@ push @Object::Remote::Connection::Guess, sub {
   for ($_[0]) {
     # username followed by @
     if (defined and !ref and /^ ([^\@]*?) \@ $/x) {
-      return __PACKAGE__->new->connect($1);
+      shift(@_);
+      return __PACKAGE__->new(@_, target_user => $1);
     }
   }
   return;