add reject from origin domain feature by cyd01 · Pull Request #375 · inbucket/inbucket

cyd01 · 2023-07-20T15:44:42Z

Add a new feature to be able to reject email from specific domains.
The list of domains to reject is defined in a new environment variable INBUCKET_SMTP_REJECTORIGINDOMAINS.
This variable is a coma separated strings list (like INBUCKET_SMTP_ACCEPTDOMAINS, INBUCKET_SMTP_REJECTDOMAINS, ...).

Signed-off-by: Cyril Dupont [email protected]

Signed-off-by: Cyril Dupont <[email protected]>

jhillyerd

This needs test coverage. I'd suggest cloning the TestReadyStateInvalidCommands func in handler_test.go and modifying it to do so.

pkg/policy/address.go

pkg/server/smtp/handler.go

jhillyerd

Looks good overall. But the tests no longer compile. If you are on Linux or similar, you can run the entire suite by just typing make

pkg/policy/address.go

pkg/policy/origin.go

jhillyerd · 2023-08-14T19:56:55Z

Let me know if there is anything I can do to help with this one, seems like we are pretty close.

cyd01 · 2023-08-15T08:45:50Z

I'm sorry for not answering. I'm on summer hollydays. I'll be back at work next week.

cyd01 · 2023-08-23T18:05:09Z

I've tryed to fix the issue with tests compilation (in file pkg/message/manager_test.go).
But now the Github build process does not work (it work on my side with a simple go build ./cmd/inbucket/ command).
it seems I need help.

jhillyerd · 2023-08-23T19:31:51Z

It looks like you did fix the compilation. Go doesn't run tests when you compile, but you can run the smtp tests with

go test ./pkg/server/smtp

looks like we are getting an unexpected SMTP response code

--- FAIL: TestEmptyEnvelope (0.00s)
    writer.go:25: {"level":"info","module":"smtp","remote":"pipe","session":17,"message":"Starting SMTP session"}
    writer.go:25: {"level":"debug","module":"smtp","remote":"pipe","session":17,"message":"Line received: HELO localhost"}
    writer.go:25: {"level":"debug","module":"smtp","remote":"pipe","session":17,"message":"Entering state READY"}
    writer.go:25: {"level":"debug","module":"smtp","remote":"pipe","session":17,"message":"Line received: MAIL FROM:<>"}
    writer.go:25: {"level":"debug","module":"smtp","remote":"pipe","session":17,"message":"Mail sender is "}
    writer.go:25: {"level":"debug","module":"smtp","remote":"pipe","session":17,"message":"Origin domain is "}
    writer.go:25: {"level":"warn","module":"smtp","remote":"pipe","session":17,"from":"unspecified","error":"Domain part validation failed","message":"Bad address as MAIL arg"}
    writer.go:25: {"level":"debug","module":"smtp","remote":"pipe","session":17,"message":"Line received: QUIT"}
    handler_test.go:98: Step 1, sent "MAIL FROM:<>", expected 250, got 501: "Bad origin address syntax"
    writer.go:25: {"level":"info","module":"smtp","remote":"pipe","session":18,"message":"Starting SMTP session"}
    writer.go:25: {"level":"debug","module":"smtp","remote":"pipe","session":18,"message":"Line received: HELO localhost"}
    writer.go:25: {"level":"debug","module":"smtp","remote":"pipe","session":18,"message":"Entering state READY"}
    writer.go:25: {"level":"debug","module":"smtp","remote":"pipe","session":18,"message":"Line received: MAIL FROM: <>"}
    writer.go:25: {"level":"debug","module":"smtp","remote":"pipe","session":18,"message":"Mail sender is "}
    writer.go:25: {"level":"debug","module":"smtp","remote":"pipe","session":18,"message":"Origin domain is "}
    writer.go:25: {"level":"warn","module":"smtp","remote":"pipe","session":18,"from":"unspecified","error":"Domain part validation failed","message":"Bad address as MAIL arg"}
    writer.go:25: {"level":"debug","module":"smtp","remote":"pipe","session":18,"message":"Line received: QUIT"}
    handler_test.go:107: Step 1, sent "MAIL FROM: <>", expected 250, got 501: "Bad origin address syntax"
    writer.go:25: {"level":"debug","module":"smtp","remote":"pipe","session":18,"message":"Entering state QUIT"}
    writer.go:25: {"level":"info","module":"smtp","remote":"pipe","session":18,"message":"Closing connection"}
    writer.go:25: {"level":"debug","module":"smtp","remote":"pipe","session":17,"message":"Entering state QUIT"}
    writer.go:25: {"level":"info","module":"smtp","remote":"pipe","session":17,"message":"Closing connection"}
