1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
|
--- archive2.pl Mon Jan 3 14:35:32 2000
+++ archive2.pl.new Mon Jan 3 14:36:16 2000
@@ -54,10 +54,23 @@
shift(@ARGV);
shift(@ARGV);
}
-if (! -r $cf) {
- die("$cf not readable; stopped");
+
+if (not sysopen CONFIG,$cf,O_RDONLY)
+{
+ die sprintf qq|Unable to sysopen config file "$cf"%s.\n|,$! ? ": $!" : '';
}
-require "$cf";
+elsif ((stat CONFIG)[4] != $>)
+{
+ die qq|Config file "$cf" not owned by effective UID.\n|;
+}
+elsif (eval(join '',<CONFIG>),$@)
+{
+ die qq|Unable to eval "$cf": $@.\n|;
+}
+else
+{
+ close CONFIG;
+}
# All these should be in the standard PERL library
unshift(@INC, $homedir);
--- bounce-remind Mon Jan 3 14:35:32 2000
+++ bounce-remind.new Mon Jan 3 14:38:16 2000
@@ -24,10 +24,23 @@
shift(@ARGV);
shift(@ARGV);
}
-if (! -r $cf) {
- die("$cf not readable; stopped");
+
+if (not sysopen CONFIG,$cf,O_RDONLY)
+{
+ die sprintf qq|Unable to sysopen config file "$cf"%s.\n|,$! ? ": $!" : '';
}
-require "$cf";
+elsif ((stat CONFIG)[4] != $>)
+{
+ die qq|Config file "$cf" not owned by effective UID.\n|;
+}
+elsif (eval(join '',<CONFIG>),$@)
+{
+ die qq|Unable to eval "$cf": $@.\n|;
+}
+else
+{
+ close CONFIG;
+}
# Go to the home directory specified by the .cf file
chdir("$homedir");
--- config-test.orig Wed Aug 27 08:17:13 1997
+++ config-test Wed Jan 5 01:41:37 2000
@@ -119,10 +119,21 @@
$cf = $ARGV[0] || $ENV{'MAJORDOMO_CF'};
-if (eval "require '$cf'") {
- &good("'require'd $cf okay.");
-} else {
- &bad("something's wrong with $cf: $@");
+if (not sysopen CONFIG,$cf,O_RDONLY)
+{
+ die sprintf qq|Unable to sysopen config file "$cf"%s.\n|,$! ? ": $!" : '';
+}
+elsif ((stat CONFIG)[4] != $>)
+{
+ die qq|Config file "$cf" not owned by effective UID.\n|;
+}
+elsif (eval(join '',<CONFIG>),$@)
+{
+ die qq|Unable to eval "$cf": $@.\n|;
+}
+else
+{
+ close CONFIG;
}
foreach (@requires) {
--- digest.orig Wed Jan 5 01:44:09 2000
+++ digest Wed Jan 5 01:45:38 2000
@@ -315,7 +315,23 @@
# Read and execute the .cf file
$cf = $opt_c || $ENV{"MAJORDOMO_CF"} ||
"%%PREFIX%%/majordomo/majordomo.cf";
- require "$cf";
+
+if (not sysopen CONFIG,$cf,O_RDONLY)
+{
+ die sprintf qq|Unable to sysopen config file "$cf"%s.\n|,$! ? ": $!" : '';
+}
+elsif ((stat CONFIG)[4] != $>)
+{
+ die qq|Config file "$cf" not owned by effective UID.\n|;
+}
+elsif (eval(join '',<CONFIG>),$@)
+{
+ die qq|Unable to eval "$cf": $@.\n|;
+}
+else
+{
+ close CONFIG;
+}
chdir($homedir);
--- majordomo Mon Jan 3 13:37:13 2000
+++ majordomo.new Mon Jan 3 14:15:29 2000
@@ -40,11 +40,23 @@
die "Unknown argument $ARGV[0]\n";
}
}
-if (! -r $cf) {
- die("$cf not readable; stopped");
-}
-require "$cf";
+if (not sysopen CONFIG,$cf,O_RDONLY)
+{
+ die sprintf qq|Unable to sysopen config file "$cf"%s.\n|,$! ? ": $!" : '';
+}
+elsif ((stat CONFIG)[4] != $>)
+{
+ die qq|Config file "$cf" not owned by effective UID.\n|;
+}
+elsif (eval(join '',<CONFIG>),$@)
+{
+ die qq|Unable to eval "$cf": $@.\n|;
+}
+else
+{
+ close CONFIG;
+}
# Go to the home directory specified by the .cf file
chdir("$homedir") || die "chdir to $homedir failed, $!\n";
--- request-answer Mon Jan 3 14:35:32 2000
+++ request-answer.new Mon Jan 3 15:09:02 2000
@@ -20,10 +20,23 @@
shift(@ARGV);
shift(@ARGV);
}
-if (! -r $cf) {
- die("$cf not readable; stopped");
+
+if (not sysopen CONFIG,$cf,O_RDONLY)
+{
+ die sprintf qq|Unable to sysopen config file "$cf"%s.\n|,$! ? ": $!" : '';
}
-require "$cf";
+elsif ((stat CONFIG)[4] != $>)
+{
+ die qq|Config file "$cf" not owned by effective UID.\n|;
+}
+elsif (eval(join '',<CONFIG>),$@)
+{
+ die qq|Unable to eval "$cf": $@.\n|;
+}
+else
+{
+ close CONFIG;
+}
chdir($homedir) || die("Can't chdir(\"$homedir\"): $!");
unshift(@INC, $homedir);
--- resend Mon Jan 3 15:14:49 2000
+++ resend.new Mon Jan 3 15:16:01 2000
@@ -56,7 +56,7 @@
if ($ARGV[0] =~ /^\@/) {
$fn = shift(@ARGV);
$fn =~ s/^@//;
- open(AV, $fn) || die("open(AV, \"$fn\"): $!\nStopped");
+ sysopen(AV, $fn, O_RDONLY) || die("sysopen(AV, \"$fn\", O_RDONLY): $!\nStopped");
undef($/); # set input field separator
$av = <AV>; # read whole file into string
close(AV);
@@ -84,11 +84,23 @@
# Despite not having a place to send the remains of the body,
# it would be nice to send a message to root or postmaster, at least...
#
-if (! -r $cf) {
- die("$cf not readable; stopped");
-}
-require "$cf";
+if (not sysopen CONFIG,$cf,O_RDONLY)
+{
+ die sprintf qq|Unable to sysopen config file "$cf"%s.\n|,$! ? ": $!" : '';
+}
+elsif ((stat CONFIG)[4] != $>)
+{
+ die qq|Config file "$cf" not owned by effective UID.\n|;
+}
+elsif (eval(join '',<CONFIG>),$@)
+{
+ die qq|Unable to eval "$cf": $@.\n|;
+}
+else
+{
+ close CONFIG;
+}
chdir($homedir) || die("Can't chdir(\"$homedir\"): $!");
|
