=================================================================== RCS file: /cvs/cvsweb/cvsweb.cgi,v retrieving revision 1.1.1.21 retrieving revision 3.36 diff -u -p -r1.1.1.21 -r3.36 --- cvsweb/cvsweb.cgi 2001/01/12 04:17:16 1.1.1.21 +++ cvsweb/cvsweb.cgi 2000/10/20 12:28:45 3.36 @@ -1,4 +1,4 @@ -#!/usr/bin/perl -wT +#!/usr/bin/perl5 -ws # # cvsweb - a CGI interface to CVS trees. # @@ -42,35 +42,30 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $zId: cvsweb.cgi,v 1.104 2000/11/01 22:05:12 hnordstrom Exp $ -# $kId: cvsweb.cgi,v 1.63 2001/01/11 23:42:01 knu Exp $ +# $zId: cvsweb.cgi,v 1.103 2000/09/20 17:02:29 jumager Exp $ +# $Id: cvsweb.cgi,v 3.36 2000/10/20 12:28:45 knu Exp $ # ### -require 5.000; - use strict; use vars qw ( - $mydir $uname $config $allow_version_select $verbose - @CVSrepositories @CVSROOT %CVSROOT %CVSROOTdescr - %MIRRORS %DEFAULTVALUE %ICONS %MTYPES - @DIFFTYPES %DIFFTYPES @LOGSORTKEYS %LOGSORTKEYS + $config $allow_version_select $verbose + %CVSROOT %CVSROOTdescr %MIRRORS %DEFAULTVALUE %ICONS %MTYPES %alltags @tabcolors %fileinfo %tags @branchnames %nameprinted %symrev %revsym @allrevisions %date %author @revdisplayorder @revisions %state %difflines %log %branchpoint @revorder - $prcgi @prcategories $re_prcategories $prkeyword $re_prkeyword $mancgi + $prcgi @prcategories $prcategories $mancgi $checkoutMagic $doCheckout $scriptname $scriptwhere $where $pathinfo $Browser $nofilelinks $maycompress @stickyvars %funcline_regexp $is_mod_perl $is_links $is_lynx $is_w3m $is_msie $is_mozilla3 $is_textbased %input $query $barequery $sortby $bydate $byrev $byauthor - $bylog $byfile $defaultDiffType $logsort $cvstree $cvsroot - $mimetype $charset $defaultTextPlain $defaultViewable - $command_path %CMD $allow_compress - $backicon $diricon $fileicon - $fullname $newname $cvstreedefault - $body_tag $body_tag_for_src $logo $defaulttitle $address + $bylog $byfile $hr_default $logsort $cvstree $cvsroot + $mimetype $defaultTextPlain $defaultViewable $allow_compress + $GZIPBIN $backicon $diricon $fileicon $fullname $newname + $cvstreedefault $body_tag $body_tag_for_src + $logo $defaulttitle $address $long_intro $short_instruction $shortLogLen $show_author $dirtable $tablepadding $columnHeaderColorDefault $columnHeaderColorSorted $hr_breakable $showfunc $hr_ignwhite @@ -79,18 +74,15 @@ 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 $preformat_in_markup $v + $show_subdir_lastmod $show_log_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 @tar_options @gzip_options @cvs_options $LOG_FILESEPARATOR $LOG_REVSEPARATOR ); sub printDiffSelect($); -sub printDiffLinks($$); -sub printLogSortSelect($); sub findLastModifiedSubdirs(@); sub htmlify_sub(&$); sub htmlify($;$); @@ -100,7 +92,6 @@ sub revcmp($$); sub fatal($$); sub redirect($); sub safeglob($); -sub search_path($); sub getMimeTypeFromSuffix($); sub head($;$); sub scan_directives(@); @@ -128,7 +119,6 @@ sub toggleQuery($$); sub urlencode($); sub htmlquote($); sub htmlunquote($); -sub hrefquote($); sub http_header(;$); sub html_header($); sub html_footer(); @@ -136,22 +126,16 @@ sub link_tags($); sub forbidden_module($); ##### Start of Configuration Area ######## -delete $ENV{PATH}; +use Cwd; -use File::Basename; - -($mydir) = (dirname($0) =~ /(.*)/); # untaint - # == EDIT this == # Locations to search for user configuration, in order: for ( - "$mydir/cvsweb.conf", - '/usr/local/etc/cvsweb/cvsweb.conf' + $ENV{CVSWEB_CONFIG}, + '/usr/local/etc/cvsweb.conf', + getcwd() . '/cvsweb.conf' ) { - if (defined($_) && -r $_) { - $config = $_; - last; - } + $config = $_ if defined($_) && -r $_; } # == Configuration defaults == @@ -163,8 +147,7 @@ $allow_version_select = 1; ######## Configuration variables ######### # These are defined to allow checking with perl -cw -@CVSrepositories = @CVSROOT = %CVSROOT = -%MIRRORS = %DEFAULTVALUE = %ICONS = %MTYPES = +%CVSROOT = %MIRRORS = %DEFAULTVALUE = %ICONS = %MTYPES = %tags = %alltags = @tabcolors = (); $cvstreedefault = $body_tag = $body_tag_for_src = $logo = $defaulttitle = $address = @@ -183,49 +166,6 @@ $tabstop = $use_moddate = $moddate = $gzip_open = unde $LOG_FILESEPARATOR = q/^={77}$/; $LOG_REVSEPARATOR = q/^-{28}$/; -@DIFFTYPES = qw(h H u c s); -@DIFFTYPES{@DIFFTYPES} = ( - { - 'descr' => 'colored', - 'opts' => [ '-u' ], - 'colored' => 1, - }, - { - 'descr' => 'long colored', - 'opts' => [ '--unified=15' ], - 'colored' => 1, - }, - { - 'descr' => 'unified', - 'opts' => [ '-u' ], - 'colored' => 0, - }, - { - 'descr' => 'context', - 'opts' => [ '-c' ], - 'colored' => 0, - }, - { - 'descr' => 'side by side', - 'opts' => [ '--side-by-side', '--width=164' ], - 'colored' => 0, - }, - ); - -@LOGSORTKEYS = qw(cvs date rev); -@LOGSORTKEYS{@LOGSORTKEYS} = ( - { - 'descr' => 'Not sorted', - }, - { - 'descr' => 'Commit date', - }, - { - 'descr' => 'Revision', - }, - ); - - ##### End of configuration variables ##### use Time::Local; @@ -242,29 +182,23 @@ $verbose = $v; $checkoutMagic = "~checkout~"; $pathinfo = defined($ENV{PATH_INFO}) ? $ENV{PATH_INFO} : ''; $where = $pathinfo; -$doCheckout = ($where =~ m|^/$checkoutMagic/|); -$where =~ s|^/$checkoutMagic/|/|; -$where =~ s|^/||; +$doCheckout = ($where =~ /^\/$checkoutMagic/); +$where =~ s|^/($checkoutMagic)?||; +$where =~ s|/+$||; $scriptname = defined($ENV{SCRIPT_NAME}) ? $ENV{SCRIPT_NAME} : ''; -$scriptname =~ s|^/*|/|; - -# Let's workaround thttpd's stupidness.. -if ($scriptname =~ m|/$|) { - $pathinfo .= '/'; - my $re = quotemeta $pathinfo; - $scriptname =~ s/$re$//; +$scriptname =~ s|^/?|/|; +$scriptname =~ s|/+$||; +$scriptwhere = $scriptname; +if ($where) { + $scriptwhere .= '/' . urlencode($where); } -$scriptwhere = $scriptname; -$scriptwhere .= '/' . urlencode($where); -$where = '/' if ($where eq ''); - $is_mod_perl = defined($ENV{MOD_PERL}); # in lynx, it it very annoying to have two links # per file, so disable the link at the icon # in this case: -$Browser = $ENV{HTTP_USER_AGENT} || ''; +$Browser = $ENV{HTTP_USER_AGENT}; $is_links = ($Browser =~ m`^Links `); $is_lynx = ($Browser =~ m`^Lynx/`i); $is_w3m = ($Browser =~ m`^w3m/`i); @@ -297,7 +231,7 @@ $maycompress = (((defined($ENV{HTTP_ACCEPT_ENCODING}) @stickyvars = qw(cvsroot hideattic sortby logsort f only_with_tag); if (-f $config) { - require $config + do $config || &fatal("500 Internal Error", sprintf('Error in loading configuration file: %s

