gitweb: limit links to alternate forms of project_list to active project_filter

[Gitweb] / gitweb.perl

diff --git a/gitweb.perl b/gitweb.perl
index 28748c8e214e676bdb50110e5f8252adfa99a973831b4f860d7dd68a0e03e50b..514f26354fb21f6dd986ee9e71082fa15fc5938ffb87c31d5c64e244be60744d 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -761,6 +761,7 @@ our @cgi_param_mapping = (
        search_use_regexp => "sr",
        ctag => "by_tag",
        diff_style => "ds",
        search_use_regexp => "sr",
        ctag => "by_tag",
        diff_style => "ds",

+       project_filter => "pf",

        # this must be last entry (for manipulation from JavaScript)
        javascript => "js"
 );
        # this must be last entry (for manipulation from JavaScript)
        javascript => "js"
 );


@@ -977,7 +978,7 @@ sub evaluate_path_info {
 
 our ($action, $project, $file_name, $file_parent, $hash, $hash_parent, $hash_base,
      $hash_parent_base, @extra_options, $page, $searchtype, $search_use_regexp,
 
 our ($action, $project, $file_name, $file_parent, $hash, $hash_parent, $hash_base,
      $hash_parent_base, @extra_options, $page, $searchtype, $search_use_regexp,

-     $searchtext, $search_regexp);
+     $searchtext, $search_regexp, $project_filter);

 sub evaluate_and_validate_params {
        our $action = $input_params{'action'};
        if (defined $action) {
 sub evaluate_and_validate_params {
        our $action = $input_params{'action'};
        if (defined $action) {


@@ -995,6 +996,13 @@ sub evaluate_and_validate_params {
                }
        }
 
                }
        }
 

+       our $project_filter = $input_params{'project_filter'};
+       if (defined $project_filter) {
+               if (!validate_pathname($project_filter)) {
+                       die_error(404, "Invalid project_filter parameter");
+               }
+       }
+

        our $file_name = $input_params{'file_name'};
        if (defined $file_name) {
                if (!validate_pathname($file_name)) {
        our $file_name = $input_params{'file_name'};
        if (defined $file_name) {
                if (!validate_pathname($file_name)) {


@@ -2830,6 +2838,7 @@ 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;
 
        if (-d $projects_list) {
        my @list;
 
        if (-d $projects_list) {


@@ -2840,7 +2849,7 @@ sub git_get_projects_list {
                my $pfxlen = length("$dir");
                my $pfxdepth = ($dir =~ tr!/!!);
                # when filtering, search only given subdirectory
                my $pfxlen = length("$dir");
                my $pfxdepth = ($dir =~ tr!/!!);
                # when filtering, search only given subdirectory

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

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


@@ -2865,6 +2874,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 };


@@ -3730,7 +3743,12 @@ sub run_highlighter {
 sub get_page_title {
        my $title = to_utf8($site_name);
 
 sub get_page_title {
        my $title = to_utf8($site_name);
 

-       return $title unless (defined $project);
+       unless (defined $project) {
+               if (defined $project_filter) {
+                       $title .= " - " . to_utf8($project_filter);
+               }
+               return $title;
+       }

        $title .= " - " . to_utf8($project);
 
        return $title unless (defined $action);
        $title .= " - " . to_utf8($project);
 
        return $title unless (defined $action);


@@ -3964,9 +3982,11 @@ sub git_footer_html {
                }
 
        } else {
                }
 
        } else {

-               print $cgi->a({-href => href(project=>undef, action=>"opml"),
+               print $cgi->a({-href => href(project=>undef, action=>"opml",
+                                            project_filter => $project_filter),

                              -class => $feed_class}, "OPML") . " ";
                              -class => $feed_class}, "OPML") . " ";

-               print $cgi->a({-href => href(project=>undef, action=>"project_index"),
+               print $cgi->a({-href => href(project=>undef, action=>"project_index",
+                                            project_filter => $project_filter),

                              -class => $feed_class}, "TXT") . "\n";
        }
        print "</div>\n"; # class="page_footer"
                              -class => $feed_class}, "TXT") . "\n";
        }
        print "</div>\n"; # class="page_footer"


@@ -5980,7 +6000,7 @@ sub git_project_list {
                die_error(400, "Unknown order parameter");
        }
 
                die_error(400, "Unknown order parameter");
        }
 

-       my @list = git_get_projects_list();
+       my @list = git_get_projects_list($project_filter, $strict_export);

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


@@ -6021,7 +6041,7 @@ sub git_forks {
 }
 
 sub git_project_index {
 }
 
 sub git_project_index {

-       my @projects = git_get_projects_list();
+       my @projects = git_get_projects_list($project_filter, $strict_export);

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


@@ -7860,7 +7880,7 @@ sub git_atom {
 }
 
 sub git_opml {
 }
 
 sub git_opml {

-       my @list = git_get_projects_list();
+       my @list = git_get_projects_list($project_filter, $strict_export);

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


@@ -7871,11 +7891,17 @@ sub git_opml {
                -content_disposition => 'inline; filename="opml.xml"');
 
        my $title = esc_html($site_name);
                -content_disposition => 'inline; filename="opml.xml"');
 
        my $title = esc_html($site_name);

+       my $filter = " within subdirectory ";
+       if (defined $project_filter) {
+               $filter .= esc_html($project_filter);
+       } else {
+               $filter = "";
+       }

        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>$title OPML Export</title>
+  <title>$title OPML Export$filter</title>

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