Mirrors/go-chasquid-smtp
1
0
Fork 0
mirror of https://blitiri.com.ar/repos/chasquid synced 2025-12-23 15:37:01 +00:00
Code Releases Activity

Normalize domains

Browse Source 
We should ignore the domains' case, and treat them uniformly, specially when it
comes to local domains.

This patch extends the existing normalization (IDNA, keeping domains as
UTF8 internally) to include case conversion and NFC form for
consistency.
This commit is contained in:
Alberto Bertogli
2016-10-09 16:05:25 +01:00
parent ad25706d72
commit 112e492c3a
7 changed files with 102 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
chasquid.go
View File

@@ -114,9 +114,12 @@ func main() {
// Load domains from "domains/".
glog.Infof("Domain config paths:")
for _, info := range mustReadDir("domains/") {
name := info.Name()
dir := filepath.Join("domains", name)
loadDomain(name, dir, s)
domain, err := normalize.Domain(info.Name())
if err != nil {
glog.Fatalf("Invalid name %+q: %v", info.Name(), err)
}
dir := filepath.Join("domains", info.Name())
loadDomain(domain, dir, s)
}
// Always include localhost as local domain.
@@ -665,7 +668,7 @@ func (c *Conn) MAIL(params string) (code int, msg string) {
"SPF check failed: %v", c.spfError)
}
addr, err = envelope.IDNAToUnicode(addr)
addr, err = normalize.DomainToUnicode(addr)
if err != nil {
return 501, "malformed address (IDNA conversion failed)"
}
@@ -724,7 +727,7 @@ func (c *Conn) RCPT(params string) (code int, msg string) {
return 501, "malformed address"
}
addr, err := envelope.IDNAToUnicode(e.Address)
addr, err := normalize.DomainToUnicode(e.Address)
if err != nil {
return 501, "malformed address (IDNA conversion failed)"
}