wip changes for remote push - much implementation

diff --git a/TODO b/TODO
index 5a52c0cae907f55c0eff03a4646947372d347854..589059736a4e8a84a42a82cd21beaf6cd69e0072 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,5 +1,8 @@
 --gpg= etc. @gpg should be in manual
 should pass @gpg to debsign
+--ssh= etc. @ssh should be in manual
+support SSH and DGIT_SSH
+--dgit= etc. @dgit should be in manual
 
 approach for remote signing
   - initiator acts as oracle for responder

diff --git a/dgit b/dgit
index 1968d8c1b7895f0dcedd17d47532acb417d3bf7c..66f08c1d87eb6ed1b71c7c1941742cf146ad29da 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -27,12 +27,14 @@ use File::Path;
 use File::Basename;
 use Dpkg::Version;
 use POSIX;
+use IPC::Open2;
 
 our $our_version = 'UNRELEASED'; ###substituted###
 
 our $isuite = 'unstable';
 our $idistro;
 our $package;
+our @ropts;
 
 our $sign = 1;
 our $dryrun = 0;
@@ -52,6 +54,8 @@ our (@dput) = qw(dput);
 our (@debsign) = qw(debsign);
 our (@gpg) = qw(gpg);
 our (@sbuild) = qw(sbuild -A);
+our (@ssh) = qw(ssh);
+our (@dgit) = qw(dgit);
 our (@dpkgbuildpackage) = qw(dpkg-buildpackage -i\.git/ -I.git);
 our (@dpkgsource) = qw(dpkg-source -i\.git/ -I.git);
 our (@dpkggenchanges) = qw(dpkg-genchanges);