--- FAIL: TestReadyStateRejectedDomains (0.00s)
    --- FAIL: TestReadyStateRejectedDomains/[email protected] (0.00s)
        writer.go:25: {"level":"info","module":"smtp","remote":"pipe","session":35,"message":"Starting SMTP session"}
        writer.go:25: {"level":"debug","module":"smtp","remote":"pipe","session":35,"message":"Line received: HELO localhost"}
        writer.go:25: {"level":"debug","module":"smtp","remote":"pipe","session":35,"message":"Entering state READY"}
        writer.go:25: {"level":"debug","module":"smtp","remote":"pipe","session":35,"message":"Line received: MAIL FROM [email protected]"}
        writer.go:25: {"level":"warn","module":"smtp","remote":"pipe","session":35,"message":"Bad MAIL argument: \"FROM [email protected]\""}
        writer.go:25: {"level":"debug","module":"smtp","remote":"pipe","session":35,"message":"Line received: QUIT"}
        handler_test.go:219: Step 1, sent "MAIL FROM [email protected]", expected 250, got 501: "Was expecting MAIL arg syntax of FROM:<address>"
        writer.go:25: {"level":"debug","module":"smtp","remote":"pipe","session":35,"message":"Entering state QUIT"}
        writer.go:25: {"level":"info","module":"smtp","remote":"pipe","session":35,"message":"Closing connection"}
FAIL
FAIL    github.com/inbucket/inbucket/pkg/server/smtp    0.011s
FAIL

jhillyerd

Looks great overall, just a couple small tweaks

pkg/policy/address.go

Signed-off-by: Cyril Dupont <[email protected]>

jhillyerd · 2023-08-26T18:05:29Z

Thank you!

add reject from origin domain feature

0f452d0

Signed-off-by: Cyril Dupont <[email protected]>

cyd01 mentioned this pull request Jul 20, 2023

Support rejecting/dropping mail based on From domain #245

Closed

jhillyerd requested changes Jul 26, 2023

View reviewed changes

pkg/policy/address.go Outdated Show resolved Hide resolved

pkg/server/smtp/handler.go Outdated Show resolved Hide resolved

pkg/server/smtp/handler.go Outdated Show resolved Hide resolved

jhillyerd requested changes Jul 28, 2023

View reviewed changes

pkg/policy/address.go Outdated Show resolved Hide resolved

pkg/policy/origin.go Outdated Show resolved Hide resolved

cyd01 requested a review from jhillyerd August 25, 2023 06:14

jhillyerd mentioned this pull request Aug 25, 2023

Docs and web UI for reject origin domain #380

Closed

jhillyerd requested changes Aug 25, 2023

View reviewed changes

pkg/policy/address.go Outdated Show resolved Hide resolved

pkg/policy/address.go Outdated Show resolved Hide resolved

Cyril DUPONT added 2 commits August 26, 2023 16:45

fix: add new origin.o file to manage origin domain

d27e95f

Signed-off-by: Cyril Dupont <[email protected]>

fix: change stmp test return codes for empty FROM

e57691c

Signed-off-by: Cyril Dupont <[email protected]>

jhillyerd approved these changes Aug 26, 2023

View reviewed changes

jhillyerd merged commit 06ec140 into inbucket:main Aug 26, 2023

This was referenced Oct 29, 2023

Reject invalidomain with joker #411

Closed

Reject invalidomain with wildcards #412

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

add reject from origin domain feature#375

add reject from origin domain feature#375
jhillyerd merged 3 commits intoinbucket:mainfrom
cyd01:main

cyd01 commented Jul 20, 2023

Uh oh!

jhillyerd left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jhillyerd left a comment

Uh oh!

Uh oh!

Uh oh!

jhillyerd commented Aug 14, 2023

Uh oh!

cyd01 commented Aug 15, 2023

Uh oh!

cyd01 commented Aug 23, 2023

Uh oh!

jhillyerd commented Aug 23, 2023

Uh oh!

jhillyerd left a comment

Uh oh!

Uh oh!

Uh oh!

jhillyerd commented Aug 26, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

cyd01 commented Jul 20, 2023

Uh oh!

jhillyerd left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jhillyerd left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

jhillyerd commented Aug 14, 2023

Uh oh!

cyd01 commented Aug 15, 2023

Uh oh!

cyd01 commented Aug 23, 2023

Uh oh!

jhillyerd commented Aug 23, 2023

Uh oh!

jhillyerd left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

jhillyerd commented Aug 26, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants