From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Christopher M. Fuhrman" Subject: [PATCH] gitweb: highlight: strip non-printable characters via col(1) Date: Mon, 22 Aug 2011 15:58:43 -0700 Message-ID: <1314053923-13122-1-git-send-email-cfuhrman@panix.com> Cc: jnareb@gmail.com, cwilson@cdwilson.us, sylvain@abstraction.fr, "Christopher M. Fuhrman" To: gitster@pobox.com, git@vger.kernel.org X-From: git-owner@vger.kernel.org Tue Aug 23 00:59:08 2011 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1QvdSR-0007aS-2A for gcvg-git-2@lo.gmane.org; Tue, 23 Aug 2011 00:59:03 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753294Ab1HVW66 (ORCPT ); Mon, 22 Aug 2011 18:58:58 -0400 Received: from mailbackend.panix.com ([166.84.1.89]:63572 "EHLO mailbackend.panix.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751668Ab1HVW65 (ORCPT ); Mon, 22 Aug 2011 18:58:57 -0400 Received: from vc75.vc.panix.com (vc75.vc.panix.com [166.84.7.75]) by mailbackend.panix.com (Postfix) with ESMTP id AAA353454F; Mon, 22 Aug 2011 18:58:56 -0400 (EDT) X-Mailer: git-send-email 1.7.5.4 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: From: "Christopher M. Fuhrman" The current code, as is, passes control characters, such as form-feed (^L) to highlight which then passes it through to the browser. This will cause the browser to display one of the following warnings: Safari v5.1 (6534.50) & Google Chrome v13.0.782.112: This page contains the following errors: error on line 657 at column 38: PCDATA invalid Char value 12 Below is a rendering of the page up to the first error. Mozilla Firefox 3.6.19 & Mozilla Firefox 5.0: XML Parsing Error: not well-formed Location: http://path/to/git/repo/blah/blah Both errors were generated by gitweb.perl v1.7.3.4 w/ highlight 2.7 using arch/ia64/kernel/unwind.c from the Linux kernel. Strip non-printable control-characters by piping the output produced by git-cat-file(1) to col(1) as follows: git cat-file blob deadbeef314159 | col -bx | highlight Note usage of the '-x' option which tells col(1) to output multiple spaces instead of tabs. Tested under OpenSuSE 11.4 & NetBSD 5.1 using perl 5.12.3 and perl 5.12.2 respectively using Safari, Firefox, and Google Chrome. Signed-off-by: Christopher M. Fuhrman --- Howdy, I haven't gotten any responses to my patch for a while, so I am now submitting this for general inclusion into git. Please note that this is based off the "maint" branch per Documentation/SubmittingPatches For an example of this bug in action, see: * http://git.fuhrbear.com/~cfuhrman/?p=linux/.git;a=blob;f=arch/alpha/kernel/core_titan.c;h=219bf271c0ba2e5f2d668af707df57fbbd00ccfd;hb=HEAD * http://git.fuhrbear.com/~cfuhrman/?p=linux/.git;a=blob;f=arch/ia64/kernel/unwind.c;h=fed6afa2e8a9014e65229e51e64fa4b1c13cc284;hb=HEAD WRT the col(1) command, I've verified that the binary is installed in /usr/bin on OpenSuSE, NetBSD, OpenBSD, Solaris 10, and AIX. This patch assumes that /usr/bin is in $PATH. Cheers! gitweb/gitweb.perl | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 50a835a..4c68165 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -3656,6 +3656,7 @@ sub run_highlighter { close $fd; open $fd, quote_command(git_cmd(), "cat-file", "blob", $hash)." | ". + "col -bx | ". quote_command($highlight_bin). " --replace-tabs=8 --fragment --syntax $syntax |" or die_error(500, "Couldn't open file or run syntax highlighter"); -- 1.7.5.4