use PublicInbox::RepobrowseConfig;
my %CMD = map { lc($_) => $_ } qw(Log Commit Tree Patch Blob Plain Tag Atom
- Diff);
+ Diff Snapshot);
my %VCS = (git => 'Git');
my %LOADED;
use warnings;
require PublicInbox::RepobrowseGitQuery;
use PublicInbox::Hval;
-our %MIME_TYPE_WHITELIST = ( 'application/pdf' => 1 );
+our %MIME_TYPE_WHITELIST = ('application/pdf' => 1);
sub new { bless {}, shift }
# mainly for curl (no-'-L') users:
$body = "Redirecting to $redir\n";
} else {
- die "not implemented, yet: $status";
+ push @h, qw(Content-Type text/plain);
}
[ $status, \@h, [ $body ] ]
$file = default_file() unless defined($file);
my $self = bless PublicInbox::Config::git_config_dump($file), $class;
$self->{-cache} = {};
+
+ # hard disable these with '-' prefix by default:
+ $self->{'repobrowse.snapshots'} ||= '-tar.bz2 -tar.xz';
+
# for root
$self->{-groups} = { -hidden => [], -none => [] };
$self;
$rv->{path} = $path;
$rv->{repo} = $repo_path;
+ # snapshots:
+ my $snap = (split('/', $repo_path))[-1];
+ $snap =~ s/\.git\z//; # seems common for git URLs to end in ".git"
+ $rv->{snapshot_re} = qr/\A\Q$snap\E[-_]/;
+ $rv->{snapshot_pfx} = $snap;
+
# gitweb compatibility
foreach my $key (qw(description cloneurl)) {
$rv->{$key} = try_cat("$path/$key");
$rv->{desc_html} =
PublicInbox::Hval->new_oneline($rv->{description})->as_html;
- foreach my $key (qw(publicinbox vcs readme group)) {
+ foreach my $key (qw(publicinbox vcs readme group snapshots)) {
$rv->{$key} = $self->{"repo.$repo_path.$key"};
}
+ unless (defined $rv->{snapshots}) {
+ $rv->{snapshots} = $self->{'repobrowse.snapshots'} || '';
+ }
+
+ my %disabled;
+ foreach (split(/\s+/, $rv->{snapshots})) {
+ s/\A-// and $disabled{$_} = 1;
+ }
+ $rv->{snapshots_disabled} = \%disabled;
my $g = $rv->{group};
defined $g or $g = '-none';
--- /dev/null
+# Copyright (C) 2016 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
+
+# shows the /snapshot/ endpoint for git repositories
+# Mainly for compatibility reasons with cgit, I'm unsure if
+# showing this in a repository viewer is a good idea.
+
+package PublicInbox::RepobrowseGitSnapshot;
+use strict;
+use warnings;
+use base qw(PublicInbox::RepobrowseBase);
+use PublicInbox::Git;
+our $SUFFIX;
+BEGIN {
+ # as described in git-archive(1), users may add support for
+ # other compression schemes such as xz or bz2 via git-config(1):
+ # git config tar.tar.xz.command "xz -c"
+ # git config tar.tar.bz2.command "bzip2 -c"
+ chomp(my @l = `git archive --list`);
+ $SUFFIX = join('|', map { quotemeta $_ } @l);
+}
+
+# Not using standard mime types since the compressed tarballs are
+# special or do not match my /etc/mime.types. Choose what gitweb
+# and cgit agree on for compatibility.
+our %FMT_TYPES = (
+ 'tar' => 'application/x-tar',
+ 'tar.bz2' => 'application/x-bzip2',
+ 'tar.gz' => 'application/x-gzip',
+ 'tar.xz' => 'application/x-xz',
+ 'tgz' => 'application/x-gzip',
+ 'zip' => 'application/x-zip',
+);
+
+sub call_git_snapshot ($$) { # invoked by PublicInbox::RepobrowseBase::call
+ my ($self, $req) = @_;
+
+ my @extra = @{$req->{extra}};
+ my $ref = shift @extra;
+ return $self->r(404) if (!defined $ref) || scalar(@extra);
+ my $orig_fn = $ref;
+
+ # just in case git changes refname rules, don't allow wonky filenames
+ # to break the Content-Disposition header, either.
+ return $self->r(404) if $orig_fn =~ /["\s]/s;
+ return $self->r(404) unless ($ref =~ s/\.($SUFFIX)\z//o);
+ my $fmt = $1;
+
+ my $repo_info = $req->{repo_info};
+
+ # support disabling certain snapshots types entirely to twart
+ # URL guessing since it could burn server resources.
+ return $self->r(404) if $repo_info->{snapshots_disabled}->{$fmt};
+
+ # strip optional basename (may not exist)
+ $ref =~ s/$repo_info->{snapshot_re}//;
+
+ # don't allow option/command injection, git refs do not start with '-'
+ return $self->r(404) if $ref =~ /\A-/;
+
+ my $git = $repo_info->{git};
+ my $tree;
+
+ # try prefixing "v" or "V" for tag names
+ foreach my $r ($ref, "v$ref", "V$ref") {
+ $tree = $git->qx([qw(rev-parse --verify --revs-only), $r],
+ undef, { 2 => $git->err_begin });
+ if (defined $tree) {
+ chomp $tree;
+ last if $tree ne '';
+ }
+ }
+ return $self->r(404) if (!defined $tree || $tree eq '');
+
+ my $pfx = "$repo_info->{snapshot_pfx}-$ref/";
+ my @cmd = ('archive', "--prefix=$pfx", "--format=$fmt", $tree);
+ $req->{rpipe} = $git->popen(\@cmd, undef, { 2 => $git->err_begin });
+
+ my $env = $req->{cgi}->env;
+ my $vin;
+ my $end = sub {
+ my ($n) = @_;
+ if (my $fh = delete $req->{fh}) {
+ $fh->close;
+ } elsif (my $res = delete $req->{res}) {
+ $res->($self->r(500));
+ }
+ if (my $rpipe = delete $req->{rpipe}) {
+ $rpipe->close; # _may_ be Danga::Socket::close
+ }
+ };
+ my $fail = sub {
+ if ($!{EAGAIN} || $!{EINTR}) {
+ select($vin, undef, undef, undef) if $vin;
+ # $vin is undef on async, so this is a noop
+ return;
+ }
+ my $e = $!;
+ $end->();
+ my $err = $env->{'psgi.errors'};
+ $err->print("git archive ($git->{git_dir}): $e\n");
+ };
+ my $cb = sub {
+ my $n = $req->{rpipe}->sysread(my $buf, 65536);
+ return $fail->() unless defined $n;
+ return $end->() if $n == 0;
+ if (my $res = delete $req->{res}) {
+ my $h = [ 'Content-Type',
+ $FMT_TYPES{$fmt} || 'application/octet-stream',
+ 'Content-Disposition',
+ qq(inline; filename="$orig_fn"),
+ 'ETag', qq("$tree") ];
+ $req->{fh} = $res->([200, $h]);
+ }
+ my $fh = $req->{fh} or return;
+ $fh->write($buf);
+ };
+ if (my $async = $env->{'pi-httpd.async'}) {
+ $req->{rpipe} = $async->($req->{rpipe}, $cb);
+ sub { $req->{res} = $_[0] } # let Danga::Socket handle the rest.
+ } else { # synchronous loop for other PSGI servers
+ $vin = '';
+ vec($vin, fileno($req->{rpipe}), 1) = 1;
+ sub {
+ $req->{res} = $_[0]; # Plack response callback
+ while ($req->{rpipe}) { $cb->() }
+ }
+ }
+}
+
+1;
is($b2, substr($body, 5), 'substring matches on 206');
}
+test_psgi(uri => $uri, client => sub {
+ my ($cb) = @_;
+ my $res = $cb->(GET($uri . 'test.git/snapshot/test-master.tar.gz'));
+ is(200, $res->code, 'got gzipped tarball');
+ my $got = "$tmpdir/got.tar.gz";
+ my $exp = "$tmpdir/exp.tar.gz";
+ open my $fh, '>', $got or die "open got.tar.gz: $!";
+ print $fh $res->content;
+ close $fh or die "close failed: $!";
+ $res = undef;
+ my $rc = system('git', "--git-dir=$test->{git_dir}",
+ qw(archive --prefix=test-master/ --format=tar.gz),
+ '-o', $exp, 'master');
+ is(0, $rc, 'git-archive generated check correctly');
+ is(0, system('cmp', $got, $exp), 'got expected gzipped tarball');
+
+});
+
done_testing();
1;
--- /dev/null
+# Copyright (C) 2016 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
+use strict;
+use warnings;
+my $test = require './t/repobrowse_common_git.perl';
+
+test_psgi($test->{app}, sub {
+ my ($cb) = @_;
+ my ($req, $rc, $res);
+
+ $req = 'http://example.com/test.git/snapshot/test-master.tar.gz';
+ $res = $cb->(GET($req));
+ is($res->code, 200, 'got 200 response from $NAME-master-tar.gz');
+ is($res->header('Content-Type'), 'application/x-gzip',
+ 'Content-Type is as expected');
+
+ $req = 'http://example.com/test.git/snapshot/test-nonexistent.tar.gz';
+ $res = $cb->(GET($req));
+ is($res->code, 404, 'got 404 for non-existent');
+
+ $rc = system('git', "--git-dir=$test->{git_dir}", 'tag', '-a',
+ '-m', 'annotated tag!', 'v1.0.0');
+ is($rc, 0, 'created annotated 1.0.0 tag');
+ $req = 'http://example.com/test.git/snapshot/test-1.0.0.tar.gz';
+ $res = $cb->(GET($req));
+ is($res->code, 200, 'got 200 response for tag');
+ is($res->header('Content-Type'), 'application/x-gzip',
+ 'Content-Type is as expected');
+ is($res->header('Content-Disposition'),
+ 'inline; filename="test-1.0.0.tar.gz"',
+ 'Content-Disposition is as expected');
+
+ $rc = system('git', "--git-dir=$test->{git_dir}", 'tag',
+ '-m', 'lightweight tag!', 'v2.0.0');
+ is($rc, 0, 'created lightweight 2.0.0 tag');
+ $req = 'http://example.com/test.git/snapshot/test-2.0.0.tar.gz';
+ $res = $cb->(GET($req));
+ is($res->code, 200, 'got 200 response for tag');
+ is($res->header('Content-Type'), 'application/x-gzip',
+ 'Content-Type is as expected');
+ is($res->header('Content-Disposition'),
+ 'inline; filename="test-2.0.0.tar.gz"',
+ 'Content-Disposition is as expected');
+});
+
+done_testing();
projects / thirdparty / public-inbox.git / commitdiff
