You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by he...@apache.org on 2021/04/15 17:12:18 UTC
svn commit: r1888798 - in /spamassassin: branches/3.4/MANIFEST
branches/3.4/lib/Mail/SpamAssassin/Conf/Parser.pm branches/3.4/t/if_else.t
trunk/MANIFEST trunk/lib/Mail/SpamAssassin/Conf/Parser.pm trunk/t/if_else.t
Author: hege
Date: Thu Apr 15 17:12:18 2021
New Revision: 1888798
URL: http://svn.apache.org/viewvc?rev=1888798&view=rev
Log:
Bug 7848 - Rule parser doesn't support nested if/ifplugins
Added:
spamassassin/branches/3.4/t/if_else.t (with props)
spamassassin/trunk/t/if_else.t (with props)
Modified:
spamassassin/branches/3.4/MANIFEST
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Conf/Parser.pm
spamassassin/trunk/MANIFEST
spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm
Modified: spamassassin/branches/3.4/MANIFEST
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/MANIFEST?rev=1888798&r1=1888797&r2=1888798&view=diff
==============================================================================
--- spamassassin/branches/3.4/MANIFEST (original)
+++ spamassassin/branches/3.4/MANIFEST Thu Apr 15 17:12:18 2021
@@ -452,6 +452,7 @@ t/html_obfu.t
t/html_utf8.t
t/idn_dots.t
t/if_can.t
+t/if_else.t
t/ifversion.t
t/ip_addrs.t
t/lang_lint.t
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Conf/Parser.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Conf/Parser.pm?rev=1888798&r1=1888797&r2=1888798&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Conf/Parser.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Conf/Parser.pm Thu Apr 15 17:12:18 2021
@@ -366,7 +366,13 @@ sub parse {
goto failed_line;
}
- $skip_parsing = !$skip_parsing;
+ # Check if we are blocked anywhere in previous if-stack (Bug 7848)
+ if (grep { $_->{skip_parsing} == 1 } @if_stack) {
+ $skip_parsing = 1;
+ } else {
+ $skip_parsing = !$skip_parsing;
+ }
+
next;
}
Added: spamassassin/branches/3.4/t/if_else.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/if_else.t?rev=1888798&view=auto
==============================================================================
--- spamassassin/branches/3.4/t/if_else.t (added)
+++ spamassassin/branches/3.4/t/if_else.t Thu Apr 15 17:12:18 2021
@@ -0,0 +1,114 @@
+#!/usr/bin/perl -T
+
+use lib '.'; use lib 't';
+use SATest; sa_t_init("if_else");
+use Test::More tests => 21;
+
+# ---------------------------------------------------------------------------
+
+%patterns = (
+
+ q{ GTUBE }, 'gtube',
+ q{ SHOULD_BE_CALLED01 }, 'should_be_called01',
+ q{ SHOULD_BE_CALLED02 }, 'should_be_called02',
+ q{ SHOULD_BE_CALLED03 }, 'should_be_called03',
+ q{ SHOULD_BE_CALLED04 }, 'should_be_called04',
+ q{ SHOULD_BE_CALLED05 }, 'should_be_called05',
+ q{ SHOULD_BE_CALLED06 }, 'should_be_called06',
+ q{ SHOULD_BE_CALLED07 }, 'should_be_called07',
+
+);
+%anti_patterns = (
+
+ q{ SHOULD_NOT_BE_CALLED01 }, 'should_not_be_called01',
+ q{ SHOULD_NOT_BE_CALLED02 }, 'should_not_be_called02',
+ q{ SHOULD_NOT_BE_CALLED03 }, 'should_not_be_called03',
+ q{ SHOULD_NOT_BE_CALLED04 }, 'should_not_be_called04',
+ q{ SHOULD_NOT_BE_CALLED05 }, 'should_not_be_called05',
+ q{ SHOULD_NOT_BE_CALLED06 }, 'should_not_be_called06',
+ q{ SHOULD_NOT_BE_CALLED07 }, 'should_not_be_called07',
+ q{ SHOULD_NOT_BE_CALLED08 }, 'should_not_be_called08',
+ q{ SHOULD_NOT_BE_CALLED09 }, 'should_not_be_called09',
+ q{ SHOULD_NOT_BE_CALLED10 }, 'should_not_be_called10',
+ q{ SHOULD_NOT_BE_CALLED11 }, 'should_not_be_called11',
+ q{ SHOULD_NOT_BE_CALLED12 }, 'should_not_be_called12',
+
+);
+
+tstlocalrules (q{
+
+ if (0)
+ body SHOULD_NOT_BE_CALLED01 /./
+ endif
+
+ if (1)
+ body SHOULD_BE_CALLED01 /./
+ endif
+
+ if (0)
+ body SHOULD_NOT_BE_CALLED02 /./
+ else
+ body SHOULD_BE_CALLED02 /./
+ endif
+
+ if (1)
+ body SHOULD_BE_CALLED03 /./
+ else
+ body SHOULD_NOT_BE_CALLED03 /./
+ endif
+
+ if (1)
+ if (1)
+ body SHOULD_BE_CALLED04 /./
+ else
+ body SHOULD_NOT_BE_CALLED04 /./
+ endif
+ else
+ body SHOULD_NOT_BE_CALLED05 /./
+ endif
+
+ if (0)
+ if (0)
+ body SHOULD_NOT_BE_CALLED06 /./
+ else
+ # Bug 7848
+ body SHOULD_NOT_BE_CALLED07 /./
+ endif
+ else
+ body SHOULD_BE_CALLED05 /./
+ endif
+
+ if (0)
+ if (1)
+ body SHOULD_NOT_BE_CALLED08 /./
+ else
+ if (1)
+ # Bug 7848
+ body SHOULD_NOT_BE_CALLED09 /./
+ endif
+ endif
+ else
+ body SHOULD_BE_CALLED06 /./
+ endif
+
+ if (1)
+ if (0)
+ body SHOULD_NOT_BE_CALLED10 /./
+ else
+ if (0)
+ body SHOULD_NOT_BE_CALLED11 /./
+ else
+ if (0)
+ body SHOULD_NOT_BE_CALLED12 /./
+ else
+ body SHOULD_BE_CALLED07 /./
+ endif
+ endif
+ endif
+ endif
+
+});
+
+ok (sarun ("-L -t < data/spam/gtube.eml", \&patterns_run_cb));
+ok_all_patterns();
+
Propchange: spamassassin/branches/3.4/t/if_else.t
------------------------------------------------------------------------------
svn:executable = *
Modified: spamassassin/trunk/MANIFEST
URL: http://svn.apache.org/viewvc/spamassassin/trunk/MANIFEST?rev=1888798&r1=1888797&r2=1888798&view=diff
==============================================================================
--- spamassassin/trunk/MANIFEST (original)
+++ spamassassin/trunk/MANIFEST Thu Apr 15 17:12:18 2021
@@ -489,6 +489,7 @@ t/html_obfu.t
t/html_utf8.t
t/idn_dots.t
t/if_can.t
+t/if_else.t
t/ifversion.t
t/ip_addrs.t
t/lang_lint.t
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm?rev=1888798&r1=1888797&r2=1888798&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm Thu Apr 15 17:12:18 2021
@@ -357,7 +357,13 @@ sub parse {
goto failed_line;
}
- $skip_parsing = !$skip_parsing;
+ # Check if we are blocked anywhere in previous if-stack (Bug 7848)
+ if (grep { $_->{skip_parsing} == 1 } @if_stack) {
+ $skip_parsing = 1;
+ } else {
+ $skip_parsing = !$skip_parsing;
+ }
+
next;
}
Added: spamassassin/trunk/t/if_else.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/if_else.t?rev=1888798&view=auto
==============================================================================
--- spamassassin/trunk/t/if_else.t (added)
+++ spamassassin/trunk/t/if_else.t Thu Apr 15 17:12:18 2021
@@ -0,0 +1,114 @@
+#!/usr/bin/perl -T
+
+use lib '.'; use lib 't';
+use SATest; sa_t_init("if_else");
+use Test::More tests => 21;
+
+# ---------------------------------------------------------------------------
+
+%patterns = (
+
+ q{ GTUBE }, 'gtube',
+ q{ SHOULD_BE_CALLED01 }, 'should_be_called01',
+ q{ SHOULD_BE_CALLED02 }, 'should_be_called02',
+ q{ SHOULD_BE_CALLED03 }, 'should_be_called03',
+ q{ SHOULD_BE_CALLED04 }, 'should_be_called04',
+ q{ SHOULD_BE_CALLED05 }, 'should_be_called05',
+ q{ SHOULD_BE_CALLED06 }, 'should_be_called06',
+ q{ SHOULD_BE_CALLED07 }, 'should_be_called07',
+
+);
+%anti_patterns = (
+
+ q{ SHOULD_NOT_BE_CALLED01 }, 'should_not_be_called01',
+ q{ SHOULD_NOT_BE_CALLED02 }, 'should_not_be_called02',
+ q{ SHOULD_NOT_BE_CALLED03 }, 'should_not_be_called03',
+ q{ SHOULD_NOT_BE_CALLED04 }, 'should_not_be_called04',
+ q{ SHOULD_NOT_BE_CALLED05 }, 'should_not_be_called05',
+ q{ SHOULD_NOT_BE_CALLED06 }, 'should_not_be_called06',
+ q{ SHOULD_NOT_BE_CALLED07 }, 'should_not_be_called07',
+ q{ SHOULD_NOT_BE_CALLED08 }, 'should_not_be_called08',
+ q{ SHOULD_NOT_BE_CALLED09 }, 'should_not_be_called09',
+ q{ SHOULD_NOT_BE_CALLED10 }, 'should_not_be_called10',
+ q{ SHOULD_NOT_BE_CALLED11 }, 'should_not_be_called11',
+ q{ SHOULD_NOT_BE_CALLED12 }, 'should_not_be_called12',
+
+);
+
+tstlocalrules (q{
+
+ if (0)
+ body SHOULD_NOT_BE_CALLED01 /./
+ endif
+
+ if (1)
+ body SHOULD_BE_CALLED01 /./
+ endif
+
+ if (0)
+ body SHOULD_NOT_BE_CALLED02 /./
+ else
+ body SHOULD_BE_CALLED02 /./
+ endif
+
+ if (1)
+ body SHOULD_BE_CALLED03 /./
+ else
+ body SHOULD_NOT_BE_CALLED03 /./
+ endif
+
+ if (1)
+ if (1)
+ body SHOULD_BE_CALLED04 /./
+ else
+ body SHOULD_NOT_BE_CALLED04 /./
+ endif
+ else
+ body SHOULD_NOT_BE_CALLED05 /./
+ endif
+
+ if (0)
+ if (0)
+ body SHOULD_NOT_BE_CALLED06 /./
+ else
+ # Bug 7848
+ body SHOULD_NOT_BE_CALLED07 /./
+ endif
+ else
+ body SHOULD_BE_CALLED05 /./
+ endif
+
+ if (0)
+ if (1)
+ body SHOULD_NOT_BE_CALLED08 /./
+ else
+ if (1)
+ # Bug 7848
+ body SHOULD_NOT_BE_CALLED09 /./
+ endif
+ endif
+ else
+ body SHOULD_BE_CALLED06 /./
+ endif
+
+ if (1)
+ if (0)
+ body SHOULD_NOT_BE_CALLED10 /./
+ else
+ if (0)
+ body SHOULD_NOT_BE_CALLED11 /./
+ else
+ if (0)
+ body SHOULD_NOT_BE_CALLED12 /./
+ else
+ body SHOULD_BE_CALLED07 /./
+ endif
+ endif
+ endif
+ endif
+
+});
+
+ok (sarun ("-L -t < data/spam/gtube.eml", \&patterns_run_cb));
+ok_all_patterns();
+
Propchange: spamassassin/trunk/t/if_else.t
------------------------------------------------------------------------------
svn:executable = *