gitweb: prepare git_get_projects_list for use outside 'forks'.

[Gitweb] / gitweb.perl

diff --git a/gitweb.perl b/gitweb.perl
index 33a89d57d8fcd00f4bd701b9f4c0a35d35be337285c0efde22bd71c2f992d54d..843b0b569ba4490ba85ae421cd6071fdf0c0916abf62d4b209befc292b4029eb 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -1124,8 +1124,10 @@ sub dispatch {
        if (!defined $action) {
                if (defined $hash) {
                        $action = git_get_type($hash);
        if (!defined $action) {
                if (defined $hash) {
                        $action = git_get_type($hash);

+                       $action or die_error(404, "Object does not exist");

                } elsif (defined $hash_base && defined $file_name) {
                        $action = git_get_type("$hash_base:$file_name");
                } elsif (defined $hash_base && defined $file_name) {
                        $action = git_get_type("$hash_base:$file_name");

+                       $action or die_error(404, "File or directory does not exist");

                } elsif (defined $project) {
                        $action = 'summary';
                } else {
                } elsif (defined $project) {
                        $action = 'summary';
                } else {


@@ -1444,8 +1446,8 @@ sub validate_refname {
 sub to_utf8 {
        my $str = shift;
        return undef unless defined $str;
 sub to_utf8 {
        my $str = shift;
        return undef unless defined $str;

-       if (utf8::valid($str)) {
-               utf8::decode($str);
+
+       if (utf8::is_utf8($str) || utf8::decode($str)) {

                return $str;
        } else {
                return decode($fallback_encoding, $str, Encode::FB_DEFAULT);
                return $str;
        } else {
                return decode($fallback_encoding, $str, Encode::FB_DEFAULT);


@@ -2392,7 +2394,7 @@ sub get_feed_info {
        return unless (defined $project);
        # some views should link to OPML, or to generic project feed,
        # or don't have specific feed yet (so they should use generic)
        return unless (defined $project);
        # some views should link to OPML, or to generic project feed,
        # or don't have specific feed yet (so they should use generic)

-       return if ($action =~ /^(?:tags|heads|forks|tag|search)$/x);
+       return if (!$action || $action =~ /^(?:tags|heads|forks|tag|search)$/x);

 
        my $branch;
        # branches refs uses 'refs/heads/' prefix (fullname) to differentiate
 
        my $branch;
        # branches refs uses 'refs/heads/' prefix (fullname) to differentiate


@@ -2828,19 +2830,18 @@ sub git_get_project_url_list {
 
 sub git_get_projects_list {
        my $filter = shift || '';
 
 sub git_get_projects_list {
        my $filter = shift || '';

+       my $paranoid = shift;

        my @list;
 
        my @list;
 

-       $filter =~ s/\.git$//;
-

        if (-d $projects_list) {
                # search in directory
                my $dir = $projects_list;
                # remove the trailing "/"
                $dir =~ s!/+$!!;
        if (-d $projects_list) {
                # search in directory
                my $dir = $projects_list;
                # remove the trailing "/"
                $dir =~ s!/+$!!;

-               my $pfxlen = length("$projects_list");
-               my $pfxdepth = ($projects_list =~ tr!/!!);
+               my $pfxlen = length("$dir");
+               my $pfxdepth = ($dir =~ tr!/!!);

                # when filtering, search only given subdirectory
                # when filtering, search only given subdirectory

-               if ($filter) {
+               if ($filter && !$paranoid) {

                        $dir .= "/$filter";
                        $dir =~ s!/+$!!;
                }
                        $dir .= "/$filter";
                        $dir =~ s!/+$!!;
                }


@@ -2865,6 +2866,10 @@ sub git_get_projects_list {
                                }
 
                                my $path = substr($File::Find::name, $pfxlen + 1);
                                }
 
                                my $path = substr($File::Find::name, $pfxlen + 1);

+                               # paranoidly only filter here
+                               if ($paranoid && $filter && $path !~ m!^\Q$filter\E/!) {
+                                       next;
+                               }

                                # we check related file in $projectroot
                                if (check_export_ok("$projectroot/$path")) {
                                        push @list, { path => $path };
                                # we check related file in $projectroot
                                if (check_export_ok("$projectroot/$path")) {
                                        push @list, { path => $path };


@@ -5837,7 +5842,7 @@ sub git_search_files {
        my %co = @_;
 
        local $/ = "\n";
        my %co = @_;
 
        local $/ = "\n";

-       open my $fd, "-|", git_cmd(), 'grep', '-n',
+       open my $fd, "-|", git_cmd(), 'grep', '-n', '-z',

                $search_use_regexp ? ('-E', '-i') : '-F',
                $searchtext, $co{'tree'}
                        or die_error(500, "Open git-grep failed");
                $search_use_regexp ? ('-E', '-i') : '-F',
                $searchtext, $co{'tree'}
                        or die_error(500, "Open git-grep failed");


@@ -5853,13 +5858,14 @@ sub git_search_files {
        my $lastfile = '';
        while (my $line = <$fd>) {
                chomp $line;
        my $lastfile = '';
        while (my $line = <$fd>) {
                chomp $line;

-               my ($file, $lno, $ltext, $binary);
+               my ($file, $file_href, $lno, $ltext, $binary);

                last if ($matches++ > 1000);
                if ($line =~ /^Binary file (.+) matches$/) {
                        $file = $1;
                        $binary = 1;
                } else {
                last if ($matches++ > 1000);
                if ($line =~ /^Binary file (.+) matches$/) {
                        $file = $1;
                        $binary = 1;
                } else {

-                       (undef, $file, $lno, $ltext) = split(/:/, $line, 4);
+                       ($file, $lno, $ltext) = split(/\0/, $line, 3);
+                       $file =~ s/^$co{'tree'}://;

                }
                if ($file ne $lastfile) {
                        $lastfile and print "</td></tr>\n";
                }
                if ($file ne $lastfile) {
                        $lastfile and print "</td></tr>\n";


@@ -5868,10 +5874,10 @@ sub git_search_files {
                        } else {
                                print "<tr class=\"light\">\n";
                        }
                        } else {
                                print "<tr class=\"light\">\n";
                        }

+                       $file_href = href(action=>"blob", hash_base=>$co{'id'},
+                                         file_name=>$file);

                        print "<td class=\"list\">".
                        print "<td class=\"list\">".

-                               $cgi->a({-href => href(action=>"blob", hash=>$co{'hash'},
-                                                      file_name=>"$file"),
-                                       -class => "list"}, esc_path($file));
+                               $cgi->a({-href => $file_href, -class => "list"}, esc_path($file));

                        print "</td><td>\n";
                        $lastfile = $file;
                }
                        print "</td><td>\n";
                        $lastfile = $file;
                }


@@ -5889,10 +5895,9 @@ sub git_search_files {
                                $ltext = esc_html($ltext, -nbsp=>1);
                        }
                        print "<div class=\"pre\">" .
                                $ltext = esc_html($ltext, -nbsp=>1);
                        }
                        print "<div class=\"pre\">" .

-                               $cgi->a({-href => href(action=>"blob", hash=>$co{'hash'},
-                                                      file_name=>"$file").'#l'.$lno,
-                                       -class => "linenr"}, sprintf('%4i', $lno))
-                               . ' ' .  $ltext . "</div>\n";
+                               $cgi->a({-href => $file_href.'#l'.$lno,
+                                       -class => "linenr"}, sprintf('%4i', $lno)) .
+                               ' ' .  $ltext . "</div>\n";

                }
        }
        if ($lastfile) {
                }
        }
        if ($lastfile) {


@@ -6006,7 +6011,9 @@ sub git_forks {
                die_error(400, "Unknown order parameter");
        }
 
                die_error(400, "Unknown order parameter");
        }
 

-       my @list = git_get_projects_list($project);
+       my $filter = $project;
+       $filter =~ s/\.git$//;
+       my @list = git_get_projects_list($filter);

        if (!@list) {
                die_error(404, "No forks found");
        }
        if (!@list) {
                die_error(404, "No forks found");
        }


@@ -6065,7 +6072,9 @@ sub git_summary {
 
        if ($check_forks) {
                # find forks of a project
 
        if ($check_forks) {
                # find forks of a project

-               @forklist = git_get_projects_list($project);
+               my $filter = $project;
+               $filter =~ s/\.git$//;
+               @forklist = git_get_projects_list($filter);

                # filter out forks of forks
                @forklist = filter_forks_from_projects_list(\@forklist)
                        if (@forklist);
                # filter out forks of forks
                @forklist = filter_forks_from_projects_list(\@forklist)
                        if (@forklist);


@@ -6245,7 +6254,9 @@ sub git_blame_common {
                        -type=>"text/plain", -charset => "utf-8",
                        -status=> "200 OK");
                local $| = 1; # output autoflush
                        -type=>"text/plain", -charset => "utf-8",
                        -status=> "200 OK");
                local $| = 1; # output autoflush

-               print while <$fd>;
+               while (my $line = <$fd>) {
+                       print to_utf8($line);
+               }

                close $fd
                        or print "ERROR $!\n";
 
                close $fd
                        or print "ERROR $!\n";
 


@@ -7864,11 +7875,12 @@ sub git_opml {
                -charset => 'utf-8',
                -content_disposition => 'inline; filename="opml.xml"');
 
                -charset => 'utf-8',
                -content_disposition => 'inline; filename="opml.xml"');
 

+       my $title = esc_html($site_name);

        print <<XML;
 <?xml version="1.0" encoding="utf-8"?>
 <opml version="1.0">
 <head>
        print <<XML;
 <?xml version="1.0" encoding="utf-8"?>
 <opml version="1.0">
 <head>

-  <title>$site_name OPML Export</title>
+  <title>$title OPML Export</title>

 </head>
 <body>
 <outline text="git RSS feeds">
 </head>
 <body>
 <outline text="git RSS feeds">