archive/nntpchan
Archived
1
0
Fork 0
Code

fix

Browse Source
This commit is contained in:
Jeff 2017-04-20 18:00:59 -04:00
parent aca6a0dfa4
commit db03367945
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/backends/srndv2/src/srnd/mod.go
View File

@ -315,17 +315,19 @@ func (mod *modEngine) HandleMessage(msgid string) {
pubkey := nntp.Pubkey() pubkey := nntp.Pubkey()
for _, line := range strings.Split(nntp.Message(), "\n") { for _, line := range strings.Split(nntp.Message(), "\n") {
line = strings.Trim(line, "\r\t\n ") line = strings.Trim(line, "\r\t\n ")
if len(line) > 0 {
ev := ParseModEvent(line) ev := ParseModEvent(line)
mod.Execute(ev, pubkey) mod.Execute(ev, pubkey)
} }
} }
}
} }
func (mod *modEngine) Do(ev ModEvent) { func (mod *modEngine) Do(ev ModEvent) {
action := ev.Action() action := ev.Action()
target := ev.Target() target := ev.Target()
if action == ModDelete || action == ModDeleteAlt { if action == ModDelete || action == ModDeleteAlt {
msgid := ev.Target() msgid := target
if !ValidMessageID(msgid) { if !ValidMessageID(msgid) {
// invalid message-id // invalid message-id
log.Println("invalid message-id", msgid) log.Println("invalid message-id", msgid)

6
contrib/backends/srndv2/src/srnd/store.go
View File

@ -469,11 +469,11 @@ func (self *articleStore) GetMessage(msgid string) (nntp NNTPMessage) {
R: msg.Body, R: msg.Body,
N: MaxMessageSize, N: MaxMessageSize,
} }
err = read_message_body(body, hdr, nil, nil, true, func(nntp NNTPMessage) { err = read_message_body(body, hdr, nil, nil, true, func(n NNTPMessage) {
c := chnl c := chnl
// inject pubkey for mod // inject pubkey for mod
nntp.Headers().Set("X-PubKey-Ed25519", hdr.Get("X-PubKey-Ed25519")) n.Headers().Set("X-PubKey-Ed25519", hdr.Get("X-PubKey-Ed25519"))
c <- nntp c <- n
close(c) close(c)
}) })
if err == nil { if err == nil {