Signed-off-by: Matt McCutchen <matt@xxxxxxxxxxxxxxxxx>
---
My Web site has a single gitweb installation in which some of the
repositories are protected by a basic authentication login. By virtue
of my aforementioned setup with gitweb and pulling at the same URL, the
login applies uniformly to both. I had to include these repositories in
the projects_list because I use strict_export, but I want to hide them
when the user views the project list. This patch implements that
feature, and the previous one fixes a bug I noticed along the way.
Matt
gitweb/gitweb.perl | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 5357bcc..085cc60 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -1144,7 +1144,7 @@ sub untabify {
sub project_in_list {
my $project = shift;
- # Tell git_get_projects_list to include forks.
+ # Tell git_get_projects_list to include forks and hidden repositories.
my @list = git_get_projects_list(undef, 1);
return @list && scalar(grep { $_->{'path'} eq $project } @list);
}
@@ -2174,15 +2174,18 @@ sub git_get_projects_list {
# 'git%2Fgit.git Linus+Torvalds'
# 'libs%2Fklibc%2Fklibc.git H.+Peter+Anvin'
# 'linux%2Fhotplug%2Fudev.git Greg+Kroah-Hartman'
+ #
+ # 1 in the third field hides the project from user-visible lists, e.g.:
+ # 'linux%2Fembargoed-security-fixes.git John+Doe 1'
my %paths;
open my ($fd), $projects_list or return;
PROJECT:
while (my $line = <$fd>) {
chomp $line;
- my ($path, $owner) = split ' ', $line;
+ my ($path, $owner, $hidden) = split ' ', $line;
$path = unescape($path);
$owner = unescape($owner);
- if (!defined $path) {
+ if (!defined $path || ($hidden && !$for_strict_export)) {
next;
}
if ($filter ne '') {
@@ -2227,6 +2230,8 @@ sub git_get_projects_list {
return @list;
}
+# This is used to look up the owner of a project the user is already allowed to
+# see, so we shouldn't omit hidden repositories.
our $gitweb_project_owner = undef;
sub git_get_project_list_from_file {
@@ -2241,7 +2246,7 @@ sub git_get_project_list_from_file {
open (my $fd , $projects_list);
while (my $line = <$fd>) {
chomp $line;
- my ($pr, $ow) = split ' ', $line;
+ my ($pr, $ow, $hidden) = split ' ', $line;
$pr = unescape($pr);
$ow = unescape($ow);
$gitweb_project_owner->{$pr} = to_utf8($ow);
--
1.6.1.rc2.27.gc7114
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
