gitweb: Allow arbitrary strings to be dug with pickaxe

Currently, there are rather draconian restrictions on the strings accepted
by the pickaxe search, which degrades its usefulness for digging in code
significantly. This patch remedies mentioned limitation.

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index cc16e3137ed86036cc65d9adbbdd0e565900163f..7c136ec0d3bc9658aabd5f02b04d18f076eba8c1 100755 (executable)
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -399,7 +399,7 @@ sub check_export_ok {
 our $searchtext = $cgi->param('s');
 our $search_regexp;
 if (defined $searchtext) {
 our $searchtext = $cgi->param('s');
 our $search_regexp;
 if (defined $searchtext) {

-       if ($searchtype ne 'grep' and $searchtext =~ m/[^a-zA-Z0-9_\.\/\-\+\:\@ ]/) {
+       if ($searchtype ne 'grep' and $searchtype ne 'pickaxe' and $searchtext =~ m/[^a-zA-Z0-9_\.\/\-\+\:\@ ]/) {

                die_error(undef, "Invalid search parameter");
        }
        if (length($searchtext) < 2) {
                die_error(undef, "Invalid search parameter");
        }
        if (length($searchtext) < 2) {


@@ -4725,8 +4725,10 @@ sub git_search {
                my $alternate = 1;
                $/ = "\n";
                my $git_command = git_cmd_str();
                my $alternate = 1;
                $/ = "\n";
                my $git_command = git_cmd_str();

+               my $searchqtext = $searchtext;
+               $searchqtext =~ s/'/'\\''/;

                open my $fd, "-|", "$git_command rev-list $hash | " .
                open my $fd, "-|", "$git_command rev-list $hash | " .

-                       "$git_command diff-tree -r --stdin -S\'$searchtext\'";
+                       "$git_command diff-tree -r --stdin -S\'$searchqtext\'";

                undef %co;
                my @files;
                while (my $line = <$fd>) {
                undef %co;
                my @files;
                while (my $line = <$fd>) {