archive/nntpchan
Archived
1
0
Fork 0
Code

Merge pull request #163 from cathugger/master

Browse Source 
srnd: properly parse email addresses
This commit is contained in:
Jeff 2018-12-03 09:10:48 -05:00 committed by GitHub
commit 22eb29c8ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
contrib/backends/srndv2/src/srnd/message.go
View File

@ -295,12 +295,20 @@ func (self *nntpArticle) Newsgroup() string {
} }
func (self *nntpArticle) Name() string { func (self *nntpArticle) Name() string {
from := self.headers.Get("From", "anonymous <a@no.n>") const defname = "Anonymous"
idx := strings.Index(from, "<") from := strings.TrimSpace(self.headers.Get("From", ""))
if idx > 1 { if from == "" {
return from[:idx] 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) { func (self *nntpArticle) Addr() (addr string) {
@ -327,13 +335,15 @@ func (self *nntpArticle) Addr() (addr string) {
} }
func (self *nntpArticle) Email() string { func (self *nntpArticle) Email() string {
from := self.headers.Get("From", "anonymous <a@no.n>") from := strings.TrimSpace(self.headers.Get("From", ""))
idx := strings.Index(from, "<") if from == "" {
if idx > 2 { return ""
return from[:idx-2]
} }
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 { func (self *nntpArticle) Subject() string {