letsencrypt
/
boulder
mirror of https://github.com/letsencrypt/boulder.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move email validation to seperate function

This commit is contained in:
Roland Shoemaker 2015-06-06 06:37:29 -07:00
parent 28db5aab45
commit 643bc4279c
1 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
ra/registration-authority.go
View File

@ -49,6 +49,27 @@ func lastPathSegment(url core.AcmeURL) string {
return allButLastPathSegment.ReplaceAllString(url.Path, "")
}
func validateEmail(address string) (err error) {
_, err = mail.ParseAddress(address)
if err != nil {
err = core.MalformedRequestError(err.Error())
return
}
splitEmail := strings.SplitN(address, "@", -1)
domain := strings.ToLower(splitEmail[len(splitEmail)-1])
var mx []*net.MX
mx, err = net.LookupMX(domain)
if err != nil {
err = core.InternalServerError(err.Error())
return
}
if len(mx) == 0 {
err = core.MalformedRequestError(fmt.Sprintf("No MX record for domain %s", domain))
return
}
return
}
type certificateRequestEvent struct {
ID string `json:",omitempty"`
Requester int64 `json:",omitempty"`
@ -76,30 +97,18 @@ func (ra *RegistrationAuthorityImpl) NewRegistration(init core.Registration) (re
reg.MergeUpdate(init)
for _, contact := range reg.Contact {
// If contact email provided check MX records exist for the domain
if !strings.HasPrefix(contact.Scheme, "mailto") && !strings.HasPrefix(contact.Scheme, "tel") {
switch contact.Scheme {
case "tel":
continue
case "mailto":
err = validateEmail(contact.Opaque)
if err != nil {
return
}
default:
err = core.MalformedRequestError(fmt.Sprintf("Contact method %s is not supported", contact.Scheme))
return
}
if contact.Scheme == "mailto" {
_, err = mail.ParseAddress(contact.Opaque)
if err != nil {
err = core.MalformedRequestError(err.Error())
return
}
splitEmail := strings.SplitN(contact.Opaque, "@", -1)
domain := strings.ToLower(splitEmail[len(splitEmail)-1])
var mx []*net.MX
mx, err = net.LookupMX(domain)
if err != nil {
err = core.InternalServerError(err.Error())
return
}
if len(mx) == 0 {
err = core.MalformedRequestError(fmt.Sprintf("No MX record for domain %s", domain))
return
}
}
}
// Store the authorization object, then return it
@ -107,6 +116,7 @@ func (ra *RegistrationAuthorityImpl) NewRegistration(init core.Registration) (re
if err != nil {
err = core.InternalServerError(err.Error())
}
return
}