Thanks for the trouble report John and Giovanni.

Found missing rule eval registration in VBounce.pm for
check_whitelist_bounce_relays

And yes, the WLBLEval.pm plugin being disabled raises the issues due to our
logic for ifplugin/if/else/endif that isn't perfect.  I have added more
nested plugin checks so that this collision is avoided.

This fixes these issues:
Dec 30 16:42:42.035 [2012449] warn: rules: error: unknown eval
'check_from_in_whitelist' for USER_IN_WELCOMELIST
Dec 30 16:42:42.097 [2012449] warn: rules: error: unknown eval
'check_to_in_whitelist' for USER_IN_WELCOMELIST_TO

SpamAssassin 4.0 now passes lint cleanly with and without WLBLEval Plugin
enabled.

SA 3.4.5 also passes lint cleanly with the new, yet to be published
60_whitelist.cf

However autolearn.t had two warnings:

Dec 30 18:11:09.626 [2018884] warn: rules: error: unknown eval
'check_from_in_blacklist_to' for USER_IN_BLOCKLIST_TO
Dec 30 18:11:09.844 [2018884] warn: rules: error: unknown eval
'check_welcomelist_bounce_relays' for __MY_SERVERS_FOUND

One was a misspelling of check_from_in_blacklist_to instead of
check_to_in_blacklist which passed tests for 4.0.

The second was 20_vbounce.cf missing logic for 3.4 vs 4.0 which was
surprisingly uncomplicated because it's an eval function change only.

This fixed the regression tests for 3.4 with all modules.t as well

The basic_lint was a meta rule misspelling in two places that had block vs
black wrong which passed for the 4.0 path but not 3.4.

In short, I believe we have resolved everything from the most recent
omnibus patch.  Will add a make test for both 4.0 and 3.4 branch as well as
lints looking for warnings in the future because those steps unearthed some
extra issues hidden when only make test for 4.0 was run to test the patch.

Regards,
KAM
--
Kevin A. McGrail
Member, Apache Software Foundation
Chair Emeritus Apache SpamAssassin Project
https://www.linkedin.com/in/kmcgrail - 703.798.0171


On Wed, Dec 30, 2020 at 6:56 PM John Hardin <jhar...@impsec.org> wrote:

> On Wed, 30 Dec 2020, bugzilla-dae...@spamassassin.apache.org wrote:
>
> > https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7826
> >
> > --- Comment #61 from Kevin A. McGrail <kmcgr...@apache.org> ---
> > svn commit -m 'Found missing rule eval registration in VBounce.pm for
> > check_whitelist_bounce_relays and changed 60_whitelist.cf hierarchy to
> handle
> > ifplugin/if/else/endif problems'
> > Sending        lib/Mail/SpamAssassin/Plugin/VBounce.pm
> > Sending        rules/60_whitelist.cf
> > Transmitting file data ..done
> > Committing transaction...
> > Committed revision 1884961.
>
> My scripted lint tests now pass again. Thanks, Kevin.
>
> I did not run a full test, so I don't know about the regression tests
> Giovanni reported.
>
>
> --
>   John Hardin KA7OHZ                    http://www.impsec.org/~jhardin/
>   jhar...@impsec.org                         pgpk -a jhar...@impsec.org
>   key: 0xB8732E79 -- 2D8C 34F4 6411 F507 136C  AF76 D822 E6E6 B873 2E79
> -----------------------------------------------------------------------
>   214 days since the first private commercial manned orbital mission
> (SpaceX)
>

Reply via email to