You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by si...@apache.org on 2007/08/11 07:31:26 UTC
svn commit: r564834 - in /spamassassin/branches/3.1: MANIFEST
lib/Mail/SpamAssassin/Util.pm spamd/spamd.raw t/root_spamd_u.t
t/root_spamd_u_dcc.t
Author: sidney
Date: Fri Aug 10 22:31:24 2007
New Revision: 564834
URL: http://svn.apache.org/viewvc?view=rev&rev=564834
Log:
bug 5574: fix problem with new setuid code broken under perl 5.6.x and 5.8.x and add test cases
Added:
spamassassin/branches/3.1/t/root_spamd_u.t
spamassassin/branches/3.1/t/root_spamd_u_dcc.t
Modified:
spamassassin/branches/3.1/MANIFEST
spamassassin/branches/3.1/lib/Mail/SpamAssassin/Util.pm
spamassassin/branches/3.1/spamd/spamd.raw
Modified: spamassassin/branches/3.1/MANIFEST
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.1/MANIFEST?view=diff&rev=564834&r1=564833&r2=564834
==============================================================================
--- spamassassin/branches/3.1/MANIFEST (original)
+++ spamassassin/branches/3.1/MANIFEST Fri Aug 10 22:31:24 2007
@@ -473,6 +473,8 @@
t/root_spamd_tell_paranoid.t
t/root_spamd_tell_x.t
t/root_spamd_tell_x_paranoid.t
+t/root_spamd_u.t
+t/root_spamd_u_dcc.t
t/root_spamd_x.t
t/root_spamd_x_paranoid.t
tools/README.speedtest
Modified: spamassassin/branches/3.1/lib/Mail/SpamAssassin/Util.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.1/lib/Mail/SpamAssassin/Util.pm?view=diff&rev=564834&r1=564833&r2=564834
==============================================================================
--- spamassassin/branches/3.1/lib/Mail/SpamAssassin/Util.pm (original)
+++ spamassassin/branches/3.1/lib/Mail/SpamAssassin/Util.pm Fri Aug 10 22:31:24 2007
@@ -1286,6 +1286,7 @@
# bug 3586: kludges needed to work around platform dependent behavior assigning to $<
# The POSIX functions deal with that so just use it here
POSIX::setuid($touid);
+ $< = $touid; $> = $touid; # bug 5574
# Check that we have now accomplished the setuid: catch bug 3586 if it comes back
if ($< != $touid) {
Modified: spamassassin/branches/3.1/spamd/spamd.raw
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.1/spamd/spamd.raw?view=diff&rev=564834&r1=564833&r2=564834
==============================================================================
--- spamassassin/branches/3.1/spamd/spamd.raw (original)
+++ spamassassin/branches/3.1/spamd/spamd.raw Fri Aug 10 22:31:24 2007
@@ -890,10 +890,11 @@
# use the POSIX functions to hide the platform specific workarounds
POSIX::setgid($ugid); # set effective and real gid
POSIX::setuid($uuid); # set effective and real UID
+ $< = $uuid; $> = $uuid; # bug 5574
# keep the sanity check to catch problems like bug 3900 just in case
if ( $> != $uuid and $> != ( $uuid - 2**32 ) ) {
- die "spamd: setuid to uid $uuid failed\n";
+ die "spamd: setuid to uid $uuid failed (> = $>, < = $<)\n";
}
}
Added: spamassassin/branches/3.1/t/root_spamd_u.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.1/t/root_spamd_u.t?view=auto&rev=564834
==============================================================================
--- spamassassin/branches/3.1/t/root_spamd_u.t (added)
+++ spamassassin/branches/3.1/t/root_spamd_u.t Fri Aug 10 22:31:24 2007
@@ -0,0 +1,48 @@
+#!/usr/bin/perl
+
+# run with: sudo prove -v t/root_spamd*
+
+use lib '.'; use lib 't';
+use SATest; sa_t_init("root_spamd_u");
+use Test;
+
+use constant TEST_ENABLED => conf_bool('run_root_tests');
+use constant IS_ROOT => eval { ($> == 0); };
+use constant RUN_TESTS => (TEST_ENABLED && IS_ROOT);
+
+BEGIN { plan tests => (RUN_TESTS ? 14 : 0) };
+exit unless RUN_TESTS;
+
+# ---------------------------------------------------------------------------
+
+%patterns = (
+
+q{ Return-Path: sb55sb55@yahoo.com}, 'firstline',
+q{ Subject: There yours for FREE!}, 'subj',
+q{ X-Spam-Status: Yes, score=}, 'status',
+q{ X-Spam-Flag: YES}, 'flag',
+q{ X-Spam-Level: **********}, 'stars',
+q{ TEST_ENDSNUMS}, 'endsinnums',
+q{ TEST_NOREALNAME}, 'noreal',
+q{ This must be the very last line}, 'lastline',
+
+);
+
+# run spamc as unpriv uid
+$spamc = "sudo -u nobody $spamc";
+
+ok(start_spamd("-L -u nobody"));
+
+ok(spamcrun("< data/spam/001", \&patterns_run_cb));
+ok_all_patterns();
+
+%patterns = (
+q{ X-Spam-Status: Yes, score=}, 'status',
+q{ X-Spam-Flag: YES}, 'flag',
+ );
+
+
+ok (spamcrun("< data/spam/018", \&patterns_run_cb));
+ok_all_patterns();
+
+ok(stop_spamd());
Added: spamassassin/branches/3.1/t/root_spamd_u_dcc.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.1/t/root_spamd_u_dcc.t?view=auto&rev=564834
==============================================================================
--- spamassassin/branches/3.1/t/root_spamd_u_dcc.t (added)
+++ spamassassin/branches/3.1/t/root_spamd_u_dcc.t Fri Aug 10 22:31:24 2007
@@ -0,0 +1,65 @@
+#!/usr/bin/perl
+#
+# test for http://issues.apache.org/SpamAssassin/show_bug.cgi?id=5574#c12 .
+# run with: sudo prove -v t/root_spamd*
+
+use lib '.'; use lib 't';
+use SATest; sa_t_init("root_spamd_u_dcc");
+use Test;
+
+use constant TEST_ENABLED => conf_bool('run_root_tests');
+use constant DCC_TEST_ENABLED => conf_bool('run_dcc_tests');
+use constant IS_ROOT => eval { ($> == 0); };
+use constant RUN_TESTS => (TEST_ENABLED && DCC_TEST_ENABLED && IS_ROOT);
+
+BEGIN { plan tests => (RUN_TESTS ? 23 : 0) };
+exit unless RUN_TESTS;
+
+# ---------------------------------------------------------------------------
+
+%patterns = (
+ q{ spam reported to DCC }, 'dcc report',
+ );
+
+tstpre ("
+
+ loadplugin Mail::SpamAssassin::Plugin::DCC
+ dcc_timeout 30
+
+");
+
+ok sarun ("-t -D info -r < data/spam/gtubedcc.eml 2>&1", \&patterns_run_cb);
+# ok_all_patterns();
+
+# ---------------------------------------------------------------------------
+
+%patterns = (
+
+q{ X-Spam-Status: Yes, score=}, 'status',
+q{ X-Spam-Flag: YES}, 'flag',
+q{ X-Spam-Level: **********}, 'stars',
+
+);
+
+# run spamc as unpriv uid
+$spamc = "sudo -u nobody $spamc";
+
+$SIG{ALRM} = sub { stop_spamd(); die "timed out"; };
+alarm 60;
+ok(start_spamd("-c -H -m1"));
+alarm 0;
+
+# run a few times to ensure that the child can process more than
+# one message successfully. do not bother looking for the dcc
+# result; we just want to ensure that the check did not cause
+# the spamd kids to get hung
+for my $try (1 .. 5) {
+ $SIG{ALRM} = sub { stop_spamd(); die "timed out"; };
+ alarm 30;
+ ok(spamcrun("< data/spam/gtubedcc.eml", \&patterns_run_cb));
+ alarm 0;
+ ok_all_patterns();
+}
+
+ok(stop_spamd());
+