X-Git-Url: https://git.ladys.computer/Gitweb/blobdiff_plain/45bbc47978e07b451c3111461dd3171d48b2ae7dda94cbc2ec5540542886be32..66484a60cd6cb1834fe812da8eea5d5a63f88342e9b8a54995a74be6f5a787ad:/gitweb.cgi diff --git a/gitweb.cgi b/gitweb.cgi index 657cba6..64ccc6a 100755 --- a/gitweb.cgi +++ b/gitweb.cgi @@ -15,14 +15,14 @@ use CGI::Carp qw(fatalsToBrowser); use Fcntl ':mode'; my $cgi = new CGI; -my $version = "237"; +my $version = "245"; my $my_url = $cgi->url(); my $my_uri = $cgi->url(-absolute => 1); my $rss_link = ""; # absolute fs-path which will be prepended to the project path -my $projectroot = "/pub/scm"; -$projectroot = "/home/kay/public_html/pub/scm"; +#my $projectroot = "/pub/scm"; +my $projectroot = "/home/kay/public_html/pub/scm"; # location of the git-core binaries my $gitbin = "/usr/bin"; @@ -43,7 +43,7 @@ my $projects_list = "index/index.aux"; # input validation and dispatch my $action = $cgi->param('a'); if (defined $action) { - if ($action =~ m/[^0-9a-zA-Z\.\-_]+/) { + if ($action =~ m/[^0-9a-zA-Z\.\-_]/) { undef $action; die_error(undef, "Invalid action parameter."); } @@ -56,15 +56,19 @@ if (defined $action) { } } +my $order = $cgi->param('o'); +if (defined $order) { + if ($order =~ m/[^0-9a-zA-Z_]/) { + undef $order; + die_error(undef, "Invalid order parameter."); + } +} + my $project = $cgi->param('p'); if (defined $project) { - if ($project =~ m/(^|\/)(|\.|\.\.)($|\/)/) { - undef $project; - die_error(undef, "Non-canonical project parameter."); - } - if ($project =~ m/[^a-zA-Z0-9_\.\/\-\+\#\~]/) { - undef $project; - die_error(undef, "Invalid character in project parameter."); + $project = validate_input($project); + if (!defined($project)) { + die_error(undef, "Invalid project parameter."); } if (!(-d "$projectroot/$project")) { undef $project; @@ -83,54 +87,39 @@ if (defined $project) { my $file_name = $cgi->param('f'); if (defined $file_name) { - if ($file_name =~ m/(^|\/)(|\.|\.\.)($|\/)/) { - undef $file_name; - die_error(undef, "Non-canonical file parameter."); - } - if ($file_name =~ m/[^a-zA-Z0-9_\.\/\-\+\#\~\:\!]/) { - undef $file_name; - die_error(undef, "Invalid character in file parameter."); + $file_name = validate_input($file_name); + if (!defined($file_name)) { + die_error(undef, "Invalid file parameter."); } } my $hash = $cgi->param('h'); if (defined $hash) { - if (!($hash =~ m/^[0-9a-fA-F]{40}$/)) { - if ($hash =~ m/(^|\/)(|\.|\.\.)($|\/)/) { - undef $hash; - die_error(undef, "Non-canonical hash parameter."); - } - if ($hash =~ m/[^a-zA-Z0-9_\.\/\-\+\#\~\:\!]/) { - undef $hash; - die_error(undef, "Invalid character in hash parameter."); - } - # replace branch-name with hash - my $branchlist = git_read_refs("refs/heads"); - foreach my $entry (@$branchlist) { - my %branch = %$entry; - if ($branch{'name'} eq $hash) { - $hash = $branch{'id'}; - last; - } - } + $hash = validate_input($hash); + if (!defined($hash)) { + die_error(undef, "Invalid hash parameter."); } } my $hash_parent = $cgi->param('hp'); -if (defined $hash_parent && !($hash_parent =~ m/^[0-9a-fA-F]{40}$/)) { - undef $hash_parent; - die_error(undef, "Invalid hash_parent parameter."); +if (defined $hash_parent) { + $hash_parent = validate_input($hash_parent); + if (!defined($hash_parent)) { + die_error(undef, "Invalid hash parent parameter."); + } } my $hash_base = $cgi->param('hb'); -if (defined $hash_base && !($hash_base =~ m/^[0-9a-fA-F]{40}$/)) { - undef $hash_base; - die_error(undef, "Invalid parent hash parameter."); +if (defined $hash_base) { + $hash_base = validate_input($hash_base); + if (!defined($hash_base)) { + die_error(undef, "Invalid hash base parameter."); + } } my $page = $cgi->param('pg'); if (defined $page) { - if ($page =~ m/^[^0-9]+$/) { + if ($page =~ m/[^0-9]$/) { undef $page; die_error(undef, "Invalid page parameter."); } @@ -145,6 +134,21 @@ if (defined $searchtext) { $searchtext = quotemeta $searchtext; } +sub validate_input { + my $input = shift; + + if ($input =~ m/^[0-9a-fA-F]{40}$/) { + return $input; + } + if ($input =~ m/(^|\/)(|\.|\.\.)($|\/)/) { + return undef; + } + if ($input =~ m/[^a-zA-Z0-9_\.\/\-\+\#\~]/) { + return undef; + } + return $input; +} + if (!defined $action || $action eq "summary") { git_summary(); exit; @@ -228,7 +232,7 @@ body { font-family: sans-serif; font-size: 12px; margin:0px; border:solid #d9d8d a { color:#0000cc; } a:hover, a:visited, a:active { color:#880000; } div.page_header { height:25px; padding:8px; font-size:18px; font-weight:bold; background-color:#d9d8d1; } -div.page_header a:visited { color:#0000cc; } +div.page_header a:visited, a.header { color:#0000cc; } div.page_header a:hover { color:#880000; } div.page_nav { padding:8px; } div.page_nav a:visited { color:#0000cc; } @@ -314,7 +318,7 @@ sub git_footer_html { } print $cgi->a({-href => "$my_uri?p=$project;a=rss", -class => "rss_logo"}, "RSS") . "\n"; } else { - print $cgi->a({-href => "$my_uri?a=opml", -class => "rss_logo"}, "RSS") . "\n"; + print $cgi->a({-href => "$my_uri?a=opml", -class => "rss_logo"}, "OPML") . "\n"; } print "\n" . "\n" . @@ -439,21 +443,28 @@ sub git_read_commit { my @commit_lines; my %co; - my @parents; if (defined $commit_text) { @commit_lines = @$commit_text; } else { - open my $fd, "-|", "$gitbin/git-cat-file commit $commit_id" or return; - @commit_lines = map { chomp; $_ } <$fd>; + $/ = "\0"; + open my $fd, "-|", "$gitbin/git-rev-list --header --parents --max-count=1 $commit_id" or return; + @commit_lines = split '\n', <$fd>; close $fd or return; + $/ = "\n"; + pop @commit_lines; + } + my $header = shift @commit_lines; + if (!($header =~ m/^[0-9a-fA-F]{40}/)) { + return; } + ($co{'id'}, my @parents) = split ' ', $header; + $co{'parents'} = \@parents; + $co{'parent'} = $parents[0]; while (my $line = shift @commit_lines) { last if $line eq "\n"; if ($line =~ m/^tree ([0-9a-fA-F]{40})$/) { $co{'tree'} = $1; - } elsif ($line =~ m/^parent ([0-9a-fA-F]{40})$/) { - push @parents, $1; } elsif ($line =~ m/^author (.*) ([0-9]+) (.*)$/) { $co{'author'} = $1; $co{'author_epoch'} = $2; @@ -472,15 +483,12 @@ sub git_read_commit { } } if (!defined $co{'tree'}) { - return undef + return; }; - $co{'id'} = $commit_id; - $co{'parents'} = \@parents; - $co{'parent'} = $parents[0]; - $co{'comment'} = \@commit_lines; + foreach my $title (@commit_lines) { if ($title ne "") { - $co{'title'} = chop_str($title, 80); + $co{'title'} = chop_str($title, 80, 5); # remove leading stuff of merges to make the interesting part visible if (length($title) > 50) { $title =~ s/^Automatic //; @@ -498,10 +506,15 @@ sub git_read_commit { $title =~ s/\/pub\/scm//; } } - $co{'title_short'} = chop_str($title, 50); + $co{'title_short'} = chop_str($title, 50, 5); last; } } + # remove added spaces + foreach my $line (@commit_lines) { + $line =~ s/^ //; + } + $co{'comment'} = \@commit_lines; my $age = time - $co{'committer_epoch'}; $co{'age'} = $age; @@ -613,12 +626,15 @@ sub chop_str { my $len = shift; my $add_len = shift || 10; - $str =~ m/^(.{0,$len}[^ \/\-_:\.@]{0,$add_len})/; - my $chopped = $1; - if ($chopped ne $str) { - $chopped .= " ..."; + # allow only $len chars, but don't cut a word if it would fit in $add_len + # if it doesn't fit, cut it if it's still longer than the dots we would add + $str =~ m/^(.{0,$len}[^ \/\-_:\.@]{0,$add_len})(.*)/; + my $body = $1; + my $tail = $2; + if (length($tail) > 4) { + $tail = " ..."; } - return $chopped; + return "$body$tail"; } sub file_type { @@ -753,9 +769,30 @@ sub git_read_projects { sub git_project_list { my @list = git_read_projects(); + my @projects; if (!@list) { die_error(undef, "No project found."); } + foreach my $pr (@list) { + my $head = git_read_hash("$pr->{'path'}/HEAD"); + if (!defined $head) { + next; + } + $ENV{'GIT_DIR'} = "$projectroot/$pr->{'path'}"; + my %co = git_read_commit($head); + if (!%co) { + next; + } + $pr->{'commit'} = \%co; + if (!defined $pr->{'descr'}) { + my $descr = git_read_description($pr->{'path'}) || ""; + $pr->{'descr'} = chop_str($descr, 25, 5); + } + if (!defined $pr->{'owner'}) { + $pr->{'owner'} = get_file_owner("$projectroot/$pr->{'path'}") || ""; + } + push @projects, $pr; + } git_header_html(); if (-f $home_text) { print "
\n"; @@ -765,53 +802,57 @@ sub git_project_list { print "
\n"; } print "\n" . - "\n" . - "\n" . - "\n" . - "\n" . - "\n" . - "\n" . + "\n"; + if (!defined($order) || (defined($order) && ($order eq "project"))) { + @projects = sort {$a->{'path'} cmp $b->{'path'}} @projects; + print "\n"; + } else { + print "\n"; + } + if (defined($order) && ($order eq "descr")) { + @projects = sort {$a->{'descr'} cmp $b->{'descr'}} @projects; + print "\n"; + } else { + print "\n"; + } + if (defined($order) && ($order eq "owner")) { + @projects = sort {$a->{'owner'} cmp $b->{'owner'}} @projects; + print "\n"; + } else { + print "\n"; + } + if (defined($order) && ($order eq "age")) { + @projects = sort {$a->{'commit'}{'age'} <=> $b->{'commit'}{'age'}} @projects; + print "\n"; + } else { + print "\n"; + } + print "\n" . "\n"; my $alternate = 0; - foreach my $pr (@list) { - my %proj = %$pr; - my $head = git_read_hash("$proj{'path'}/HEAD"); - if (!defined $head) { - next; - } - $ENV{'GIT_DIR'} = "$projectroot/$proj{'path'}"; - my %co = git_read_commit($head); - if (!%co) { - next; - } - my $descr = git_read_description($proj{'path'}) || ""; - $descr = chop_str($descr, 25, 5); - # get directory owner if not already specified - if (!defined $proj{'owner'}) { - $proj{'owner'} = get_file_owner("$projectroot/$proj{'path'}") || ""; - } + foreach my $pr (@projects) { if ($alternate) { print "\n"; } else { print "\n"; } $alternate ^= 1; - print "\n" . - "\n" . - "\n"; + print "\n" . + "\n" . + "\n"; my $colored_age; - if ($co{'age'} < 60*60*2) { - $colored_age = "$co{'age_string'}"; - } elsif ($co{'age'} < 60*60*24*2) { - $colored_age = "$co{'age_string'}"; + if ($pr->{'commit'}{'age'} < 60*60*2) { + $colored_age = "$pr->{'commit'}{'age_string'}"; + } elsif ($pr->{'commit'}{'age'} < 60*60*24*2) { + $colored_age = "$pr->{'commit'}{'age_string'}"; } else { - $colored_age = "$co{'age_string'}"; + $colored_age = "$pr->{'commit'}{'age_string'}"; } print "\n" . "\n" . "\n"; } @@ -944,10 +985,15 @@ sub git_summary { if ($i-- > 0) { print "\n" . "\n" . - "\n" . + "\n" . "\n"; print "\n"; print "\n"; - print "\n"; + print "\n"; print "" . "" . "\n" . + $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$to_id;hb=$hash;f=$file", -class => "list"}, escapeHTML($file)) . "\n" . "\n" . "\n"; } elsif ($status eq "D") { @@ -2018,7 +2081,7 @@ sub git_search { my $alternate = 0; if ($commit_search) { $/ = "\0"; - open my $fd, "-|", "$gitbin/git-rev-list --header $hash"; + open my $fd, "-|", "$gitbin/git-rev-list --header --parents $hash" or next; while (my $commit_text = <$fd>) { if (!grep m/$searchtext/i, $commit_text) { next; @@ -2030,8 +2093,7 @@ sub git_search { next; } my @commit_lines = split "\n", $commit_text; - my $commit = shift @commit_lines; - my %co = git_read_commit($commit, \@commit_lines); + my %co = git_read_commit(undef, \@commit_lines); if (!%co) { next; } @@ -2044,7 +2106,7 @@ sub git_search { print "\n" . "\n" . "\n" . "\n" . "\n"; } @@ -2086,7 +2148,7 @@ sub git_search { next; } push @files, \%set; - } elsif ($line =~ m/^([0-9a-fA-F]{40}) /){ + } elsif ($line =~ m/^([0-9a-fA-F]{40})$/){ if (%co) { if ($alternate) { print "\n"; @@ -2179,8 +2241,15 @@ sub git_shortlog { $alternate ^= 1; print "\n" . "\n" . - "\n" . + "\n" . "
ProjectDescriptionOwnerlast change
Project" . $cgi->a({-class => "header", -href => "$my_uri?o=project"}, "Project") . "Description" . $cgi->a({-class => "header", -href => "$my_uri?o=descr"}, "Description") . "Owner" . $cgi->a({-class => "header", -href => "$my_uri?o=owner"}, "Owner") . "Last Change" . $cgi->a({-class => "header", -href => "$my_uri?o=age"}, "Last Change") . "
" . $cgi->a({-href => "$my_uri?p=$proj{'path'};a=summary", -class => "list"}, escapeHTML($proj{'path'})) . "$descr" . chop_str($proj{'owner'}, 15) . "" . $cgi->a({-href => "$my_uri?p=$pr->{'path'};a=summary", -class => "list"}, escapeHTML($pr->{'path'})) . "$pr->{'descr'}" . chop_str($pr->{'owner'}, 15) . "$colored_age" . - $cgi->a({-href => "$my_uri?p=$proj{'path'};a=summary"}, "summary") . - " | " . $cgi->a({-href => "$my_uri?p=$proj{'path'};a=shortlog"}, "shortlog") . - " | " . $cgi->a({-href => "$my_uri?p=$proj{'path'};a=log"}, "log") . + $cgi->a({-href => "$my_uri?p=$pr->{'path'};a=summary"}, "summary") . + " | " . $cgi->a({-href => "$my_uri?p=$pr->{'path'};a=shortlog"}, "shortlog") . + " | " . $cgi->a({-href => "$my_uri?p=$pr->{'path'};a=log"}, "log") . "
$co{'age_string'}" . escapeHTML(chop_str($co{'author_name'}, 10)) . "" . - $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit", -class => "list"}, - "" . escapeHTML($co{'title_short'}) . "") . - ""; + if (length($co{'title_short'}) < length($co{'title'})) { + print $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit", -class => "list", -title => "$co{'title'}"}, + "" . escapeHTML($co{'title_short'}) . ""); + } else { + print $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit", -class => "list"}, + "" . escapeHTML($co{'title'}) . ""); + } + print "" . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit"}, "commit") . " | " . $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$commit"}, "commitdiff") . @@ -1364,10 +1410,9 @@ sub git_tree { sub git_rss { # http://www.notestips.com/80256B3A007F2692/1/NAMO5P9UPQ - open my $fd, "-|", "$gitbin/git-rev-list --max-count=20 " . git_read_hash("$project/HEAD") or die_error(undef, "Open failed."); + open my $fd, "-|", "$gitbin/git-rev-list --max-count=150 " . git_read_hash("$project/HEAD") or die_error(undef, "Open failed."); my (@revlist) = map { chomp; $_ } <$fd>; close $fd or die_error(undef, "Reading rev-list failed."); - print $cgi->header(-type => 'text/xml', -charset => 'utf-8'); print "\n". "\n"; @@ -1377,14 +1422,24 @@ sub git_rss { "$project log\n". "en\n"; - foreach my $commit (@revlist) { + for (my $i = 0; $i <= $#revlist; $i++) { + my $commit = $revlist[$i]; my %co = git_read_commit($commit); + # we read 150, we always show 30 and the ones more recent than 48 hours + if (($i >= 20) && ((time - $co{'committer_epoch'}) > 48*60*60)) { + last; + } my %cd = date_str($co{'committer_epoch'}); + open $fd, "-|", "$gitbin/git-diff-tree -r $co{'parent'} $co{'id'}" or next; + my @difftree = map { chomp; $_ } <$fd>; + close $fd or next; print "\n" . "" . sprintf("%d %s %02d:%02d", $cd{'mday'}, $cd{'month'}, $cd{'hour'}, $cd{'minute'}) . " - " . escapeHTML($co{'title'}) . "\n" . + "" . escapeHTML($co{'author'}) . "\n" . "$cd{'rfc2822'}\n" . + "" . escapeHTML("$my_url?p=$project;a=commit;h=$commit") . "\n" . "" . escapeHTML("$my_url?p=$project;a=commit;h=$commit") . "\n" . "" . escapeHTML($co{'title'}) . "\n" . "" . @@ -1393,6 +1448,14 @@ sub git_rss { foreach my $line (@$comment) { print "$line
\n"; } + print "
\n"; + foreach my $line (@difftree) { + if (!($line =~ m/^:([0-7]{6}) ([0-7]{6}) ([0-9a-fA-F]{40}) ([0-9a-fA-F]{40}) (.)([0-9]{0,3})\t(.*)$/)) { + next; + } + my $file = $7; + print "$file
\n"; + } print "]]>\n" . "\n" . "\n"; @@ -1576,7 +1639,7 @@ sub git_commit { "
committer" . escapeHTML($co{'committer'}) . "
$cd{'rfc2822'}" . sprintf(" (%02d:%02d %s)", $cd{'hour_local'}, $cd{'minute_local'}, $cd{'tz_local'}) . "
commit$hash
commit$co{'id'}
tree" . @@ -1653,7 +1716,7 @@ sub git_commit { $mode_chng = sprintf(" with mode: %04o", (oct $to_mode) & 0777); } print "" . - $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$to_id;hp=$hash;f=$file", -class => "list"}, escapeHTML($file)) . "[new " . file_type($to_mode) . "$mode_chng]" . $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$to_id;hb=$hash;f=$file"}, "blob") . "$co{'age_string_date'}" . escapeHTML(chop_str($co{'author_name'}, 15, 5)) . "" . - $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit", -class => "list"}, "" . escapeHTML(chop_str($co{'title'}, 50)) . "
"); + $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$co{'id'}", -class => "list"}, "" . escapeHTML(chop_str($co{'title'}, 50)) . "
"); my $comment = $co{'comment'}; foreach my $line (@$comment) { if ($line =~ m/^(.*)($searchtext)(.*)$/i) { @@ -2059,8 +2121,8 @@ sub git_search { } print "		" . - $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit"}, "commit") . - " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$commit"}, "tree"); + $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$co{'id'}"}, "commit") . + " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$co{'id'}"}, "tree"); print "
$co{'age_string_date'}" . escapeHTML(chop_str($co{'author_name'}, 10)) . "" . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit", -class => "list"}, "" . - escapeHTML($co{'title_short'}) . "") . ""; + if (length($co{'title_short'}) < length($co{'title'})) { + print $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit", -class => "list", -title => "$co{'title'}"}, + "" . escapeHTML($co{'title_short'}) . ""); + } else { + print $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit", -class => "list"}, + "" . escapeHTML($co{'title_short'}) . ""); + } + print "" . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit"}, "commit") . " | " . $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$commit"}, "commitdiff") .