Skip to content

fix(tarpit): honor connection notes when there is no transaction - #3641

Merged
msimerson merged 2 commits into
haraka:masterfrom
ChandraChaan:fix/tarpit-connection-notes
Nov 3, 2026
Merged

msimerson merged 2 commits into
haraka:masterfrom
ChandraChaan:fix/tarpit-connection-notes

Conversation

@ChandraChaan

Copy link
Copy Markdown
Contributor

Changes proposed in this pull request:

  • tarpit returned early when connection.transaction was null, before reading connection.notes.tarpit. The note is documented in docs/plugins/tarpit.md, but the connect, helo and ehlo hooks run before a transaction exists, so the delay was skipped there.
  • It now uses connection.notes.tarpit, falling back to connection.transaction?.notes?.tarpit.
  • Adds a test for the no-transaction case and a CHANGELOG entry.

I did not run the tests locally. CI on my fork:

Checklist:

  • docs updated (no change needed, the docs already describe this behavior)
  • tests updated
  • CHANGELOG updated

@msimerson
msimerson merged commit f18875a into haraka:master Nov 3, 2026
18 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants