Rspamd plugin: restore spam report header #1702

Merged
merged 1 commit into from Nov 11, 2016

Conversation

Projects
None yet
4 participants
@fatalbanana
Contributor

fatalbanana commented Nov 11, 2016

Fixes #1563

Maybe I should just PR this. I planned to try make this header look better but I've not gotten round to that (nor other things in mind for Haraka & rspamd plugin) yet. @msimerson doesn't like having stuff nested under default and well, it is strange, but the idea is to really have the raw response from rspamd which makes this necessary evil. :)

Changes proposed in this pull request:

  • Restore spam report header
  • Round down scores for spambar
  • Restore untampered rspamd JSON
  • Logs should be unaffected

Checklist:

  • [N/A] docs updated
  • [YEBO] tests updated
Rspamd plugin: restore spam report header
 - Also round down scores for spambar
@codecov-io

This comment has been minimized.

Show comment
Hide comment
@codecov-io

codecov-io Nov 11, 2016

Current coverage is 36.03% (diff: 100%)

Merging #1702 into master will decrease coverage by 0.09%

@@             master      #1702   diff @@
==========================================
  Files            24         24          
  Lines          6053       6053          
  Methods         781        781          
  Messages          0          0          
  Branches       1531       1531          
==========================================
- Hits           2187       2181     -6   
- Misses         3866       3872     +6   
  Partials          0          0          

Powered by Codecov. Last update ca6b2b4...88b5c9a

codecov-io commented Nov 11, 2016

Current coverage is 36.03% (diff: 100%)

Merging #1702 into master will decrease coverage by 0.09%

@@             master      #1702   diff @@
==========================================
  Files            24         24          
  Lines          6053       6053          
  Methods         781        781          
  Messages          0          0          
  Branches       1531       1531          
==========================================
- Hits           2187       2181     -6   
- Misses         3866       3872     +6   
  Partials          0          0          

Powered by Codecov. Last update ca6b2b4...88b5c9a

@msimerson msimerson merged commit 6cc93ae into haraka:master Nov 11, 2016

3 checks passed

codecov/patch Coverage not affected when comparing ca6b2b4...88b5c9a
Details
codecov/project Absolute coverage decreased by -0.09% but relative coverage increased by +63.86% compared to ca6b2b4
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@msimerson

This comment has been minimized.

Show comment
Hide comment
@msimerson

msimerson Nov 11, 2016

Member

the idea is to really have the raw response from rspamd

Right, so instead of tucking it under an ambigious name like default, instead choose something descriptive like rawResult, rawFromRspamd or some such.

Member

msimerson commented Nov 11, 2016

the idea is to really have the raw response from rspamd

Right, so instead of tucking it under an ambigious name like default, instead choose something descriptive like rawResult, rawFromRspamd or some such.

@fatalbanana

This comment has been minimized.

Show comment
Hide comment
@fatalbanana

fatalbanana Nov 11, 2016

Contributor

Thing it's tucked under is called data (vs log which contains cleaned data). default is part of the response from rspamd.

Contributor

fatalbanana commented Nov 11, 2016

Thing it's tucked under is called data (vs log which contains cleaned data). default is part of the response from rspamd.

@smfreegard

This comment has been minimized.

Show comment
Hide comment
@smfreegard

smfreegard Nov 11, 2016

Collaborator

It also wouldn't be called default if rspamd 'settings' were used e.g. per-user, per-domain etc. would it?

Collaborator

smfreegard commented Nov 11, 2016

It also wouldn't be called default if rspamd 'settings' were used e.g. per-user, per-domain etc. would it?

@fatalbanana

This comment has been minimized.

Show comment
Hide comment
@fatalbanana

fatalbanana Nov 11, 2016

Contributor

My understanding is that non-default metrics are never actually used in rspamd and that setttings module has supplanted this functionality (ie. it rewrites the default metric).

Contributor

fatalbanana commented Nov 11, 2016

My understanding is that non-default metrics are never actually used in rspamd and that setttings module has supplanted this functionality (ie. it rewrites the default metric).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment