diff --git a/gitweb.cgi b/gitweb.cgi index 15bb123b21..4ad3ce4dcb 100755 --- a/gitweb.cgi +++ b/gitweb.cgi @@ -14,7 +14,7 @@ use CGI::Carp qw(fatalsToBrowser); my $cgi = new CGI; -my $version = "082"; +my $version = "085"; my $projectroot = "/pub/scm"; my $home_link = "/git"; my $gitbin = "/usr/bin"; @@ -22,107 +22,116 @@ my $gittmp = "/tmp/gitweb"; my $logo_link = "/pub/software/scm/cogito"; my $my_url = $cgi->url(); my $my_uri = $cgi->url(-absolute => 1); +my $rss_link = ""; -mkdir($gittmp, 0700); my $project = $cgi->param('p'); -my $action = $cgi->param('a'); -my $hash = $cgi->param('h'); -my $hash_parent = $cgi->param('hp'); -my $file_name = $cgi->param('f'); -my $time_back = $cgi->param('t'); -$ENV{'SHA1_FILE_DIRECTORY'} = "$projectroot/$project/objects"; - -# validate input if (defined($project)) { if ($project =~ /(^|\/)(|\.|\.\.)($|\/)/) { + $project = ""; die_error("", "Invalid project parameter."); } if (!(-d "$projectroot/$project")) { + $project = ""; die_error("", "No such project."); } + $rss_link = ""; } + +my $file_name = $cgi->param('f'); if (defined($file_name) && $file_name =~ /(^|\/)(|\.|\.\.)($|\/)/) { + $file_name = ""; die_error("", "Invalid file parameter."); } -if (defined($action) && !$action =~ m/^[0-9a-zA-Z\.\-]+$/) { + +my $action = $cgi->param('a'); +if (defined($action) && $action =~ m/[^0-9a-zA-Z\.\-]+$/) { + $action = ""; die_error("", "Invalid action parameter."); } + +my $hash = $cgi->param('h'); if (defined($hash) && !($hash =~ m/^[0-9a-fA-F]{40}$/)) { + $hash = ""; die_error("", "Invalid hash parameter."); } + +my $hash_parent = $cgi->param('hp'); if (defined($hash_parent) && !($hash_parent =~ m/^[0-9a-fA-F]{40}$/)) { + $hash_parent = ""; die_error("", "Invalid parent hash parameter."); } + +my $time_back = $cgi->param('t'); if (defined($time_back) && !($time_back =~ m/^[0-9]+$/)) { + $time_back = ""; die_error("", "Invalid time parameter."); } +$ENV{'SHA1_FILE_DIRECTORY'} = "$projectroot/$project/objects"; +mkdir($gittmp, 0700); + sub git_header_html { my $status = shift || "200 OK"; print $cgi->header(-type=>'text/html', -charset => 'utf-8', -status=> $status); print < + - git - $project $action - - +git - $project +$rss_link + EOF @@ -140,13 +149,18 @@ EOF } sub git_footer_html { - print "
"; - print "
version $version
"; - if ($project ne '') { + print "
\n"; + if ($project ne "") { + if (-e "$projectroot/$project/description") { + open(my $fd, "$projectroot/$project/description"); + my $descr = <$fd>; + print "
" . escapeHTML($descr) . "
\n"; + close $fd; + } print $cgi->a({-href => "$my_uri?p=$project;a=rss", -class => "xml_logo"}, "XML") . "\n"; } - print "
" . - "" . + print "
\n" . + "\n" . ""; } @@ -154,12 +168,10 @@ sub die_error { my $status = shift || "403 Forbidden"; my $error = shift || "Malformed query, file missing or permission denied"; - $project = ""; - $action = ""; git_header_html($status); print "
\n" . "

\n"; - print "$error\n"; + print "$status - $error\n"; print "
\n"; git_footer_html(); exit 0; @@ -167,7 +179,7 @@ sub die_error { sub git_head { my $path = shift; - open(my $fd, "$projectroot/$path/HEAD") || die_error("", "Invalid project directory.");; + open(my $fd, "$projectroot/$path/HEAD") || die_error("", "Invalid project directory."); my $head = <$fd>; close $fd; chomp $head; @@ -403,10 +415,11 @@ if ($action eq "blob") { my %co = git_commit($hash); if (defined(%co)) { print "
view\n" . - $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash"}, "commit") . " | \n" . - $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash"}, "diffs") . " | \n" . - $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$hash"}, "tree") . "\n" . - "

\n"; + $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash"}, "commit") . " | " . + $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash"}, "diffs") . " | " . + $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$hash"}, "tree") . + "

