Skip to content

Commit

Permalink
Do not return CAPABILITIES after ManageSieve AUTH=PLAIN SASL exchange (
Browse files Browse the repository at this point in the history
…closes #548)
  • Loading branch information
mdecimus committed Jun 23, 2024
1 parent a1aa12f commit e149aca
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 9 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ Key features:
- **SMTP** server:
- Built-in [DMARC](https://datatracker.ietf.org/doc/html/rfc7489), [DKIM](https://datatracker.ietf.org/doc/html/rfc6376), [SPF](https://datatracker.ietf.org/doc/html/rfc7208) and [ARC](https://datatracker.ietf.org/doc/html/rfc8617) support for message authentication.
- Strong transport security through [DANE](https://datatracker.ietf.org/doc/html/rfc6698), [MTA-STS](https://datatracker.ietf.org/doc/html/rfc8461) and [SMTP TLS](https://datatracker.ietf.org/doc/html/rfc8460) reporting.
- Inbound throttling and filtering with granular configuration rules, sieve scripting and milter integration.
- Inbound throttling and filtering with granular configuration rules, sieve scripting, MTA hooks and milter integration.
- Distributed virtual queues with delayed delivery, priority delivery, quotas, routing rules and throttling support.
- Envelope rewriting and message modification.
- **Spam Phishing** filter:
Expand All @@ -81,6 +81,7 @@ Key features:
- Email aliases, mailing lists, subaddressing and catch-all addresses support.
- Automatic account configuration and discovery with [autoconfig](https://www.ietf.org/id/draft-bucksch-autoconfig-02.html) and [autodiscover](https://learn.microsoft.com/en-us/exchange/architecture/client-access/autodiscover?view=exchserver-2019).
- Integration with **OpenTelemetry** to enable monitoring, tracing, and performance analysis.
- Webhooks for event-driven automation.
- Disk quotas.
- **Web-based administration**:
- Account, domain, group and mailing list management.
Expand Down
5 changes: 1 addition & 4 deletions crates/managesieve/src/op/authenticate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -164,10 +164,7 @@ impl<T: SessionStream> Session<T> {
in_flight,
};

let _ = self
.write(&StatusResponse::ok("Authentication successful").into_bytes())
.await;
self.handle_capability("Authentication successful").await
Ok(StatusResponse::ok("Authentication successful").into_bytes())
} else {
match &self.state {
State::NotAuthenticated { auth_failures }
Expand Down
8 changes: 4 additions & 4 deletions tests/src/imap/managesieve.rs
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ pub async fn test() {
.send("AUTHENTICATE \"PLAIN\" \"AGpkb2VAZXhhbXBsZS5jb20Ac2VjcmV0\"")
.await;
sieve.assert_read(ResponseType::Ok).await;
sieve
.assert_read(ResponseType::Ok)
.await
.assert_contains("MAXREDIRECTS");
/*sieve
.assert_read(ResponseType::Ok)
.await
.assert_contains("MAXREDIRECTS");*/

// CheckScript
sieve.send("CHECKSCRIPT \"if true { keep; }\"").await;
Expand Down

0 comments on commit e149aca

Please sign in to comment.