===================================================================
RCS file: /cvs/cvsweb/cvsweb.cgi,v
retrieving revision 1.1.1.16
retrieving revision 1.1.1.19
diff -u -p -r1.1.1.16 -r1.1.1.19
--- cvsweb/cvsweb.cgi 2000/12/28 18:37:25 1.1.1.16
+++ cvsweb/cvsweb.cgi 2001/01/02 12:41:38 1.1.1.19
@@ -1,4 +1,4 @@
-#!/usr/bin/perl5 -ws
+#!/usr/bin/perl -wT
#
# cvsweb - a CGI interface to CVS trees.
#
@@ -43,10 +43,12 @@
# SUCH DAMAGE.
#
# $zId: cvsweb.cgi,v 1.104 2000/11/01 22:05:12 hnordstrom Exp $
-# $kId: cvsweb.cgi,v 1.47 2000/12/28 18:07:20 knu Exp $
+# $kId: cvsweb.cgi,v 1.55 2001/01/02 12:23:20 knu Exp $
#
###
+require 5.000;
+
use strict;
use vars qw (
@@ -56,7 +58,7 @@ use vars qw (
%alltags @tabcolors %fileinfo %tags @branchnames %nameprinted
%symrev %revsym @allrevisions %date %author @revdisplayorder
@revisions %state %difflines %log %branchpoint @revorder
- $prcgi @prcategories $prcategories $mancgi
+ $prcgi @prcategories $re_prcategories $prkeyword $re_prkeyword $mancgi
$checkoutMagic $doCheckout $scriptname $scriptwhere
$where $pathinfo $Browser $nofilelinks $maycompress @stickyvars
%funcline_regexp $is_mod_perl
@@ -75,11 +77,11 @@ use vars qw (
$difffontsize $inputTextSize $mime_types $allow_annotate
$allow_markup $use_java_script $open_extern_window
$extern_window_width $extern_window_height $edit_option_form
- $show_subdir_lastmod $show_log_in_markup $v
+ $show_subdir_lastmod $show_log_in_markup $preformat_in_markup $v
$navigationHeaderColor $tableBorderColor $markupLogColor
$tabstop $state $annTable $sel $curbranch @HideModules
$module $use_descriptions %descriptions @mytz $dwhere $moddate
- $use_moddate $has_zlib $gzip_open $allow_tar
+ $use_moddate $has_zlib $gzip_open $allow_tar @tar_options @cvs_options
$LOG_FILESEPARATOR $LOG_REVSEPARATOR
);
@@ -122,6 +124,7 @@ sub toggleQuery($$);
sub urlencode($);
sub htmlquote($);
sub htmlunquote($);
+sub hrefquote($);
sub http_header(;$);
sub html_header($);
sub html_footer();
@@ -129,16 +132,18 @@ sub link_tags($);
sub forbidden_module($);
##### Start of Configuration Area ########
-use Cwd;
+use File::Basename;
# == EDIT this ==
# Locations to search for user configuration, in order:
for (
- $ENV{CVSWEB_CONFIG},
- '/usr/local/etc/cvsweb.conf',
- getcwd() . '/cvsweb.conf'
+ (dirname $0) . '/cvsweb.conf',
+ '/usr/local/etc/cvsweb.conf'
) {
- $config = $_ if defined($_) && -r $_;
+ if (defined($_) && -r $_) {
+ ($config) = /(.*)/; # untaint
+ last;
+ }
}
# == Configuration defaults ==
@@ -278,7 +283,7 @@ $maycompress = (((defined($ENV{HTTP_ACCEPT_ENCODING})
@stickyvars = qw(cvsroot hideattic sortby logsort f only_with_tag);
if (-f $config) {
- do $config
+ require $config
|| &fatal("500 Internal Error",
sprintf('Error in loading configuration file: %s
%s
',
$config, &htmlify($@)));
@@ -418,17 +423,18 @@ my $config_cvstree = "$config-$cvstree";
# Do some special configuration for cvstrees
if (-f $config_cvstree) {
- do $config_cvstree
+ require $config_cvstree
|| &fatal("500 Internal Error",
sprintf('Error in loading configuration file: %s
%s
',
$config_cvstree, &htmlify($@)));
}
undef $config_cvstree;
-$prcategories = '(?:' . join('|', @prcategories) . ')';
+$re_prcategories = '(?:' . join('|', @prcategories) . ')' if @prcategories;
+$re_prkeyword = quotemeta($prkeyword) if defined($prkeyword);
$prcgi .= '%s' if defined($prcgi) && $prcgi !~ /%s/;
-$fullname = $cvsroot . '/' . $where;
+$fullname = "$cvsroot/$where";
$mimetype = &getMimeTypeFromSuffix ($fullname);
$defaultTextPlain = ($mimetype eq "text/plain");
$defaultViewable = $allow_markup && viewable($mimetype);
@@ -480,11 +486,11 @@ if ($module && &forbidden_module($module)) {
if ($input{tarball}) {
&fatal("403 Forbidden", "Downloading tarballs is prohibited.")
unless $allow_tar;
- $where =~ s,/[^/]*$,,;
- $where =~ s,^/,,;
- my($basedir) = ($where =~ m,([^/]+)$,);
+ my($module) = ($where =~ m,^/?(.*),); # untaint
+ $module =~ s,/[^/]*$,,;
+ my($basedir) = ($module =~ m,([^/]+)$,);
- if ($basedir eq '' || $where eq '') {
+ if ($basedir eq '' || $module eq '') {
&fatal("500 Internal Error", "You cannot download the top level directory.");
}
@@ -495,34 +501,24 @@ if ($input{tarball}) {
my $fatal = '';
- do {
- chdir $tmpdir
- or $fatal = "500 Internal Error", "Unable to cd to temporary directory: $!"
- && last;
+ while (1) {
+ my $tag = (exists $input{only_with_tag} && length $input{only_with_tag})
+ ? $input{only_with_tag} : "HEAD";
- my @params = (exists $input{only_with_tag} && length $input{only_with_tag})
- ? ("-r", $input{only_with_tag}) : ();
-
- system "cvs", "-RlQd", $cvsroot, "co", @params, $where
- and $fatal = "500 Internal Error","cvs co failure: $!: $where"
+ system "cvs", @cvs_options, "-Qd", $cvsroot, "export", "-r", $tag, "-d", "$tmpdir/$basedir", $module
+ and $fatal = "500 Internal Error","cvs co failure: $!: $module"
&& last;
- chdir "$where/.."
- or $fatal = "500 Internal Error","Cannot find expected directory in checkout"
- && last;
-
$| = 1; # Essential to get the buffering right.
print "Content-type: application/x-gzip\r\n\r\n";
- system "tar", "--ignore-failed-read", "--exclude", "CVS", "-zcf", "-", $basedir
+ system "tar", @tar_options, "-zcf", "-", "-C", $tmpdir, $basedir
and $fatal = "500 Internal Error","tar zc failure: $!: $basedir"
&& last;
- chdir $tmpdir
- or $fatal = "500 Internal Error","Unable to cd to temporary directory: $!"
- && last;
- } while (0);
+ last;
+ }
system "rm", "-rf", $tmpdir if -d $tmpdir;
@@ -1112,7 +1108,7 @@ sub htmlify($;$) {
if ($extra) {
# get PR #'s as link: "PR#nnnn" "PR: nnnn, ..." "PR nnnn, ..." "bin/nnnn"
- if (defined($prcgi)) {
+ if (defined($prcgi) && defined($re_prcategories) && defined($re_prkeyword)) {
my $prev;
do {
@@ -1120,7 +1116,7 @@ sub htmlify($;$) {
$_ = htmlify_sub {
s{
- (\bPR[:\#]?\s*
+ (\b$re_prkeyword[:\#]?\s*
(?:
\#?
\d+[,\s]\s*
@@ -1135,7 +1131,7 @@ sub htmlify($;$) {
$_ = htmlify_sub {
s{
- (\b$prcategories/(\d+)\b)
+ (\b$re_prcategories/(\d+)\b)
}{
&link($1, sprintf($prcgi, $2))
}egox;
@@ -1146,7 +1142,7 @@ sub htmlify($;$) {
if (defined($mancgi)) {
$_ = htmlify_sub {
s{
- (\b([a-zA-Z][\w_.]+)
+ (\b([a-zA-Z][\w.]+)
(?:
\( ([0-9n]) \)\B
|
@@ -1154,7 +1150,7 @@ sub htmlify($;$) {
)
)
}{
- &link($1, sprintf($mancgi, $3 ne '' ? $3 : $4, $2))
+ &link($1, sprintf($mancgi, defined($3) ? $3 : $4, $2))
}egx;
} $_;
}
@@ -1370,8 +1366,8 @@ sub doAnnotate($$) {
# the public domain.
# we could abandon the use of rlog, rcsdiff and co using
# the cvsserver in a similiar way one day (..after rewrite)
- $pid = open2($reader, $writer, "cvs -Rl server") || fatal ("500 Internal Error",
- "Fatal Error - unable to open cvs for annotation");
+ $pid = open2($reader, $writer, "cvs", @cvs_options, "server")
+ || fatal ("500 Internal Error", "Fatal Error - unable to open cvs for annotation");
# OK, first send the request to the server. A simplified example is:
# Root /home/kingdon/zwork/cvsroot
@@ -1563,7 +1559,7 @@ sub doCheckout($$) {
# Safely for a child process to read from.
if (! open($fh, "-|")) { # child
open(STDERR, ">&STDOUT"); # Redirect stderr to stdout
- exec("cvs", "-Rld", $cvsroot, "co", "-p", $revopt, $where);
+ exec("cvs", @cvs_options, "-d", $cvsroot, "co", "-p", $revopt, $where);
}
if (eof($fh)) {
@@ -1645,7 +1641,7 @@ sub cvswebMarkup($$$) {
elsif ($mimetype =~ m%^application/pdf%) {
printf '