spamassassin: strip useless WS from tests #2624
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
msimerson
force-pushed
the
spamassassin-header-clean
branch
from
eb2652d
to
1e79233
Compare
This comment has been minimized.
This comment has been minimized.
baudehlo
requested changes
Apr 3, 2019
| @@ -105,7 +105,7 @@ exports.hook_data_post = function (next, connection) { | |||
| if (!connection.transaction) return next(); | |||
|
|
|||
| if (spamd_response.headers && spamd_response.headers.Tests) { | |||
| spamd_response.tests = spamd_response.headers.Tests; | |||
| spamd_response.tests = spamd_response.headers.Tests.replace(/\s/g, ''); | |||
There was a problem hiding this comment.
Suggested change
| spamd_response.tests = spamd_response.headers.Tests.replace(/\s/g, ''); | |
| spamd_response.tests = spamd_response.headers.Tests.replace(/\s+/g, ' '); |
There might be a good reason this isn't a good fix, but the one included here looks odd to me.
There was a problem hiding this comment.
I'm not looking to replace multiples of WS (your suggestion) with a single space (your suggestion). There's currently some SMTP line folding included in the string. My goal is to strip out all the WS chars (in this case, sets of \r\n\t and/or \r\n\s+).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
before
[spamassassin] status=No, score=-7.7, required=5.0, reject=0, tests="BAYES_99,BAYES_999,DCC_CHECK,DKIMWL_WL_HIGH,DKIM_SIGNED,\r DKIM_VALID,DKIM_VALID_AU,HTML_MESSAGE,LOW_PRICE,RCVD_IN_DNSWL_NONE,\r SPF_PASS,URI_HEX,USER_IN_DEF_DKIM_WL,USER_IN_DEF_SPF_WL"note the silly "\r " plus invisible whitespace which doesn't wrap in the console/logs anyway.
after
[spamassassin] status=No, score=-4.4, required=5.0, reject=0, tests="BAYES_00,DCC_CHECK,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,FROM_EXCESS_BASE64,HTML_IMAGE_RATIO_04,HTML_MESSAGE,RCVD_IN_DNSWL_NONE,RCVD_IN_RP_CERTIFIED,RCVD_IN_RP_SAFE,SPF_PASS"