%s
', $config, &htmlify($@))); @@ -314,7 +248,6 @@ $query = $ENV{QUERY_STRING}; if (defined($query) && $query ne '') { foreach (split(/&/, $query)) { - y/+/ /; s/%(..)/sprintf("%c", hex($1))/ge; # unquote %-quoted if (/(\S+)=(.*)/) { $input{$1} = $2 if ($2 ne ""); @@ -373,10 +306,6 @@ else { } undef @barequery; -if (defined($input{path})) { - redirect("$scriptname/$input{path}$query"); -} - # get actual parameters $sortby = $input{"sortby"}; $bydate = 0; @@ -400,26 +329,11 @@ else { $byfile = 1; } -$defaultDiffType = $input{'f'}; +$hr_default = ($input{'f'} eq 'h' || $input{'f'} eq 'H'); $logsort = $input{'logsort'}; -my @tmp = @CVSrepositories; -my @pair; -while (@pair = splice(@tmp, 0, 2)) { - my($key, $val) = @pair; - my($descr, $cvsroot) = @$val; - - next if !-d $cvsroot; - - $CVSROOTdescr{$key} = $descr; - $CVSROOT{$key} = $cvsroot; - push @CVSROOT, $key; -} -undef @tmp; -undef @pair; - ## Default CVS-Tree if (!defined($CVSROOT{$cvstreedefault})) { &fatal("500 Internal Error", @@ -444,7 +358,7 @@ foreach $k (keys %ICONS) { my ($itxt,$ipath,$iwidth,$iheight) = @{$ICONS{$k}}; if ($ipath) { ${"${k}icon"} = sprintf('%s', - hrefquote($ipath), htmlquote($itxt), $iwidth, $iheight) + htmlquote($ipath), htmlquote($itxt), $iwidth, $iheight) } else { ${"${k}icon"} = $itxt; @@ -456,45 +370,49 @@ my $config_cvstree = "$config-$cvstree"; # Do some special configuration for cvstrees if (-f $config_cvstree) { - require $config_cvstree + do $config_cvstree || &fatal("500 Internal Error", sprintf('Error in loading configuration file: %s

