srnd: properly parse email addresses

this replaces faulty address parsing code with calls to stdlib' email parser and some reasonable fallbacks.
note that nntpArticle.Email() function was completely incorrect, but it's not used anywhere in code, apparently.
This commit is contained in:
cathugger committed 2018-12-03 14:54:08 +02:00
1 parent 05ebac9aa5
commit 740bf82a1e
1 file changed
+21 -11
+21 -11
View File
@@ -295,12 +295,20 @@ func (self *nntpArticle) Newsgroup() string {
}
func (self *nntpArticle) Name() string {
from := self.headers.Get("From", "anonymous <a@no.n>")
idx := strings.Index(from, "<")
if idx > 1 {
return from[:idx]
const defname = "Anonymous"
from := strings.TrimSpace(self.headers.Get("From", ""))
if from == "" {
return defname
}
return "[Invalid From header]"
a, e := mail.ParseAddress(from)
if e != nil {
return fmt.Sprintf("[Invalid From header: %v]", e)
}
name := strings.TrimSpace(a.Name)
if name == "" {
return defname
}
return name
}
func (self *nntpArticle) Addr() (addr string) {
@@ -327,13 +335,15 @@ func (self *nntpArticle) Addr() (addr string) {
}
func (self *nntpArticle) Email() string {
from := self.headers.Get("From", "anonymous <a@no.n>")
idx := strings.Index(from, "<")
if idx > 2 {
return from[:idx-2]
from := strings.TrimSpace(self.headers.Get("From", ""))
if from == "" {
return ""
}
return "[Invalid From header]"
a, e := mail.ParseAddress(from)
if e != nil {
return fmt.Sprintf("[Invalid From header: %v]", e)
}
return a.Address
}
func (self *nntpArticle) Subject() string {