\n" . + "\n"; print "
\n" . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash", -class => "title"}, escapeHTML($co{'title'})) . "\n" . "
\n"; @@ -442,10 +455,10 @@ if ($action eq "blob") { git_header_html(); print "
\n"; print "view "; - print $cgi->a({-href => "$my_uri?p=$project;a=log"}, "last day") . " | \n" . - $cgi->a({-href => "$my_uri?p=$project;a=log;t=7"}, "week") . " | \n" . - $cgi->a({-href => "$my_uri?p=$project;a=log;t=31"}, "month") . " | \n" . - $cgi->a({-href => "$my_uri?p=$project;a=log;t=365"}, "year") . " | \n" . + print $cgi->a({-href => "$my_uri?p=$project;a=log"}, "last day") . " | " . + $cgi->a({-href => "$my_uri?p=$project;a=log;t=7"}, "week") . " | " . + $cgi->a({-href => "$my_uri?p=$project;a=log;t=31"}, "month") . " | " . + $cgi->a({-href => "$my_uri?p=$project;a=log;t=365"}, "year") . " | " . $cgi->a({-href => "$my_uri?p=$project;a=log;t=0"}, "all") . "
\n"; print "

\n" . "
\n"; @@ -475,7 +488,7 @@ if ($action eq "blob") { $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit", -class => "title"}, "" . $co{'age_string'} . "" . escapeHTML($co{'title'})) . "\n" . "\n"; - print "
\n" . + print "
\n" . "
\n" . "view " . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit"}, "commit") . " | " . $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$commit"}, "diff") . "
\n" . @@ -516,10 +529,18 @@ if ($action eq "blob") { } my %ad = date_str($co{'author_epoch'}, $co{'author_tz'}); my %cd = date_str($co{'committer_epoch'}, $co{'committer_tz'}); - open my $fd, "-|", "$gitbin/diff-tree -r " . $co{'parent'} . " $hash"; - my (@difftree) = map { chomp; $_ } <$fd>; - close $fd; + my @difftree; + if (defined($co{'parent'})) { + open my $fd, "-|", "$gitbin/diff-tree -r " . $co{'parent'} . " $hash"; + @difftree = map { chomp; $_ } <$fd>; + close $fd; + } else { + # fake git-diff-tree output for initial revision + open my $fd, "-|", "$gitbin/ls-tree -r $hash"; + @difftree = map { chomp; "+" . $_ } <$fd>; + close $fd; + } git_header_html(); print "
view\n" . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash"}, "commit") . " | \n" . @@ -529,7 +550,7 @@ if ($action eq "blob") { print "
\n" . $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash", -class => "title"}, escapeHTML($co{'title'})) . "\n" . "
\n"; - print "
\n" . + print "
\n" . ""; print "
author" . escapeHTML($co{'author'}) . "
" . " " . $ad{'rfc2822'}; @@ -562,6 +583,9 @@ if ($action eq "blob") { } } print "\n"; + if ($#difftree > 10) { + print "
" . ($#difftree + 1) . " files changed:
\n"; + } foreach my $line (@difftree) { # '*100644->100644 blob 9f91a116d91926df3ba936a80f020a6ab1084d2b->bb90a0c3a91eb52020d0db0e8b4f94d30e02d596 net/ipv4/route.c' # '+100644 blob 4a83ab6cd565d21ab0385bac6643826b83c2fcd4 arch/arm/lib/bitops.h' @@ -582,7 +606,7 @@ if ($action eq "blob") { ""; print "
\n" . "view " . - $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id"}, "file") . "

\n" . + $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id"}, "file") . "
\n" . "
\n"; } elsif ($op eq "-") { print "
\n" . @@ -592,7 +616,7 @@ if ($action eq "blob") { print "
\n" . "view " . $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id"}, "file") . " | " . - $cgi->a({-href => "$my_uri?p=$project;a=history;h=$hash;f=$file"}, "history") . "

\n" . + $cgi->a({-href => "$my_uri?p=$project;a=history;h=$hash;f=$file"}, "history") . "
\n" . "
\n"; } elsif ($op eq "*") { $id =~ m/([0-9a-fA-F]+)->([0-9a-fA-F]+)/; @@ -621,7 +645,7 @@ if ($action eq "blob") { print $cgi->a({-href => "$my_uri?p=$project;a=blobdiff;h=$to_id;hp=$from_id"}, "diff") . " | "; } print $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$to_id"}, "file") . " | " . - $cgi->a({-href => "$my_uri?p=$project;a=history;h=$hash;f=$file"}, "history") . "

\n" . + $cgi->a({-href => "$my_uri?p=$project;a=history;h=$hash;f=$file"}, "history") . "
\n" . "
\n"; } } @@ -728,5 +752,6 @@ if ($action eq "blob") { } git_footer_html(); } else { + $action = ""; die_error("", "Unknown action."); }