gitweb: hack around CGI's list-context param() handling

[Gitweb] / gitweb.perl

diff --git a/gitweb.perl b/gitweb.perl
index 92021e0c285e82a3fcbd31d005d0ea4fb21a65d2edb40f778d30f4d30f1ebae8..9956e5991d009314fd0577b7f6ae10f3afc363a1c60de404b7b2d50bc28ca0d5 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -20,6 +20,10 @@ use File::Basename qw(basename);
 use Time::HiRes qw(gettimeofday tv_interval);
 binmode STDOUT, ':utf8';
 
 use Time::HiRes qw(gettimeofday tv_interval);
 binmode STDOUT, ':utf8';
 

+if (!defined($CGI::VERSION) || $CGI::VERSION < 4.08) {
+       eval 'sub CGI::multi_param { CGI::param(@_) }'
+}
+

 our $t0 = [ gettimeofday() ];
 our $number_of_git_cmds = 0;
 
 our $t0 = [ gettimeofday() ];
 our $number_of_git_cmds = 0;
 


@@ -872,7 +876,7 @@ sub evaluate_query_params {
 
        while (my ($name, $symbol) = each %cgi_param_mapping) {
                if ($symbol eq 'opt') {
 
        while (my ($name, $symbol) = each %cgi_param_mapping) {
                if ($symbol eq 'opt') {

-                       $input_params{$name} = [ map { decode_utf8($_) } $cgi->param($symbol) ];
+                       $input_params{$name} = [ map { decode_utf8($_) } $cgi->multi_param($symbol) ];

                } else {
                        $input_params{$name} = decode_utf8($cgi->param($symbol));
                }
                } else {
                        $input_params{$name} = decode_utf8($cgi->param($symbol));
                }


@@ -1491,7 +1495,7 @@ sub is_valid_pathname {
        my $input = shift;
 
        return undef unless defined $input;
        my $input = shift;
 
        return undef unless defined $input;

-       # no '.' or '..' as elements of path, i.e. no '.' nor '..'
+       # no '.' or '..' as elements of path, i.e. no '.' or '..'

        # at the beginning, at the end, and between slashes.
        # also this catches doubled slashes
        if ($input =~ m!(^|/)(|\.|\.\.)(/|$)!) {
        # at the beginning, at the end, and between slashes.
        # also this catches doubled slashes
        if ($input =~ m!(^|/)(|\.|\.\.)(/|$)!) {


@@ -3731,8 +3735,14 @@ sub git_get_heads_list {
                $ref_item{'fullname'}  = $name;
                my $strip_refs = join '|', map { quotemeta } get_branch_refs();
                $name =~ s!^refs/($strip_refs|remotes)/!!;
                $ref_item{'fullname'}  = $name;
                my $strip_refs = join '|', map { quotemeta } get_branch_refs();
                $name =~ s!^refs/($strip_refs|remotes)/!!;

+               $ref_item{'name'} = $name;
+               # for refs neither in 'heads' nor 'remotes' we want to
+               # show their ref dir
+               my $ref_dir = (defined $1) ? $1 : '';
+               if ($ref_dir ne '' and $ref_dir ne 'heads' and $ref_dir ne 'remotes') {
+                   $ref_item{'name'} .= ' (' . $ref_dir . ')';
+               }

 
 

-               $ref_item{'name'}  = $name;

                $ref_item{'id'}    = $hash;
                $ref_item{'title'} = $title || '(no commit message)';
                $ref_item{'epoch'} = $epoch;
                $ref_item{'id'}    = $hash;
                $ref_item{'title'} = $title || '(no commit message)';
                $ref_item{'epoch'} = $epoch;


@@ -4095,7 +4105,7 @@ sub print_search_form {
        if ($use_pathinfo) {
                $action .= "/".esc_url($project);
        }
        if ($use_pathinfo) {
                $action .= "/".esc_url($project);
        }

-       print $cgi->startform(-method => "get", -action => $action) .
+       print $cgi->start_form(-method => "get", -action => $action) .

              "<div class=\"search\">\n" .
              (!$use_pathinfo &&
              $cgi->input({-name=>"p", -value=>$project, -type=>"hidden"}) . "\n") .
              "<div class=\"search\">\n" .
              (!$use_pathinfo &&
              $cgi->input({-name=>"p", -value=>$project, -type=>"hidden"}) . "\n") .


@@ -5505,7 +5515,7 @@ sub git_project_search_form {
        }
 
        print "<div class=\"projsearch\">\n";
        }
 
        print "<div class=\"projsearch\">\n";

-       print $cgi->startform(-method => 'get', -action => $my_uri) .
+       print $cgi->start_form(-method => 'get', -action => $my_uri) .

              $cgi->hidden(-name => 'a', -value => 'project_list')  . "\n";
        print $cgi->hidden(-name => 'pf', -value => $project_filter). "\n"
                if (defined $project_filter);
              $cgi->hidden(-name => 'a', -value => 'project_list')  . "\n";
        print $cgi->hidden(-name => 'pf', -value => $project_filter). "\n"
                if (defined $project_filter);


@@ -7089,7 +7099,7 @@ sub git_blob {
        git_print_page_path($file_name, "blob", $hash_base);
        print "<div class=\"page_body\">\n";
        if ($mimetype =~ m!^image/!) {
        git_print_page_path($file_name, "blob", $hash_base);
        print "<div class=\"page_body\">\n";
        if ($mimetype =~ m!^image/!) {

-               print qq!<img type="!.esc_attr($mimetype).qq!"!;
+               print qq!<img class="blob" type="!.esc_attr($mimetype).qq!"!;

                if ($file_name) {
                        print qq! alt="!.esc_attr($file_name).qq!" title="!.esc_attr($file_name).qq!"!;
                }
                if ($file_name) {
                        print qq! alt="!.esc_attr($file_name).qq!" title="!.esc_attr($file_name).qq!"!;
                }


@@ -7224,6 +7234,15 @@ sub git_tree {
        git_footer_html();
 }
 
        git_footer_html();
 }
 

+sub sanitize_for_filename {
+    my $name = shift;
+
+    $name =~ s!/!-!g;
+    $name =~ s/[^[:alnum:]_.-]//g;
+
+    return $name;
+}
+

 sub snapshot_name {
        my ($project, $hash) = @_;
 
 sub snapshot_name {
        my ($project, $hash) = @_;
 


@@ -7231,9 +7250,7 @@ sub snapshot_name {
        # path/to/project/.git -> project
        my $name = to_utf8($project);
        $name =~ s,([^/])/*\.git$,$1,;
        # path/to/project/.git -> project
        my $name = to_utf8($project);
        $name =~ s,([^/])/*\.git$,$1,;

-       $name = basename($name);
-       # sanitize name
-       $name =~ s/[[:cntrl:]]/?/g;
+       $name = sanitize_for_filename(basename($name));

 
        my $ver = $hash;
        if ($hash =~ /^[0-9a-fA-F]+$/) {
 
        my $ver = $hash;
        if ($hash =~ /^[0-9a-fA-F]+$/) {


@@ -7249,12 +7266,23 @@ sub snapshot_name {
                # branches and other need shortened SHA-1 hash
                my $strip_refs = join '|', map { quotemeta } get_branch_refs();
                if ($hash =~ m!^refs/($strip_refs|remotes)/(.*)$!) {
                # branches and other need shortened SHA-1 hash
                my $strip_refs = join '|', map { quotemeta } get_branch_refs();
                if ($hash =~ m!^refs/($strip_refs|remotes)/(.*)$!) {

-                       $ver = $1;
+                       my $ref_dir = (defined $1) ? $1 : '';
+                       $ver = $2;
+
+                       $ref_dir = sanitize_for_filename($ref_dir);
+                       # for refs neither in heads nor remotes we want to
+                       # add a ref dir to archive name
+                       if ($ref_dir ne '' and $ref_dir ne 'heads' and $ref_dir ne 'remotes') {
+                               $ver = $ref_dir . '-' . $ver;
+                       }

                }
                $ver .= '-' . git_get_short_hash($project, $hash);
        }
                }
                $ver .= '-' . git_get_short_hash($project, $hash);
        }

+       # special case of sanitization for filename - we change
+       # slashes to dots instead of dashes

        # in case of hierarchical branch names
        $ver =~ s!/!.!g;
        # in case of hierarchical branch names
        $ver =~ s!/!.!g;

+       $ver =~ s/[^[:alnum:]_.-]//g;

 
        # name = project-version_string
        $name = "$name-$ver";
 
        # name = project-version_string
        $name = "$name-$ver";