about summary refs log tree commit homepage
path: root/t
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2021-09-27 16:05:43 -0500
committerEric Wong <e@80x24.org>2021-09-27 21:08:34 +0000
commit55c8753c483d697fa0574b45ae77dec40509bb7f (patch)
tree4da558ffc28a1be0eb0fb3732e7d4e255ef8f6a8 /t
parent0858ae1ccf6cb55d771cdd7d3ef0cf9a933a7876 (diff)
downloadpublic-inbox-55c8753c483d697fa0574b45ae77dec40509bb7f.tar.gz
The "-w" perlop always succeeds as root, so we need to check
st_mode for writability bits to detect directories we shouldn't
write to.

Reported-by: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
Link: https://public-inbox.org/meta/20210927124056.kj5okiefvs4ztk27@meerkat.local/
Diffstat (limited to 't')
-rw-r--r--t/v2mirror.t13
1 files changed, 10 insertions, 3 deletions
diff --git a/t/v2mirror.t b/t/v2mirror.t
index 63d17ebf..37d64e83 100644
--- a/t/v2mirror.t
+++ b/t/v2mirror.t
@@ -5,6 +5,7 @@ use v5.10.1;
 use PublicInbox::TestCommon;
 use File::Path qw(remove_tree make_path);
 use Cwd qw(abs_path);
+use Carp ();
 use PublicInbox::Spawn qw(which);
 require_git(2.6);
 require_cmd('curl');
@@ -102,7 +103,9 @@ my @new_epochs;
 my $fetch_each_epoch = sub {
         my %before = map { $_ => 1 } glob("$tmpdir/m/git/*");
         run_script([qw(-fetch --exit-code -q)], undef, {-C => "$tmpdir/m"}) or
-                xbail '-fetch fail';
+                xbail('-fetch fail ',
+                        [ xqx([which('find'), "$tmpdir/m", qw(-type f -ls) ]) ],
+                        Carp::longmess());
         is($?, 0, '--exit-code 0 after fetch updated');
         my @after = grep { !$before{$_} } glob("$tmpdir/m/git/*");
         push @new_epochs, @after;
@@ -273,6 +276,10 @@ if ('test read-only epoch dirs') {
         my @g = glob("$dst/git/*.git");
         my @w = grep { -w $_ } @g;
         my @r = grep { ! -w $_ } @g;
+        if ($> == 0) {
+                @w = grep { (stat($_))[2] & 0200 } @g;
+                @r = grep { !((stat($_))[2] & 0200) } @g;
+        }
         is(scalar(@w), 1, 'one writable directory');
         my ($w) = ($w[0] =~ m!/([0-9]+)\.git\z!);
         is((grep {
@@ -287,7 +294,7 @@ if ('test read-only epoch dirs') {
                         "http://$host:$port/v2/", $dst]);
         my @g2 = glob("$dst/git/*.git") ;
         is_deeply(\@g2, \@g, 'cloned again');
-        is(scalar(grep { -w $_ } @g2), scalar(@w) + 1,
+        is(scalar(grep { (stat($_))[2] & 0200 } @g2), scalar(@w) + 1,
                 'got one more cloned epoch');
 
         # make 0.git writable and fetch into it, relies on culled manifest
@@ -377,7 +384,7 @@ EOM
         @cmd = (qw(-clone -q --epoch=~0), "http://$host:$port/v2", $dst);
         run_script(\@cmd, undef, { 2 => \($err = '') });
         is($?, 0, 'partial scraping clone on old PublicInbox::WWW');
-        my @g_last = grep { -w $_ } glob("$dst/git/*.git");
+        my @g_last = grep { (stat($_))[2] & 0200 } glob("$dst/git/*.git");
         is_deeply(\@g_last, [ $g_all[-1] ], 'partial clone of ~0 worked');
 
         chmod(0755, $g_all[0]) or xbail "chmod $!";