统一协议邮箱标识认证处理
Security Checks / security (push) Waiting to run

This commit is contained in:
xuans committed 2026-08-30 23:03:36 +08:00
1 parent e603295df3
commit 3a6582c722
5 files changed
+58 -9

No files matched your search

+43
View File
@@ -106,3 +106,46 @@ func TestHasAuthRequiresMailboxOwnershipForAdministrators(t *testing.T) {
t.Fatal("administrator bypassed mailbox ownership")
}
}
func TestProtocolAuthenticationAcceptsConfiguredFullEmailIdentifier(t *testing.T) {
oldConfig := config.Instance
oldDB := db.Instance
config.Instance = &config.Config{
DbType: config.DBTypeSQLite,
DbDSN: filepath.Join(t.TempDir(), "full-email-auth.db"),
Domain: "example.com",
Domains: []string{"example.com"},
}
if err := db.Init(""); err != nil {
t.Fatal(err)
}
t.Cleanup(func() {
if db.Instance != nil && db.Instance != oldDB {
_ = db.Instance.Close()
}
db.Instance = oldDB
config.Instance = oldConfig
})
user := models.User{Account: "alice", Name: "Alice"}
if err := SetPassword(&user, "CorrectP12"); err != nil {
t.Fatal(err)
}
if _, err := db.Instance.Insert(&user); err != nil {
t.Fatal(err)
}
for _, protocol := range []string{"smtp", "imap", "pop3"} {
got, err := AuthenticateProtocol(protocol, "192.0.2.10:12345", " Alice@Example.com ", "CorrectP12")
if err != nil {
t.Fatalf("%s full email authentication failed: %v", protocol, err)
}
if got == nil || got.Account != "alice" {
t.Fatalf("%s authenticated user = %+v", protocol, got)
}
}
if _, err := AuthenticateProtocol("imap", "192.0.2.10:12345", "alice@other.example", "CorrectP12"); err == nil {
t.Fatal("unconfigured email domain should be rejected")
}
}
+5 -2
View File
@@ -42,7 +42,10 @@ var (
)
func AuthenticateProtocol(protocol string, remoteAddress string, account string, plain string) (*models.User, error) {
normalizedAccount := strings.ToLower(NormalizeAccount(account))
normalizedAccount := strings.ToLower(strings.TrimSpace(account))
if resolvedAccount, err := NormalizeIdentifier(account); err == nil {
normalizedAccount = resolvedAccount
}
normalizedRemote := protocolRemoteHost(remoteAddress)
pairKey := hashedProtocolLoginKey("pair", protocol, normalizedRemote, normalizedAccount)
accountKey := hashedProtocolLoginKey("account", normalizedAccount)
@@ -51,7 +54,7 @@ func AuthenticateProtocol(protocol string, remoteAddress string, account string,
if protocolPairAttempts.blocked(pairKey) || protocolAccountAttempts.blocked(accountKey) || protocolRemoteAttempts.blocked(remoteKey) {
return nil, errors.New("invalid credentials")
}
user, err := Authenticate(account, plain)
user, err := AuthenticateIdentifier(account, plain)
if err != nil {
protocolPairAttempts.recordFailure(pairKey)
protocolAccountAttempts.recordFailure(accountKey)