summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbbaetz%student.usyd.edu.au <>2002-04-07 12:56:45 +0200
committerbbaetz%student.usyd.edu.au <>2002-04-07 12:56:45 +0200
commitae8a18de80c43febc782c4f398e75fdf89281601 (patch)
tree385198c02a27e1befa5e65f262ca8ca7b7f2edba
parent09c6150e957783a972ea0123b4c31181f68c7410 (diff)
downloadbugzilla-ae8a18de80c43febc782c4f398e75fdf89281601.tar.gz
bugzilla-ae8a18de80c43febc782c4f398e75fdf89281601.tar.xz
Bug 134575 - some scripts trying to make world writable directories
r=justdave, gerv
-rw-r--r--defparams.pl4
-rw-r--r--globals.pl16
-rwxr-xr-ximportxml.pl6
-rwxr-xr-xmove.pl6
4 files changed, 16 insertions, 16 deletions
diff --git a/defparams.pl b/defparams.pl
index eddf50942..d88938f3c 100644
--- a/defparams.pl
+++ b/defparams.pl
@@ -64,8 +64,6 @@ sub WriteParams {
delete $::param{$item};
}
}
- mkdir("data", 0777);
- chmod 0777, "data";
my $tmpname = "data/params.$$";
open(FID, ">$tmpname") || die "Can't create $tmpname";
my $v = $::param{'version'};
@@ -76,7 +74,7 @@ sub WriteParams {
print FID "1;\n";
close FID;
rename $tmpname, "data/params" || die "Can't rename $tmpname to data/params";
- chmod 0666, "data/params";
+ ChmodDataFile('data/params', 0666);
}
diff --git a/globals.pl b/globals.pl
index cb3612671..249945ad9 100644
--- a/globals.pl
+++ b/globals.pl
@@ -117,6 +117,18 @@ $::superusergroupset = "9223372036854775807";
#}
#$::SIG{__DIE__} = \&die_with_dignity;
+# Some files in the data directory must be world readable iff we don't have
+# a webserver group. Call this function to do this.
+sub ChmodDataFile($$) {
+ my ($file, $mask) = @_;
+ my $perm = 0770;
+ if ((stat('data'))[2] & 0002) {
+ $perm = 0777;
+ }
+ $perm = $perm & $mask;
+ chmod $perm,$file;
+}
+
sub ConnectToDatabase {
my ($useshadow) = (@_);
if (!defined $::db) {
@@ -565,8 +577,6 @@ sub GenerateVersionTable {
my @list = sort { uc($a) cmp uc($b)} keys(%::versions);
@::legal_product = @list;
- mkdir("data", 0777);
- chmod 0777, "data";
my $tmpname = "data/versioncache.$$";
open(FID, ">$tmpname") || die "Can't create $tmpname";
@@ -636,7 +646,7 @@ sub GenerateVersionTable {
print FID "1;\n";
close FID;
rename $tmpname, "data/versioncache" || die "Can't rename $tmpname to versioncache";
- chmod 0666, "data/versioncache";
+ ChmodDataFile('data/versioncache', 0666);
}
diff --git a/importxml.pl b/importxml.pl
index f2ed77d5c..964d29a6f 100755
--- a/importxml.pl
+++ b/importxml.pl
@@ -135,11 +135,7 @@ sub Log {
sub Lock {
if ($::lockcount <= 0) {
$::lockcount = 0;
- if (!open(LOCKFID, ">>data/maillock")) {
- mkdir "data", 0777;
- chmod 0777, "data";
- open(LOCKFID, ">>data/maillock") || die "Can't open lockfile.";
- }
+ open(LOCKFID, ">>data/maillock") || die "Can't open data/maillock: $!";
my $val = flock(LOCKFID,2);
if (!$val) { # '2' is magic 'exclusive lock' const.
print "Content-type: text/html\n\n";
diff --git a/move.pl b/move.pl
index f38644358..b20ee528b 100755
--- a/move.pl
+++ b/move.pl
@@ -50,11 +50,7 @@ sub Log {
sub Lock {
if ($::lockcount <= 0) {
$::lockcount = 0;
- if (!open(LOCKFID, ">>data/maillock")) {
- mkdir "data", 0777;
- chmod 0777, "data";
- open(LOCKFID, ">>data/maillock") || die "Can't open lockfile.";
- }
+ open(LOCKFID, ">>data/maillock") || die "Can't open data/maillock: $!";
my $val = flock(LOCKFID,2);
if (!$val) { # '2' is magic 'exclusive lock' const.
print "Content-type: text/html\n\n";