%s
', $config_cvstree, &htmlify($@))); } undef $config_cvstree; -$re_prcategories = '(?:' . join('|', @prcategories) . ')' if @prcategories; -$re_prkeyword = quotemeta($prkeyword) if defined($prkeyword); +$prcategories = '(?:' . join('|', @prcategories) . ')'; $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); -my $rewrite = 0; - -if ($pathinfo =~ m|//|) { - $pathinfo =~ y|/|/|s; - $rewrite = 1; +# search for GZIP if compression allowed +# We've to find out if the GZIP-binary exists .. otherwise +# ge get an Internal Server Error if we try to pipe the +# output through the nonexistent gzip .. +# any more elegant ways to prevent this are welcome! +if ($allow_compress && $maycompress && !$has_zlib) { + foreach (split(/:/, $ENV{PATH})) { + if (-x "$_/gzip") { + $GZIPBIN = "$_/gzip"; + last; + } + } } -if (-d $fullname && $pathinfo !~ m|/$|) { - $pathinfo .= '/'; - $rewrite = 1; +if (-d $fullname) { + # + # ensure, that directories always end with (exactly) one '/' + # to allow relative URL's. If they're not, make a redirect. + ## + if (!($pathinfo =~ m|/$|) || ($pathinfo =~ m |/{2,}$|)) { + redirect ($scriptwhere . '/' . $query); + } + else { + $where .= '/'; + $scriptwhere .= '/'; + } } -if (!-d $fullname && $pathinfo =~ m|/$|) { - chop $pathinfo; - $rewrite = 1; -} - -if ($rewrite) { - redirect($scriptname . urlencode($pathinfo) . $query); -} - -undef $rewrite; - if (!-d $cvsroot) { &fatal("500 Internal Error",'$CVSROOT not found!

