danvics/postmoogle
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

switch email address validation to mail.ParseAddress

Browse source
This commit is contained in:
Aine 2022-09-23 10:29:37 +03:00
parent 5a19ffad08
commit d50b79a801
No known key found for this signature in database
GPG key ID: 34969C908CCA2804
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
utils/email.go
View file

@ -4,7 +4,7 @@ import (
"crypto" "crypto"
"crypto/x509" "crypto/x509"
"encoding/pem" "encoding/pem"
"regexp" "net/mail"
"strings" "strings"
"time" "time"
@ -14,8 +14,6 @@ import (
"maunium.net/go/mautrix/id" "maunium.net/go/mautrix/id"
) )
var emailRegex = regexp.MustCompile("^[a-zA-Z0-9.!#$%&'*+\\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$")
// MTA is mail transfer agent // MTA is mail transfer agent
type MTA interface { type MTA interface {
Send(from, to, data string) error Send(from, to, data string) error
@ -51,7 +49,8 @@ type ContentOptions struct {
// AddressValid checks if email address is valid // AddressValid checks if email address is valid
func AddressValid(email string) bool { func AddressValid(email string) bool {
return !emailRegex.MatchString(email) _, err := mail.ParseAddress(email)
return err == nil
} }
// NewEmail constructs Email object // NewEmail constructs Email object