@matheusbsbs / matheus-bagliano / commits / 2c162b56f3

gitweb: do not misparse nonnumeric content tag files that contain a digit

v1.7.6-rc0~27^2~4 (gitweb: Change the way "content tags" ('ctags') are handled, 2011-04-29) tried to make gitweb's tag cloud feature more intuitive for webmasters by checking whether the ctags/<label> under a project's .git dir contains a number (representing the strength of association to <label>) before treating it as one. With that change, after putting '$feature{'ctags'}{'default'} = [1];' in your $GITWEB_CONFIG, you could do echo Linux >.git/ctags/linux and gitweb would treat that as a request to tag the current repository with the Linux tag, instead of the previous behavior of writing an error page embedded in the projects list that triggers error messages from Chromium and Firefox about malformed XML. Unfortunately the pattern (\d+) used to match numbers is too loose, and the "XML declaration allowed only at the start of the document" error can still be experienced if you write "Linux-2.6" in place of "Linux" in the example above. Fix it by tightening the pattern to ^\d+$. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jonathan Nieder committed Jun 9, 2011 at 02:08 UTC 2c162b56f370f5c33e6a945e6922d598006c5ec4
2 files changed +9 -1
gitweb/gitweb.perl
+1 -1
@@ -2644,7 +2644,7 @@ sub git_get_project_ctags {
2644 close $ct;
2645
2646 (my $ctag = $tagfile) =~ s#.*/##;
2647 - if ($val =~ /\d+/) {
2647 + if ($val =~ /^\d+$/) {
2648 $ctags->{$ctag} = $val;
2649 } else {
2650 $ctags->{$ctag} = 1;
t/t9500-gitweb-standalone-no-errors.sh
+8
@@ -644,6 +644,14 @@ test_expect_success \
644 'ctags: search projects by non existent tag' \
645 'gitweb_run "by_tag=non-existent"'
646
647 +test_expect_success \
648 + 'ctags: malformed tag weights' \
649 + 'mkdir -p .git/ctags &&
650 + echo "not-a-number" > .git/ctags/nan &&
651 + echo "not-a-number-2" > .git/ctags/nan2 &&
652 + echo "0.1" >.git/ctags/floating-point &&
653 + gitweb_run'
654 +
655 # ----------------------------------------------------------------------
656 # categories
657