-# Copyright (C) 2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2019-2020 all contributors <meta@public-inbox.org>
# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
# "Solve" blobs which don't exist in git code repositories by
# searching inboxes for post-image blobs.
# this emits a lot of debugging/tracing information which may be
-# publically viewed over HTTP(S). Be careful not to expose
+# publicly viewed over HTTP(S). Be careful not to expose
# local filesystem layouts in the process.
package PublicInbox::SolverGit;
use strict;
-use warnings;
-use 5.010_001;
-use File::Temp 0.19 ();
+use v5.10.1;
+use File::Temp 0.19 (); # 0.19 for ->newdir
use Fcntl qw(SEEK_SET);
use PublicInbox::Git qw(git_unquote git_quote);
-use PublicInbox::MsgIter qw(msg_iter msg_part_text);
+use PublicInbox::MsgIter qw(msg_part_text);
use PublicInbox::Qspawn;
use PublicInbox::Tmpfile;
use URI::Escape qw(uri_escape_utf8);
# work fairly. Other PSGI servers may have trouble, though.
my $MAX_PATCH = 9999;
+my $LF = qr!\r?\n!;
+my $ANY = qr![^\r\n]+!;
+my $MODE = '100644|120000|100755';
+my $FN = qr!(?:("?[^/\n]+/[^\r\n]+)|/dev/null)!;
+my %BAD_COMPONENT = ('' => 1, '.' => 1, '..' => 1);
+
# di = diff info / a hashref with information about a diff ($di):
# {
# oid_a => abbreviated pre-image oid,
# hdr_lines => string of various header lines for mode information
# mode_a => original mode of oid_a (string, not integer),
# ibx => PublicInbox::Inbox object containing the diff
-# smsg => PublicInbox::SearchMsg object containing diff
+# smsg => PublicInbox::Smsg object containing diff
# path_a => pre-image path
# path_b => post-image path
# n => numeric path of the patch (relative to worktree)
my $ct = $part->content_type || 'text/plain';
my ($s, undef) = msg_part_text($part, $ct);
defined $s or return;
- my $di = {};
# Email::MIME::Encodings forces QP to be CRLF upon decoding,
# change it back to LF:
$s =~ s/\r\n/\n/sg;
}
- state $LF = qr!\r?\n!;
- state $ANY = qr![^\r\n]+!;
- state $MODE = '100644|120000|100755';
- state $FN = qr!(?:("?[^/\n]+/[^\r\n]+)|/dev/null)!;
$s =~ m!( # $1 start header lines we save for debugging:
# the meat of the diff, including "^\\No newline ..."
# We also allow for totally blank lines w/o leading spaces,
# because git-apply(1) handles that case, too
- (?:^(?:[\@\+\x20\-\\][^\r\n]*|)$LF)+
+ (?:^(?:[\@\+\x20\-\\][^\n]*|)$LF)+
)!smx or return;
- my $hdr_lines = $1;
+ my $di = {
+ hdr_lines => $1,
+ oid_a => $6,
+ oid_b => $7,
+ mode_a => $5 // $8 // $4, # new (file) // unchanged // old
+ };
my $path_a = $2 // $10;
my $path_b = $3 // $11;
- $di->{oid_a} = $6;
- $di->{oid_b} = $7;
- $di->{mode_a} = $5 // $8 // $4; # new (file) // unchanged // old
my $patch = $9;
# don't care for leading 'a/' and 'b/'
- my (undef, @a) = split(m{/}, git_unquote($path_a));
+ my (undef, @a) = split(m{/}, git_unquote($path_a)) if defined($path_a);
my (undef, @b) = split(m{/}, git_unquote($path_b));
# get rid of path-traversal attempts and junk patches:
# it's junk at best, an attack attempt at worse:
- state $bad_component = { map { $_ => 1 } ('', '.', '..') };
- foreach (@a, @b) { return if $bad_component->{$_} }
+ foreach (@a, @b) { return if $BAD_COMPONENT{$_} }
- $di->{path_a} = join('/', @a);
+ $di->{path_a} = join('/', @a) if @a;
$di->{path_b} = join('/', @b);
- utf8::encode($hdr_lines);
- utf8::encode($patch);
my $path = ++$self->{tot};
$di->{n} = $path;
- open(my $tmp, '>', $self->{tmp}->dirname . "/$path") or
+ open(my $tmp, '>:utf8', $self->{tmp}->dirname . "/$path") or
die "open(tmp): $!";
- print $tmp $hdr_lines, $patch or die "print(tmp): $!";
+ print $tmp $di->{hdr_lines}, $patch or die "print(tmp): $!";
close $tmp or die "close(tmp): $!";
# for debugging/diagnostics:
$di->{ibx} = $ibx;
$di->{smsg} = $smsg;
- $di->{hdr_lines} = $hdr_lines;
push @$diffs, $di;
}
}
}
- my $msgs = $srch->query($q, { relevance => 1 });
-
+ my $mset = $srch->mset($q, { relevance => 1 });
my $diffs = [];
- foreach my $smsg (@$msgs) {
- $ibx->smsg_mime($smsg) or next;
- my $mime = delete $smsg->{mime};
- msg_iter($mime, \&extract_diff,
- [$self, $diffs, $pre, $post, $ibx, $smsg]);
+ for my $smsg (@{$srch->mset_to_smsg($ibx, $mset)}) {
+ my $eml = $ibx->smsg_eml($smsg) or next;
+ $eml->each_part(\&extract_diff,
+ [$self, $diffs, $pre, $post, $ibx, $smsg], 1);
}
@$diffs ? $diffs : undef;
}
my $in = tmpfile("update-index.$oid_full") or die "tmpfile: $!";
print $in "$mode_a $oid_full\t$path_a\0" or die "print: $!";
$in->flush or die "flush: $!";
- sysseek($in, 0, 0) or die "seek: $!";
+ sysseek($in, 0, SEEK_SET) or die "seek: $!";
dbg($self, 'preparing index');
my $rdr = { 0 => $in };
if (my $existing = solve_existing($self, $want)) {
my ($found_git, undef, $type, undef) = @$existing;
dbg($self, "found $cur_want in " .
- join("\n", $found_git->pub_urls($self->{psgi_env})));
+ join(" ||\n\t",
+ $found_git->pub_urls($self->{psgi_env})));
if ($cur_want eq $self->{oid_want} || $type ne 'blob') {
eval { done($self, $existing) };
unshift @{$self->{patches}}, @$diffs;
dbg($self, "found $cur_want in ".
- join("\n\t", map { di_url($self, $_) } @$diffs));
+ join(" ||\n\t", map { di_url($self, $_) } @$diffs));
# good, we can find a path to the oid we $want, now
# lets see if we need to apply more patches:
}
# recreate $oid_want using $hints
-# hints keys: path_a, path_b, oid_a
+# hints keys: path_a, path_b, oid_a (note: `oid_b' is NOT a hint)
# Calls {user_cb} with: [ ::Git object, oid_full, type, size, di (diff_info) ]
# with found object, or undef if nothing was found
# Calls {user_cb} with a string error on fatal errors