chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
policy: Improve taint message recorded in db by --deliberately-not-fast-forward
[dgit.git]
/
infra
/
dgit-repos-policy-debian
diff --git
a/infra/dgit-repos-policy-debian
b/infra/dgit-repos-policy-debian
index e00fb5a3fe17e96fae3804c23bb054a6a3a1a2bf..399fd8cb39beb20fb442f4f0278a85c6f41f357c 100755
(executable)
--- a/
infra/dgit-repos-policy-debian
+++ b/
infra/dgit-repos-policy-debian
@@
-17,13
+17,16
@@
use Debian::Dgit::Policy::Debian;
initdebug('%');
enabledebuglevel $ENV{'DGIT_DRS_DEBUG'};
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";
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";
+our $distrodir = shift @ARGV // die "need DISTRO-DIR";
our $action = shift @ARGV // die "need ACTION";
our $publicmode = 02775;
our $action = shift @ARGV // die "need ACTION";
our $publicmode = 02775;
-our $new_upload_propagation_slop = 3600*4 + 100;
+our $new_upload_propagation_slop = 3600*4 + 100;
# fixme config;
our $poldbh;
our $pkg;
our $poldbh;
our $pkg;
@@
-88,38
+91,35
@@
sub apiquery ($) {
$cmd .= " archive-api-query $subpath";
printdebug "apiquery $cmd\n";
$!=0; $?=0; my $json = `$cmd`;
$cmd .= " archive-api-query $subpath";
printdebug "apiquery $cmd\n";
$!=0; $?=0; my $json = `$cmd`;
- defined $json or die "$subpath $! $?";
+ defined $json
&& !$?
or die "$subpath $! $?";
my $r = decode_json $json;
my $d = new Data::Dumper([$r], [qw(r)]);
my $r = decode_json $json;
my $d = new Data::Dumper([$r], [qw(r)]);
- printdebug "apiquery $subpath | ", $d->Dump()
, "\n"
if $debuglevel>=2;
+ printdebug "apiquery $subpath | ", $d->Dump() if $debuglevel>=2;
return $r;
}
sub specific_suite_has_vsn_in_our_history ($) {
my ($suite) = @_;
return $r;
}
sub specific_suite_has_vsn_in_our_history ($) {
my ($suite) = @_;
- my $in_suite = apiquery "
/
dsc_in_suite/$suite/$pkg";
+ my $in_suite = apiquery "dsc_in_suite/$suite/$pkg";
foreach my $entry (@$in_suite) {
my $vsn = $entry->{version};
die "$pkg ?" unless defined $vsn;
foreach my $entry (@$in_suite) {
my $vsn = $entry->{version};
die "$pkg ?" unless defined $vsn;
- my $tag = debiantag $vsn;
- $?=0; my $r = system qw(git show-ref --verify --quiet), $tag;
+ 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;
return 1 if !$r;
next if $r==256;
- die "$pkg tag
$tag
$? $!";
+ die "$pkg tag
ref $tagref
$? $!";
}
return 0;
}
sub new_has_vsn_in_our_history () {
}
return 0;
}
sub new_has_vsn_in_our_history () {
- stat $pkgdir or die "$pkgdir $!";
- my $mtime = ((stat _)[9]);
- my $age = time - $mtime;
- return 1 if $age < $new_upload_propagation_slop;
return specific_suite_has_vsn_in_our_history('new');
}
sub good_suite_has_vsn_in_our_history () {
return specific_suite_has_vsn_in_our_history('new');
}
sub good_suite_has_vsn_in_our_history () {
- my $suites = apiquery "
/
suites";
+ my $suites = apiquery "suites";
foreach my $suitei (@$suites) {
my $suite = $suitei->{name};
die unless defined $suite;
foreach my $suitei (@$suites) {
my $suite = $suitei->{name};
die unless defined $suite;
@@
-150,21
+150,28
@@
sub getpackage () {
}
sub add_taint ($$) {
}
sub add_taint ($$) {
- my ($refobj, $reason);
+ my ($refobj, $reason) = @_;
+
+ printdebug "TAINTING $refobj\n",
+ (map { "\%| $_" } split "\n", $reason),
+ "\n";
my $tf = new File::Temp or die $!;
print $tf "$refobj^0\n" or die $!;
my $tf = new File::Temp or die $!;
print $tf "$refobj^0\n" or die $!;
+ flush $tf or die $!;
+ seek $tf,0,0 or die $!;
my $gcfpid = open GCF, "-|";
defined $gcfpid or die $!;
if (!$gcfpid) {
open STDIN, "<&", $tf or die $!;
my $gcfpid = open GCF, "-|";
defined $gcfpid or die $!;
if (!$gcfpid) {
open STDIN, "<&", $tf or die $!;
- exec 'git', 'cat-file';
+ exec 'git', 'cat-file'
, '--batch'
;
die $!;
}
close $tf or die $!;
$_ = <GCF>;
die $!;
}
close $tf or die $!;
$_ = <GCF>;
+ defined $_ or die;
m/^(\w+) (\w+) (\d+)\n/ or die "$_ ?";
my $gitobjid = $1;
my $gitobjtype = $2;
m/^(\w+) (\w+) (\d+)\n/ or die "$_ ?";
my $gitobjid = $1;
my $gitobjtype = $2;
@@
-178,7
+185,7
@@
sub add_taint ($$) {
close GCF;
$poldbh->do("INSERT INTO taints".
close GCF;
$poldbh->do("INSERT INTO taints".
- " (package, gitobjid, gitobjtype, gitobjdata, time, comment)"
,
+ " (package, gitobjid, gitobjtype, gitobjdata, time, comment)"
.
" VALUES (?,?,?,?,?,?)", {},
$pkg, $gitobjid, $gitobjtype, $gitobjdata, time, $reason);
" VALUES (?,?,?,?,?,?)", {},
$pkg, $gitobjid, $gitobjtype, $gitobjdata, time, $reason);
@@
-186,9
+193,9
@@
sub add_taint ($$) {
die unless defined $taint_id;
$poldbh->do("INSERT INTO taintoverrides".
die unless defined $taint_id;
$poldbh->do("INSERT INTO taintoverrides".
- " (taint_id, deliberately)"
,
- " VALUES (?, '
include-questionable-history')", {},
- $taint_id);
+ " (taint_id, deliberately)"
.
+ " VALUES (?, '
--deliberately-include-questionable-history')",
+
{},
$taint_id);
}
sub add_taint_by_tag ($$) {
}
sub add_taint_by_tag ($$) {
@@
-204,14
+211,26
@@
sub action_check_package () {
return 0 unless $pkg_exists;
return 0 unless $pkg_secret;
return 0 unless $pkg_exists;
return 0 unless $pkg_secret;
+ printdebug "check_package\n";
+
chdir $pkgdir or die "$pkgdir $!";
chdir $pkgdir or die "$pkgdir $!";
- return if new_has_vsn_in_our_history();
+
+ stat '.' or die "$pkgdir $!";
+ my $mtime = ((stat _)[9]);
+ 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) {
chmod $publicmode, "." or die $!;
return 0;
}
if (good_suite_has_vsn_in_our_history) {
chmod $publicmode, "." or die $!;
return 0;
}
+ printdebug "check_package secret, deleted, tainting\n";
+
git_for_each_ref('refs/tags', sub {
my ($objid,$objtype,$fullrefname,$tagname) = @_;
add_taint_by_tag($tagname,$objid);
git_for_each_ref('refs/tags', sub {
my ($objid,$objtype,$fullrefname,$tagname) = @_;
add_taint_by_tag($tagname,$objid);
@@
-231,10
+250,12
@@
sub getpushinfo () {
}
}
}
}
-sub deliberately ($) { return $deliberately{
$_[0]
}; }
+sub deliberately ($) { return $deliberately{
"--deliberately-$_[0]"
}; }
sub action_push () {
getpackage();
sub action_push () {
getpackage();
+ getpushinfo();
+
return 0 unless $pkg_exists;
return 0 unless $pkg_secret;
return 0 unless $pkg_exists;
return 0 unless $pkg_secret;
@@
-243,9
+264,9
@@
sub action_push () {
if (deliberately('not-fast-forward')) {
add_taint(server_ref($suite),
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".
" specified in signed tag $tagname for upload of".
- " version $version
into suite $suite
");
+ " version $version");
return NOFFCHECK|FRESHREPO;
}
if (deliberately('include-questionable-history')) {
return NOFFCHECK|FRESHREPO;
}
if (deliberately('include-questionable-history')) {
@@
-259,7
+280,8
@@
sub action_push () {
sub action_push_confirm () {
getpackage();
sub action_push_confirm () {
getpackage();
- die unless @ARGV;
+ getpushinfo();
+ die unless @ARGV >= 1;
my $freshrepo = shift @ARGV;
my $initq = $poldbh->prepare(<<END);
my $freshrepo = shift @ARGV;
my $initq = $poldbh->prepare(<<END);
@@
-286,10
+308,11
@@
END
my ($taintinfoq,$overridesanyq,$untaintq,$overridesq);
my $overridesstmt = <<END;
my ($taintinfoq,$overridesanyq,$untaintq,$overridesq);
my $overridesstmt = <<END;
- SELECT deliberately FROM taintoverrides WHERE ( 1
+ SELECT deliberately FROM taintoverrides WHERE (
+ 1=0
END
my @overridesv = sort keys %deliberately;
END
my @overridesv = sort keys %deliberately;
- $overridesstmt .=
join '', (<<END x @overridesv)
;
+ $overridesstmt .=
<<END foreach @overridesv
;
OR deliberately = ?
END
$overridesstmt .= <<END;
OR deliberately = ?
END
$overridesstmt .= <<END;
@@
-335,6
+358,8
@@
Taint recorded$timeshow for $pkgshow
Reason: $ti->{comment}
END
Reason: $ti->{comment}
END
+ printdebug "SQL overrides: @overridesv $taintid /\n$overridesstmt\n";
+
$overridesq ||= $poldbh->prepare($overridesstmt);
$overridesq->execute(@overridesv, $taintid);
my ($ovwhy) = $overridesq->fetchrow_array();
$overridesq ||= $poldbh->prepare($overridesstmt);
$overridesq->execute(@overridesv, $taintid);
my ($ovwhy) = $overridesq->fetchrow_array();
@@
-376,8
+401,12
@@
END
my $oldmode = ((stat _)[2]);
my $oldwrites = $oldmode & 0222;
# remove r and x bits which have corresponding w bits clear
my $oldmode = ((stat _)[2]);
my $oldwrites = $oldmode & 0222;
# remove r and x bits which have corresponding w bits clear
- my $newmode = $oldmode & ($oldwrites << 1) & ($oldwrites > 1);
+ my $newmode = $oldmode &
+ (~0555 | ($oldwrites << 1) | ($oldwrites >> 1));
+ printdebug sprintf "chmod %#o (was %#o) %s\n",
+ $newmode, $oldmode, $freshrepo;
chmod $newmode, $freshrepo or die $!;
chmod $newmode, $freshrepo or die $!;
+ utime undef, undef, $freshrepo or die $!;
}
}
}
}
@@
-392,7
+421,7
@@
sub action_check_list () {
statpackage();
next unless $pkg_exists;
next unless $pkg_secret;
statpackage();
next unless $pkg_exists;
next unless $pkg_secret;
- print
debug
"$pkg\n" or die $!;
+ print "$pkg\n" or die $!;
}
closedir L or die $!;
close STDOUT or die $!;
}
closedir L or die $!;
close STDOUT or die $!;
@@
-407,7
+436,7
@@
if (!$fn) {
}
my $sleepy=0;
}
my $sleepy=0;
-
our $rcode = 127
;
+
my $rcode
;
for (;;) {
poldb_setup(poldb_path($repos));
for (;;) {
poldb_setup(poldb_path($repos));
@@
-426,5
+455,6
@@
for (;;) {
$poldbh->rollback;
}
$poldbh->rollback;
}
-print STDERR $stderr;
-exit $rcode;
+print STDERR $stderr or die $!;
+flush STDERR or die $!;
+_exit $rcode;