source@mandoc.bsd.lv
 help / color / mirror / Atom feed
From: schwarze@mandoc.bsd.lv
To: source@mandoc.bsd.lv
Subject: cvsweb: A web server should absolutely run chrooted, so storing a
Date: Thu, 21 Mar 2019 11:32:16 -0500 (EST)	[thread overview]
Message-ID: <e3fc83d33682f4d1@fantadrom.bsd.lv> (raw)

Log Message:
-----------
A web server should absolutely run chrooted, so storing a configuration
file below /usr/local/etc/ makes no sense whatsoever.  Also, the
configuration file should certainly not be in a directory where
files can get executed as CGI scripts, so looking in the same
directory as cvsweb.cgi is a bad idea, too.

Considerably simplify things by hardcoding a reasonable location.
The INSTALL file already instructs the user to check this.

Tags:
----
FreeBSD-cvsweb-2_0-branch

Modified Files:
--------------
    cvsweb:
        cvsweb.cgi

Revision Data
-------------
Index: cvsweb.cgi
===================================================================
RCS file: /home/cvs/mandoc/cvsweb/cvsweb.cgi,v
retrieving revision 3.119.2.11
retrieving revision 3.119.2.12
diff -Lcvsweb.cgi -Lcvsweb.cgi -u -p -r3.119.2.11 -r3.119.2.12
--- cvsweb.cgi
+++ cvsweb.cgi
@@ -57,7 +57,7 @@ use strict;
 
 use vars qw (
     $cvsweb_revision
-    $mydir $uname $config $allow_version_select $verbose
+    $uname $config $allow_version_select $verbose
     @CVSrepositories @CVSROOT %CVSROOT %CVSROOTdescr
     %MIRRORS %DEFAULTVALUE %ICONS %MTYPES
     @DIFFTYPES %DIFFTYPES @LOGSORTKEYS %LOGSORTKEYS
@@ -151,18 +151,9 @@ delete $ENV{PATH};
 
 $cvsweb_revision = '2.0.6';
 
-use File::Basename ();
-
-($mydir) = (File::Basename::dirname($0) =~ /(.*)/);    # untaint
-
 # == EDIT this ==
-# Locations to search for user configuration, in order:
-for ("$mydir/cvsweb.conf", '/usr/local/etc/cvsweb/cvsweb.conf') {
-	if (defined($_) && -r $_) {
-		$config = $_;
-		last;
-	}
-}
+# Location of the configuration file inside the web server chroot:
+$config = '/conf/cvsweb/cvsweb.conf';
 
 # == Configuration defaults ==
 # Defaults for configuration variables that shouldn't need
--
 To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv

                 reply	other threads:[~2019-03-21 16:32 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=e3fc83d33682f4d1@fantadrom.bsd.lv \
    --to=schwarze@mandoc.bsd.lv \
    --cc=source@mandoc.bsd.lv \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).