[PATCH] ensure SQLite and Xapian files respect core.sharedRepository

[PATCH] ensure SQLite and Xapian files respect core.sharedRepository

[Eric Wong]

We can't have files with permissions inconsistent with what's
in git objects.
---
 lib/PublicInbox/Msgmap.pm     |  3 +++
 lib/PublicInbox/Over.pm       |  6 +++++-
 lib/PublicInbox/V2Writable.pm | 16 ++++++++++++++--
 t/search.t                    | 41 ++++++++++++++++++++++++++---------------
 t/v2writable.t                |  9 +++++++++
 5 files changed, 57 insertions(+), 18 deletions(-)

diff --git a/lib/PublicInbox/Msgmap.pm b/lib/PublicInbox/Msgmap.pm
index ec3d4f9..6e758c1 100644
--- a/lib/PublicInbox/Msgmap.pm
+++ b/lib/PublicInbox/Msgmap.pm
@@ -26,6 +26,9 @@ sub new {
 
 sub dbh_new {
 	my ($f, $writable) = @_;
+	if ($writable && !-f $f) { # SQLite defaults mode to 0644, we want 0666
+		open my $fh, '+>>', $f or die "failed to open $f: $!";
+	}
 	my $dbh = DBI->connect("dbi:SQLite:dbname=$f",'','', {
 		AutoCommit => 1,
 		RaiseError => 1,
diff --git a/lib/PublicInbox/Over.pm b/lib/PublicInbox/Over.pm
index 07e54b6..30f2603 100644
--- a/lib/PublicInbox/Over.pm
+++ b/lib/PublicInbox/Over.pm
@@ -15,7 +15,11 @@ use Compress::Zlib qw(uncompress);
 sub dbh_new {
 	my ($self) = @_;
 	my $ro = ref($self) eq 'PublicInbox::Over';
-	my $dbh = DBI->connect("dbi:SQLite:dbname=$self->{filename}",'','', {
+	my $f = $self->{filename};
+	if (!$ro && !-f $f) { # SQLite defaults mode to 0644, we want 0666
+		open my $fh, '+>>', $f or die "failed to open $f: $!";
+	}
+	my $dbh = DBI->connect("dbi:SQLite:dbname=$f",'','', {
 		AutoCommit => 1,
 		RaiseError => 1,
 		PrintError => 0,
diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm
index 1316d62..d8d75ec 100644
--- a/lib/PublicInbox/V2Writable.pm
+++ b/lib/PublicInbox/V2Writable.pm
@@ -63,6 +63,7 @@ sub new {
 	}
 
 	$v2ibx = PublicInbox::InboxWritable->new($v2ibx);
+	$v2ibx->umask_prepare;
 
 	my $xpfx = "$dir/xap" . PublicInbox::Search::SCHEMA_VERSION;
 	my $self = {
@@ -95,6 +96,13 @@ sub init_inbox {
 # mimics Import::add and wraps it for v2
 sub add {
 	my ($self, $mime, $check_cb) = @_;
+	$self->{-inbox}->with_umask(sub {
+		_add($self, $mime, $check_cb)
+	});
+}
+
+sub _add {
+	my ($self, $mime, $check_cb) = @_;
 
 	# spam check:
 	if ($check_cb) {
@@ -348,12 +356,16 @@ sub remove_internal {
 
 sub remove {
 	my ($self, $mime, $cmt_msg) = @_;
-	remove_internal($self, $mime, $cmt_msg);
+	$self->{-inbox}->with_umask(sub {
+		remove_internal($self, $mime, $cmt_msg);
+	});
 }
 
 sub purge {
 	my ($self, $mime) = @_;
-	my $purges = remove_internal($self, $mime, undef, {});
+	my $purges = $self->{-inbox}->with_umask(sub {
+		remove_internal($self, $mime, undef, {});
+	});
 	$self->idx_init if @$purges; # ->done is called on purges
 	for my $i (0..$#$purges) {
 		defined(my $cmt = $purges->[$i]) or next;
diff --git a/t/search.t b/t/search.t
index 48c2511..004b7aa 100644
--- a/t/search.t
+++ b/t/search.t
@@ -16,9 +16,11 @@ eval { PublicInbox::Search->new($git_dir) };
 ok($@, "exception raised on non-existent DB");
 
 my $rw = PublicInbox::SearchIdx->new($git_dir, 1);
-$rw->_xdb_acquire;
-$rw->_xdb_release;
 my $ibx = $rw->{-inbox};
+$ibx->with_umask(sub {
+	$rw->_xdb_acquire;
+	$rw->_xdb_release;
+});
 $rw = undef;
 my $ro = PublicInbox::Search->new($git_dir);
 my $rw_commit = sub {
@@ -51,7 +53,7 @@ my $rw_commit = sub {
 	   umask, 'umask => existing umask');
 }
 
-{
+$ibx->with_umask(sub {
 	my $root = Email::MIME->create(
 		header_str => [
 			Date => 'Fri, 02 Oct 1993 00:00:00 +0000',
@@ -79,7 +81,7 @@ my $rw_commit = sub {
 	is($root_id, int($root_id), "root_id is an integer: $root_id");
 	$last_id = $rw->add_message($last);
 	is($last_id, int($last_id), "last_id is an integer: $last_id");
-}
+});
 
 sub filter_mids {
 	my ($msgs) = @_;
@@ -116,7 +118,7 @@ sub filter_mids {
 }
 
 # ghost vivication
-{
+$ibx->with_umask(sub {
 	$rw_commit->();
 	my $rmid = '<ghost-message@s>';
 	my $reply_to_ghost = Email::MIME->create(
@@ -153,7 +155,7 @@ sub filter_mids {
 	}
 	isnt($msgs->[0]->{num}, $msgs->[1]->{num}, "num do not match");
 	ok($_->{num} > 0, 'positive art num') foreach @$msgs
-}
+});
 
 # search thread on ghost
 {
@@ -179,7 +181,7 @@ sub filter_mids {
 }
 
 # long message-id
-{
+$ibx->with_umask(sub {
 	$rw_commit->();
 	$ro->reopen;
 	my $long_mid = 'last' . ('x' x 60). '@s';
@@ -225,10 +227,10 @@ sub filter_mids {
 	my @exp = sort($long_reply_mid, 'root@s', 'last@s', $long_mid);
 	@res = filter_mids($t);
 	is_deeply(\@res, \@exp, "get_thread works");
-}
+});
 
 # quote prioritization
-{
+$ibx->with_umask(sub {
 	$rw_commit->();
 	$rw->add_message(Email::MIME->create(
 		header_str => [
@@ -258,10 +260,10 @@ sub filter_mids {
 	is(scalar(@$res), 1, "got a match for quoted text");
 	is($res->[0]->mid, 'quote@a',
 		"quoted result returned if nothing else");
-}
+});
 
 # circular references
-{
+$ibx->with_umask(sub {
 	my $s = 'foo://'. ('Circle' x 15).'/foo';
 	my $doc_id = $rw->add_message(Email::MIME->create(
 		header => [ Subject => $s ],
@@ -278,9 +280,9 @@ sub filter_mids {
 	my $smsg = $rw->query('m:circle@a', {limit=>1})->[0];
 	is($smsg->references, '', "no references created");
 	is($s, $smsg->subject, 'long subject not rewritten');
-}
+});
 
-{
+$ibx->with_umask(sub {
 	my $str = eval {
 		my $mbox = 't/utf8.mbox';
 		open(my $fh, '<', $mbox) or die "failed to open mbox: $mbox\n";
@@ -293,7 +295,7 @@ sub filter_mids {
 	ok($doc_id > 0, 'message indexed doc_id with UTF-8');
 	my $msg = $rw->query('m:testmessage@example.com', {limit => 1})->[0];
 	is($mime->header('Subject'), $msg->subject, 'UTF-8 subject preserved');
-}
+});
 
 {
 	my $msgs = $ro->query('d:19931002..20101002');
@@ -367,7 +369,7 @@ sub filter_mids {
 	}
 }
 
-{
+$ibx->with_umask(sub {
 	my $part1 = Email::MIME->create(
                  attributes => {
                      content_type => 'text/plain',
@@ -417,6 +419,15 @@ sub filter_mids {
 	$rw->unindex_blob($amsg);
 	$rw->commit_txn_lazy;
 	is($ro->lookup_article($art->{num}), undef, 'gone from OVER DB');
+});
+
+foreach my $f ("$git_dir/public-inbox/msgmap.sqlite3",
+		glob("$git_dir/public-inbox/xapian*/"),
+		glob("$git_dir/public-inbox/xapian*/*")) {
+	my @st = stat($f);
+	my ($bn) = (split(m!/!, $f))[-1];
+	is($st[2] & 07777, -f _ ? 0660 : 0770,
+		"sharedRepository respected for $bn");
 }
 
 done_testing();
diff --git a/t/v2writable.t b/t/v2writable.t
index d37fb06..00b08e0 100644
--- a/t/v2writable.t
+++ b/t/v2writable.t
@@ -36,6 +36,15 @@ my $im = eval {
 };
 is($im->{partitions}, 1, 'one partition when forced');
 ok($im->add($mime), 'ordinary message added');
+foreach my $f ("$mainrepo/msgmap.sqlite3",
+		glob("$mainrepo/xap*/*"),
+		glob("$mainrepo/xap*/*/*")) {
+	my @st = stat($f);
+	my ($bn) = (split(m!/!, $f))[-1];
+	is($st[2] & 07777, -f _ ? 0660 : 0770,
+		"default sharedRepository respected for $bn");
+}
+
 my $git0;
 
 if ('ensure git configs are correct') {
-- 
EW