@@ -63,6 +67,8 @@ our %opts_opt_map = ('dget' => \@dget,
                     'debsign' => \@debsign,
                      'gpg' => \@gpg,
                      'sbuild' => \@sbuild,
+                     'ssh' => \@ssh,
+                     'dgit' => \@dgit,
                      'dpkg-source' => \@dpkgsource,
                      'dpkg-buildpackage' => \@dpkgbuildpackage,
                      'dpkg-genchanges' => \@dpkggenchanges,
@@ -121,6 +127,39 @@ sub fetchspec () {
 
 our $ua;
 
+# remote push initiator/responder protocol:
+#  < dgit-remote-push-ready [optional extra info ignored by old initiators]
+#
+#  > file begin parsed-changelog
+#  [indicates that output of dpkg-parsechangelog follows]
+#  > data-block NBYTES
+#  > [NBYTES bytes of data (no newline)]
+#  [maybe some more blocks]
+#  > data-end
+#
+#  > file begin dsc
+#  [etc]
+#
+#  > file begin changes
+#  [etc]
+#
+#  > want signed-tag
+#  [indicates that signed tag is wanted]
+#  < data-block NBYTES
+#  < [NBYTES bytes of data (no newline)]
+#  [maybe some more blocks]
+#  < data-end
+#  < files-end
+#
+#  > want signed-changes-dsc
+#  < data-block NBYTES    [transfer of signed changes]
+#  [etc]
+#  < data-block NBYTES    [transfer of signed dsc]
+#  [etc]
+#  < files-end
+#
+#  > complete
+
 sub responder_send_command ($) {
     my ($command) = @_;
     return unless $we_are_responder;
@@ -139,33 +178,65 @@ sub progress {
     }
 }
 
-sub protocol_send_file ($) {
-    my ($fh, $cmdprefix, $ourfn) = @_;
+sub badproto ($$) {
+    my ($fh, $m) = @_;
+    fail "connection lost: $!" if $fh->error;
+    fail "connection terminated" if $fh->eof;
+    fail "protocol violation; $m not expected";
+}
+
+sub protocol_expect ($&) {
+    my ($fh, $match) = @_;
+    local $_;
+    $_ = <$fh>;
+    defined && chomp or badproto $fh, "eof";
+    return if &$match;
+    badproto $fh, "\`$_'";
+}
+
+sub protocol_send_file ($$) {
+    my ($fh, $ourfn) = @_;
     open PF, "<", $ourfn or die "$ourfn: $!";
-    print $fh "$cmdprefix begin\n" or die $!;
     for (;;) {
        my $d;
        my $got = read PF, $d, 65536;
        die "$ourfn: $!" unless defined $got;
        last if $got;
-       print $fh "$keyword block ".length($d)."\n" or die $!;
+       print $fh "data-block ".length($d)."\n" or die $!;
        print $d or die $!;
     }
-    print $fh "$keyword end\n" or die $!;
+    print $fh "data-end\n" or die $!;
     close PF;
 }
 
+sub protocol_receive_file ($$) {
+    my ($fh, $ourfn) = @_;
+    open PF, ">", $ourfn or die "$ourfn: $!";
+    for (;;) {
+       protocol_expect \*STDIN, { m/^data-block (\d{1,6})$|data-end$/ };
+       length $1 or last;
+       my $d;
+       my $got = read $fh, $d, $1;
+       $got==$1 or badproto $fh, "eof during data block";
+       print PF $d or die $!;
+    }
+}
+
 sub responder_send_file ($$) {
     my ($keyword, $ourfn) = @_;
     return unless $we_are_responder;
-    print DEBUG "responder sending $keyword $ourfn\n";
-    protocol_send_file(\*STDOUT, "upload $keyword");
+    responder_send_command "file begin $cmdprefix";
+    protocol_send_file \*STDOUT, $ourfn;
 }
 
 sub responder_receive_files ($@) {
     my ($keyword, @ourfns) = @_;
     die unless $we_are_responder;
-    
+    responder_send_command "want $keyword";
+    foreach my $fn (@ourfns) {
+       protocol_receive_file \*STDIN, $fn;
+    }
+    protocol_expect \*STDIN, { m/^files-end$/ };
 }
 
 sub url_get {
@@ -293,6 +364,11 @@ sub badusage {
     exit 8;
 }
 
+sub nextarg {
+    @ARGV or badusage "too few arguments";
+    return scalar shift @ARGV;
+}
+
 sub cmd_help () {
     print $helpmsg or die $!;
     exit 0;
@@ -1257,10 +1333,38 @@ sub cmd_remote_push_responder {
     my ($dir) = @rargs;
     chdir $dir or die "$dir: $!";
     $we_are_remote = 1;
+    $|=1;
     responder_send_command("dgit-remote-push-ready");
     &cmd_push;
 }
 
+sub cmd_rpush {
+    my $host = nextarg;
+    my $dir;
+    if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
+       $host = $1;
+       $dir = $'; #';
+    } else {
+       $dir = nextarg;
+    }
+    $dir =~ s{^-}{./-};
+    my @rargs = ($dir);
+    my @rdgit;
+    push @rdgit, @dgit
+    push @rdgit, @ropts;
+    push @rdgit, (scalar @rargs), @rargs;
+    push @rdgit, @ARGV;
+    my @cmd = (@ssh, $host, shellquote @rdgit);
+    my $pid = open2(\*RO, \*RI, @cmd);
+    initiator_expect { m/^dgit-remote-push-ready/ };
+    for (;;) {
+       initiator_expect { m/^(\S+)\s+(.*)$/ };
+       my ($icmd,$iargs) = ($1, $2);
+       $icmd =~ s/\-/_/g;
+       { no strict qw(refs); &{"i_resp_$icmd"}($iargs); }
+    }
+}
+
 our $version;
 our $sourcechanges;
 our $dscfn;
@@ -1442,33 +1546,43 @@ sub parseopts () {
        last if m/^--?$/;
        if (m/^--/) {
            if (m/^--dry-run$/) {
+               push @ropts, $_;
                $dryrun=1;
            } elsif (m/^--no-sign$/) {
+               push @ropts, $_;
                $sign=0;
            } elsif (m/^--help$/) {
                cmd_help();
            } elsif (m/^--version$/) {
                cmd_version();
            } elsif (m/^--new$/) {
+               push @ropts, $_;
                $new_package=1;
            } elsif (m/^--(\w+)=(.*)/s &&
                     ($om = $opts_opt_map{$1}) &&
                     length $om->[0]) {
+               push @ropts, $_;
                $om->[0] = $2;
            } elsif (m/^--(\w+):(.*)/s &&
                     ($om = $opts_opt_map{$1})) {
+               push @ropts, $_;
                push @$om, $2;
            } elsif (m/^--existing-package=(.*)/s) {
+               push @ropts, $_;
                $existing_package = $1;
            } elsif (m/^--distro=(.*)/s) {
+               push @ropts, $_;
                $idistro = $1;
            } elsif (m/^--clean=(dpkg-source|git|none)$/s) {
+               push @ropts, $_;
                $cleanmode = $1;
            } elsif (m/^--clean=(.*)$/s) {
                badusage "unknown cleaning mode \`$1'";
            } elsif (m/^--ignore-dirty$/s) {
+               push @ropts, $_;
                $ignoredirty = 1;
            } elsif (m/^--no-quilt-fixup$/s) {
+               push @ropts, $_;
                $noquilt = 1;
            } else {
                badusage "unknown long option \`$_'";
@@ -1476,30 +1590,40 @@ sub parseopts () {
        } else {
            while (m/^-./s) {
                if (s/^-n/-/) {
+                   push @ropts, $_;
                    $dryrun=1;
                } elsif (s/^-h/-/) {
                    cmd_help();
                } elsif (s/^-D/-/) {
+                   push @ropts, $_;
                    open DEBUG, ">&STDERR" or die $!;
                    $debug++;
                } elsif (s/^-N/-/) {
+                   push @ropts, $_;
                    $new_package=1;
                } elsif (m/^-[vm]/) {
+                   push @ropts, $_;
                    push @changesopts, $_;
                    $_ = '';
                } elsif (s/^-c(.*=.*)//s) {
+                   push @ropts, $_;
                    push @git, '-c', $1;
                } elsif (s/^-d(.*)//s) {
+                   push @ropts, $_;
                    $idistro = $1;
                } elsif (s/^-C(.*)//s) {
+                   push @ropts, $_;
                    $changesfile = $1;
                } elsif (s/^-k(.*)//s) {
                    $keyid=$1;
                } elsif (s/^-wn//s) {
+                   push @ropts, $_;
                    $cleanmode = 'none';
                } elsif (s/^-wg//s) {
+                   push @ropts, $_;
                    $cleanmode = 'git';
                } elsif (s/^-wd//s) {
+                   push @ropts, $_;
                    $cleanmode = 'dpkg-source';
                } else {
                    badusage "unknown short option \`$_'";