The server on which the CVS tree lives is probably down. Please try again in a few minutes.'); } @@ -507,58 +425,10 @@ $module = $1; if ($module && &forbidden_module($module)) { &fatal("403 Forbidden", "Access to $where forbidden."); } - -# -# Handle tarball downloads before any headers are output. -# -if ($input{tarball}) { - &fatal("403 Forbidden", "Downloading tarballs is prohibited.") - unless $allow_tar; - my($module) = ($where =~ m,^/?(.*),); # untaint - $module =~ s,/[^/]*$,,; - my($basedir) = ($module =~ m,([^/]+)$,); - - if ($basedir eq '' || $module eq '') { - &fatal("500 Internal Error", "You cannot download the top level directory."); - } - - my $tmpdir = "/tmp/.cvsweb.$$." . int(time); - - mkdir($tmpdir, 0700) - or &fatal("500 Internal Error", "Unable to make temporary directory: $!"); - - my $fatal = ''; - - while (1) { - my $tag = (exists $input{only_with_tag} && length $input{only_with_tag}) - ? $input{only_with_tag} : "HEAD"; - - system $CMD{cvs}, @cvs_options, '-Qd', $cvsroot, 'export', '-r', $tag, '-d', "$tmpdir/$basedir", $module - and $fatal = "500 Internal Error","cvs co failure: $!: $module" - && last; - - $| = 1; # Essential to get the buffering right. - - print "Content-type: application/x-gzip\r\n\r\n"; - - system "$CMD{tar} @tar_options -cf - -C $tmpdir $basedir | $CMD{gzip} @gzip_options -c" - and $fatal = "500 Internal Error","tar zc failure: $!: $basedir" - && last; - - last; - } - - system $CMD{rm}, '-rf', $tmpdir if -d $tmpdir; - - &fatal($fatal) if $fatal; - - exit; -} - ############################## # View a directory ############################### -if (-d $fullname) { +elsif (-d $fullname) { my $dh = do {local(*DH);}; opendir($dh, $fullname) || &fatal("404 Not Found","$where: $!"); my @dir = readdir($dh); @@ -893,27 +763,9 @@ if (-d $fullname) { ">$tag\n"; } print "\n"; - print " Module path or alias:\n"; - printf "\n", htmlquote($where); print "\n"; print "\n"; } - - if ($allow_tar) { - my($basefile) = ($where =~ m,(?:.*/)?([^/]+),); - - if (defined($basefile) && $basefile ne '') { - print "

\n", - "
", - &link("Download this directory in tarball", - # Mangle the filename so browsers show a reasonable - # filename to download. - "$basefile.tar.gz$query". - ($query ? "&" : "?")."tarball=1"), - "
"; - } - } - my $formwhere = $scriptwhere; $formwhere =~ s|Attic/?$|| if ($input{'hideattic'}); @@ -933,9 +785,12 @@ if (-d $fullname) { print "Revision"; print "Log message"; print ""; - print "Sort log by: "; - printLogSortSelect(0); - print ""; + print "revisions by: \n"; + print ""; print "Diff format: "; printDiffSelect(0); print ""; @@ -997,7 +852,7 @@ if (-d $fullname) { # The file has been removed and is in the Attic. # Send a redirect pointing to the file in the Attic. (my $newplace = $scriptwhere) =~ s|/([^/]+)$|/Attic/$1|; - redirect("$newplace$query"); + &redirect($newplace); exit; } elsif (0 && (my @files = &safeglob($fullname . ",v"))) { @@ -1011,13 +866,13 @@ if (-d $fullname) { my $fh = do {local(*FH);}; my ($xtra, $module); # Assume it's a module name with a potential path following it. - $xtra = (($module = $where) =~ s|/.*||) ? $& : ''; + $xtra = $& if (($module = $where) =~ s|/.*||); # Is there an indexed version of modules? - if (open($fh, "< $cvsroot/CVSROOT/modules")) { + if (open($fh, "$cvsroot/CVSROOT/modules")) { while (<$fh>) { if (/^(\S+)\s+(\S+)/o && $module eq $1 - && -d "$cvsroot/$2" && $module ne $2) { - redirect("$scriptname/$2$xtra$query"); + && -d "${cvsroot}/$2" && $module ne $2) { + &redirect($scriptname . '/' . $2 . $xtra); } } } @@ -1029,43 +884,18 @@ gzipclose(); sub printDiffSelect($) { my ($use_java_script) = @_; - my $f = $input{'f'}; - - print '\n"; + print "