X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=infra%2Fdgit-repos-policy-debian;h=e37690c0b495791cdc2adac29cc6b3e87dc950ce;hp=6e0f0dc3024bfbf6f80eb672f54f695b0cf9fdd2;hb=ff53225eafcc9e53998f9f49085a366f3f98fc9c;hpb=f485fbbfe8503d9bf6b2e0199d0e99e8487b74e4 diff --git a/infra/dgit-repos-policy-debian b/infra/dgit-repos-policy-debian index 6e0f0dc3..e37690c0 100755 --- a/infra/dgit-repos-policy-debian +++ b/infra/dgit-repos-policy-debian @@ -2,7 +2,9 @@ # dgit repos policy hook script for Debian use strict; -$SIG{__WARN__} = sub { die $_[0]; }; + +use Debian::Dgit qw(:DEFAULT :policyflags); +setup_sigwarn(); use POSIX; use JSON; @@ -11,12 +13,13 @@ use DBI; use IPC::Open2; use Data::Dumper; -use Debian::Dgit qw(:DEFAULT :policyflags); use Debian::Dgit::Policy::Debian; initdebug('%'); enabledebuglevel $ENV{'DGIT_DRS_DEBUG'}; +END { $? = 127; } # deliberate exit uses _exit + our $distro = shift @ARGV // die "need DISTRO"; our $repos = shift @ARGV // die "need DGIT-REPOS-DIR"; our $dgitlive = shift @ARGV // die "need DGIT-LIVE-DIR"; @@ -65,6 +68,11 @@ our %deliberately; # [1] looking for the relevant git tag for the version number and not # caring what that tag refers to. # +# When we are doing a push to a fresh repo, any version will do: in +# this case, this is the first dgit upload of an existing package, +# and we trust that the uploader hasn't included in their git +# history any previous non-dgit uploads. +# # A wrinkle: if we approved a push recently, we treat NEW as having # a version which is in our history. This is because the package may # still be being uploaded. (We record this using the timestamp of the @@ -84,7 +92,9 @@ our %deliberately; sub apiquery ($) { my ($subpath) = @_; local $/=undef; - my $cmd = "$dgitlive/dgit -d$distro \$DGIT_TEST_OPTS"; + my $dgit = "$dgitlive/dgit"; + $dgit = "dgit" if !stat_exists $dgit; + my $cmd = "$dgit -d$distro \$DGIT_TEST_OPTS"; $cmd .= " -".("D" x $debuglevel) if $debuglevel; $cmd .= " archive-api-query $subpath"; printdebug "apiquery $cmd\n"; @@ -96,33 +106,49 @@ sub apiquery ($) { return $r; } -sub specific_suite_has_vsn_in_our_history ($) { - my ($suite) = @_; +sub vsn_in_our_history ($) { + my ($vsn) = @_; + + # Eventually, when we withdraw support for old-format (DEP-14 + # namespace) tags, we will need to change this to only look + # for debiantag_new. See the commit + # "Tag change: Update dgit-repos-policy-debian" + # (reverting which is a good start for that change). + + my @tagrefs = map { "refs/tags/".$_ } debiantags $vsn, $distro; + printdebug " checking history vsn=$vsn tagrefs=@tagrefs\n"; + open F, "-|", qw(git-for-each-ref), @tagrefs; + $_ = ; + close F; + return 1 if defined && m/\S/; + die "$pkg tagrefs @tagrefs $? $!" if $?; + return 0; +} + +sub specific_suite_has_suitable_vsn ($$) { + my ($suite, $vsn_check) = @_; # tests $vsn_check->($version) my $in_suite = apiquery "dsc_in_suite/$suite/$pkg"; foreach my $entry (@$in_suite) { my $vsn = $entry->{version}; die "$pkg ?" unless defined $vsn; - my $tagref = "refs/tags/".debiantag $vsn; - printdebug " checking history suite=$suite vsn=$vsn tagref=$tagref\n"; - $?=0; my $r = system qw(git show-ref --verify --quiet), $tagref; - return 1 if !$r; - next if $r==256; - die "$pkg tagref $tagref $? $!"; + printdebug " checking history found suite=$suite vsn=$vsn\n"; + return 1 if $vsn_check->($vsn); } return 0; } sub new_has_vsn_in_our_history () { - return specific_suite_has_vsn_in_our_history('new'); + return specific_suite_has_suitable_vsn('new', \&vsn_in_our_history); } -sub good_suite_has_vsn_in_our_history () { +sub good_suite_has_suitable_vsn ($) { + my ($vsn_check) = @_; # as for specific_suite_has_specific_vsn my $suites = apiquery "suites"; foreach my $suitei (@$suites) { my $suite = $suitei->{name}; die unless defined $suite; next if $suite =~ m/\bnew$/; - return 1 if specific_suite_has_vsn_in_our_history($suite); + return 1 if specific_suite_has_suitable_vsn($suite, $vsn_check); } return 0; } @@ -204,8 +230,7 @@ sub add_taint_by_tag ($$) { " removed from NEW (ie, rejected) (or never arrived)"); } -sub action_check_package () { - getpackage(); +sub check_package () { return 0 unless $pkg_exists; return 0 unless $pkg_secret; @@ -218,15 +243,16 @@ sub action_check_package () { my $age = time - $mtime; printdebug "check_package age=$age\n"; - return 0 if $age < $new_upload_propagation_slop; - - return 0 if new_has_vsn_in_our_history(); - - if (good_suite_has_vsn_in_our_history) { + if (good_suite_has_suitable_vsn(\&vsn_in_our_history)) { chmod $publicmode, "." or die $!; + $pkg_secret = 0; return 0; } + return 0 if $age < $new_upload_propagation_slop; + + return 0 if new_has_vsn_in_our_history(); + printdebug "check_package secret, deleted, tainting\n"; git_for_each_ref('refs/tags', sub { @@ -237,6 +263,11 @@ sub action_check_package () { return FRESHREPO; } +sub action_check_package () { + getpackage(); + return check_package(); +} + sub getpushinfo () { die unless @ARGV >= 4; $version = shift @ARGV; @@ -248,12 +279,14 @@ sub getpushinfo () { } } -sub deliberately ($) { return $deliberately{$_[0]}; } +sub deliberately ($) { return $deliberately{"--deliberately-$_[0]"}; } sub action_push () { getpackage(); getpushinfo(); + check_package(); # might make package public, or might add taints + return 0 unless $pkg_exists; return 0 unless $pkg_secret; @@ -262,18 +295,18 @@ sub action_push () { if (deliberately('not-fast-forward')) { add_taint(server_ref($suite), - "suite $suite when --deliberately-not-fast-forward". + "rewound suite $suite; --deliberately-not-fast-forward". " specified in signed tag $tagname for upload of". - " version $version into suite $suite"); + " version $version"); return NOFFCHECK|FRESHREPO; } if (deliberately('include-questionable-history')) { return 0; } - die "Package is in NEW and has not been accepted or rejected yet;". + die "\nPackage is in NEW and has not been accepted or rejected yet;". " use a --deliberately option to specify whether you are". " keeping or discarding the previously pushed history. ". - " Please RTFM dgit(1).\n"; + " Please RTFM dgit(1).\n\n"; } sub action_push_confirm () { @@ -288,11 +321,17 @@ sub action_push_confirm () { END $initq->execute($pkg); + my @objscatcmd = qw(git); + push @objscatcmd, qw(--git-dir), $freshrepo if length $freshrepo; + push @objscatcmd, qw(cat-file --batch); + debugcmd '|',@objscatcmd if $debuglevel>=2; + my @taintids; my $chkinput = tempfile(); while (my $taint = $initq->fetchrow_hashref()) { push @taintids, $taint->{taint_id}; print $chkinput $taint->{gitobjid}, "\n" or die $!; + printdebug '|> ', $taint->{gitobjid}, "\n" if $debuglevel>=2; } flush $chkinput or die $!; seek $chkinput,0,0 or die $!; @@ -300,7 +339,7 @@ END my $checkpid = open CHKOUT, "-|" // die $!; if (!$checkpid) { open STDIN, "<&", $chkinput or die $!; - exec qw(git cat-file --batch) or die $!; + exec @objscatcmd or die $!; } my ($taintinfoq,$overridesanyq,$untaintq,$overridesq); @@ -321,18 +360,21 @@ END my $mustreject=0; while (my $taintid = shift @taintids) { - # git cat-file prints a spurious newline after it gets EOF - # This is not documented. I guess it might go away. So we - # just read what we expect and then let it get SIGPIPE. $!=0; $_ = ; - die "$? $!" unless defined $_; + die "($taintid @objscatcmd) $!" unless defined $_; + printdebug "|< ", $_ if $debuglevel>=2; next if m/^\w+ missing$/; - die unless m/^(\w+) (\w+) (\d+)\s/; + die "($taintid @objscatcmd) $_ ?" unless m/^(\w+) (\w+) (\d+)\s/; my ($objid,$objtype,$nbytes) = ($1,$2,$3); my $drop; - (read CHKOUT, $drop, $nbytes) == $nbytes or die; + (read CHKOUT, $drop, $nbytes) == $nbytes + or die "($taintid @objscatcmd) $!"; + + $!=0; $_ = ; + die "($taintid @objscatcmd) $!" unless defined $_; + die "($taintid @objscatcmd) $_ ?" if m/\S/; $taintinfoq ||= $poldbh->prepare(<execute($taintid); my $ti = $taintinfoq->fetchrow_hashref(); - die unless $ti; + die "($taintid)" unless $ti; my $timeshow = defined $ti->{time} ? " at time ".strftime("%Y-%m-%d %H:%M:%S Z", gmtime $ti->{time}) @@ -394,7 +436,7 @@ END } if (length $freshrepo) { - if (!good_suite_has_vsn_in_our_history()) { + if (!good_suite_has_suitable_vsn(sub { 1; })) { stat $freshrepo or die "$freshrepo $!"; my $oldmode = ((stat _)[2]); my $oldwrites = $oldmode & 0222; @@ -434,24 +476,43 @@ if (!$fn) { } my $sleepy=0; -our $rcode = 127; +my $rcode; -for (;;) { - poldb_setup(poldb_path($repos)); - $stderr = ''; +my $db_busy_exception= 'Debian::Dgit::Policy::Debian::DB_BUSY'; - $rcode = $fn->(); - die unless defined $rcode; +my @orgargv = @ARGV; - eval { $poldbh->commit; }; +for (;;) { + @ARGV = @orgargv; + eval { + poldb_setup(poldb_path($repos), sub { + $poldbh->{HandleError} = sub { + return 0 unless $poldbh->err == 5; # SQLITE_BUSY, not in .pm :-( + die bless { }, $db_busy_exception; + }; + + eval ($ENV{'DGIT_RPD_TEST_DBLOOP_HOOK'}//''); + die $@ if length $@; + # used by tests/tests/debpolicy-dbretry + }); + + $stderr = ''; + + $rcode = $fn->(); + die unless defined $rcode; + + $poldbh->commit; + }; last unless length $@; + die $@ unless ref $@ eq $db_busy_exception; die if $sleepy >= 20; - print STDERR "[policy database busy, retrying]\n"; - sleep ++$sleepy; + $sleepy++; + print STDERR "[policy database busy, retrying (${sleepy}s)]\n"; - $poldbh->rollback; + eval { $poldbh->rollback; }; } -print STDERR $stderr; -exit $rcode; +print STDERR $stderr or die $!; +flush STDERR or die $!; +_exit $rcode;