You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jm...@apache.org on 2004/05/06 07:00:33 UTC
svn commit: rev 10538 - in incubator/spamassassin/trunk: rules spamd t
Author: jm
Date: Wed May 5 22:00:30 2004
New Revision: 10538
Modified:
incubator/spamassassin/trunk/rules/20_phrases.cf
incubator/spamassassin/trunk/rules/30_text_de.cf
incubator/spamassassin/trunk/rules/30_text_fr.cf
incubator/spamassassin/trunk/rules/30_text_pl.cf
incubator/spamassassin/trunk/rules/50_scores.cf
incubator/spamassassin/trunk/spamd/spamd.raw
incubator/spamassassin/trunk/t/SATest.pm
incubator/spamassassin/trunk/t/zz_cleanup.t
Log:
bug 3046: added --socketowner, --socketgroup, --socketmode parameters to spamd
Modified: incubator/spamassassin/trunk/rules/20_phrases.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/20_phrases.cf (original)
+++ incubator/spamassassin/trunk/rules/20_phrases.cf Wed May 5 22:00:30 2004
@@ -657,8 +657,8 @@
body MORE_SEX /increased?.{0,9}(?:sex|stamina)/i
describe MORE_SEX Talks about a bigger drive for sex
-body BANG_GUARANTEE /\bguaranteed?\!/i
-describe BANG_GUARANTEE Something is emphatically guaranteed
+body BANG_GUAR /\bguaranteed?\!/i
+describe BANG_GUAR Something is emphatically guaranteed
# seems to be inserted with s1618 rules VERY heavily
body WE_HATE_SPAM2 /\banti-spam policy\b/i
Modified: incubator/spamassassin/trunk/rules/30_text_de.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/30_text_de.cf (original)
+++ incubator/spamassassin/trunk/rules/30_text_de.cf Wed May 5 22:00:30 2004
@@ -584,7 +584,7 @@
lang de describe ACT_NOW_CAPS Reagieren Sie jetzt (in Gro�buchstaben)
lang de describe START_NOW_CAPS Starten Sie jetzt (in Gro�buchstaben)
lang de describe MORE_SEX Werden Sie sexuell aktiver
-lang de describe BANG_GUARANTEE Eine Garantie mit Ausrufezeichen
+lang de describe BANG_GUAR Eine Garantie mit Ausrufezeichen
lang de describe WE_HATE_SPAM2 Wir lehnen doch alle Spam ab...
lang de describe UP_TO_OR_MORES Bis zu ... und mehr
lang de describe NIGERIAN_SCAM_VIRTUE M�glicherweise Text mit nigerianischem Spam
Modified: incubator/spamassassin/trunk/rules/30_text_fr.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/30_text_fr.cf (original)
+++ incubator/spamassassin/trunk/rules/30_text_fr.cf Wed May 5 22:00:30 2004
@@ -102,7 +102,7 @@
lang fr describe BAD_CREDIT Contient "Eliminate Bad Credit"
lang fr describe BANG_BOSS Parle de votre "boss" avec point d'exclamation !
lang fr describe BANG_EXERCISE Parle d'exercices avec un point d'exclamation
-lang fr describe BANG_GUARANTEE Quelque chose est "garanti" de mani�re emphatique
+lang fr describe BANG_GUAR Quelque chose est "garanti" de mani�re emphatique
lang fr describe BANG_MONEY Parle d'argent avec point d'exclamation !
lang fr describe BANG_MORE Parle de "plus" avec point d'exclamation !
lang fr describe BANG_OPRAH Parle d'Oprah avec point d'exclamation !
Modified: incubator/spamassassin/trunk/rules/30_text_pl.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/30_text_pl.cf (original)
+++ incubator/spamassassin/trunk/rules/30_text_pl.cf Wed May 5 22:00:30 2004
@@ -111,7 +111,7 @@
lang pl describe BAD_CREDIT Likwidacja problem�w kredytowych
lang pl describe BANG_BOSS Tre��: o Twoim szefie z wykrzyknikiem!
lang pl describe BANG_EXERCISE Tre��: o gimnastyce z wykrzyknikiem!
-lang pl describe BANG_GUARANTEE Dobitna gwarancja czego�
+lang pl describe BANG_GUAR Dobitna gwarancja czego�
lang pl describe BANG_MONEY Tre��: o pieni�dzach z wykrzyknikiem!
lang pl describe BANG_MORE Tre��: o wi�kszej ilo�ci z wykrzyknikiem!
lang pl describe BANG_OPRAH Tre��: o Oprah z wykrzyknikiem!
Modified: incubator/spamassassin/trunk/rules/50_scores.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/50_scores.cf (original)
+++ incubator/spamassassin/trunk/rules/50_scores.cf Wed May 5 22:00:30 2004
@@ -113,7 +113,7 @@
score BAD_CREDIT 1.230 0.160 0.500 0.356
score BANG_BOSS 1.921 0.529 1.972 1.105
score BANG_EXERCISE 2.147 1.223 1.001 2.936
-score BANG_GUARANTEE 1.100 1.101 1.001 1.001
+score BANG_GUAR 1.100 1.101 1.001 1.001
score BANG_MONEY 0.582 0.880 0.259 0.001
score BANG_MORE 0.413 1.165 0.001 1.157
score BANG_OPRAH 3.323 2.163 3.248 2.773
Modified: incubator/spamassassin/trunk/spamd/spamd.raw
==============================================================================
--- incubator/spamassassin/trunk/spamd/spamd.raw (original)
+++ incubator/spamassassin/trunk/spamd/spamd.raw Wed May 5 22:00:30 2004
@@ -115,6 +115,9 @@
Getopt::Long::Configure("bundling");
GetOptions(
'socketpath=s' => \$opt{'socketpath'},
+ 'socketowner=s' => \$opt{'socketowner'},
+ 'socketgroup=s' => \$opt{'socketgroup'},
+ 'socketmode=s' => \$opt{'socketmode'},
'create-prefs!' => \$opt{'create-prefs'},
'c' => \$opt{'create-prefs'},
'daemonize!' => \$opt{'daemonize'},
@@ -210,6 +213,21 @@
);
}
+if (
+ !$opt{'socketpath'}
+ and ( $opt{'socketowner'}
+ or $opt{'socketgroup'}
+ or $opt{'socketmode'})
+ )
+{
+ pod2usage(
+ -exitval => $resphash{'EX_USAGE'},
+ -verbose => 0,
+ -message =>
+"ERROR: --socketowner/group/mode requires --socketpath param"
+ );
+}
+
# These can be changed on command line with -A flag
# but only if we're not using UNIX domain sockets
my $allowed_nets = Mail::SpamAssassin::NetSet->new();
@@ -535,7 +553,36 @@
)
|| die "Could not create UNIX socket on $path: $! $@\n";
- chmod 0666, $path; # make sure everybody can talk to it
+ my $mode = $opt{socketmode};
+ if ($mode) {
+ $mode = oct $mode;
+ } else {
+ $mode = 0666; # default
+ }
+
+ my $owner = $opt{socketowner};
+ my $group = $opt{socketgroup};
+ if ($owner || $group) {
+ my $uid = -1;
+ my $gid = -1;
+ if ($owner) {
+ my ($login,$pass,$puid,$pgid) = getpwnam($owner)
+ or die "$owner not in passwd database\n";
+ $uid = $puid;
+ }
+ if ($group) {
+ my ($name,$pass,$ggid,$members) = getpwnam($group)
+ or die "$group not in group database\n";
+ $gid = $ggid;
+ }
+ if (!chown $uid, $gid, $path) {
+ die "Could not chown $path to $uid/$gid: $! $@";
+ }
+ }
+
+ if (!chmod $mode, $path) { # make sure everybody can talk to it
+ die "Could not chmod $path to $mode: $! $@";
+ }
}
elsif ( $opt{'ssl'} ) {
$server = new IO::Socket::SSL(
@@ -585,7 +632,7 @@
}
# ditto with the socket file
- if ( defined $opt{'socketpath'} ) {
+ if ( defined $opt{'socketpath'} && !$opt{'socketowner'}) {
chown $uuid, -1, $opt{'socketpath'}
|| die "fatal: could not chown '$opt{'socketpath'}' to uid $uuid\n";
}
@@ -1745,6 +1792,9 @@
--server-key keyfile Specify an SSL keyfile
--server-cert certfile Specify an SSL certificate
--socketpath=path Listen on given UNIX domain socket
+ --socketowner=name Set UNIX domain socket file's owner
+ --socketgroup=name Set UNIX domain socket file's group
+ --socketmode=mode Set UNIX domain socket file's mode
=head1 DESCRIPTION
@@ -2041,6 +2091,24 @@
=item B<--socketpath> I<pathname>
Listen on UNIX domain path I<pathname> instead of a TCP socket.
+
+=item B<--socketowner> I<name>
+
+Set UNIX domain socket to be owned by the user named I<name>. Note
+that this requires that spamd be started as C<root>, and if C<-u>
+is used, that user should have write permissions to unlink the file
+later, for when the C<spamd> server is killed.
+
+=item B<--socketgroup> I<name>
+
+Set UNIX domain socket to be owned by the group named I<name>. See
+C<--socketowner> for notes on ownership and permissions.
+
+=item B<--socketmode> I<mode>
+
+Set UNIX domain socket to use the octal mode I<mode>. Note that if C<-u> is
+used, that user should have write permissions to unlink the file later, for
+when the C<spamd> server is killed.
=back
Modified: incubator/spamassassin/trunk/t/SATest.pm
==============================================================================
--- incubator/spamassassin/trunk/t/SATest.pm (original)
+++ incubator/spamassassin/trunk/t/SATest.pm Wed May 5 22:00:30 2004
@@ -73,8 +73,15 @@
";
(-f "t/test_dir") && chdir("t"); # run from ..
- rmtree ("log");
+
+ # do not remove prior test results!
+ # rmtree ("log");
+
mkdir ("log", 0755);
+
+ rmtree ("log/user_state");
+ rmtree ("log/outputdir.tmp");
+ rmtree ("log/test_rules_copy");
mkdir ("log/test_rules_copy", 0755);
for $file (<../rules/*.cf>) {
$base = basename $file;
@@ -82,6 +89,7 @@
or warn "cannot copy $file to log/test_rules_copy/$base";
}
+ rmtree ("log/localrules.tmp");
mkdir ("log/localrules.tmp", 0755);
copy ("../rules/init.pre", "log/localrules.tmp/init.pre")
or die "init.pre copy failed";
Modified: incubator/spamassassin/trunk/t/zz_cleanup.t
==============================================================================
--- incubator/spamassassin/trunk/t/zz_cleanup.t (original)
+++ incubator/spamassassin/trunk/t/zz_cleanup.t Wed May 5 22:00:30 2004
@@ -6,5 +6,9 @@
use File::Path;
-rmtree ("log");
+# jm: off! we want to keep the logs around in case something failed,
+# so we can see what it was. esp. important in case of intermittent
+# failures.
+# rmtree ("log");
+
ok (1);