jarno
/
hydroxide-push
1
0
Fork 0
Code Issues Pull Requests Wiki Activity

smtp: fix sending message to plaintext and encrypted recipients

This commit is contained in:
emersion 2017-12-12 13:46:22 +01:00
parent d738fab6d7
commit 9569e66ccb
No known key found for this signature in database
GPG Key ID: 0FDE7BE0E88F5E48
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/hydroxide/hydroxide.go
View File

@ -145,6 +145,7 @@ func main() {
s.Addr = "127.0.0.1:" + port s.Addr = "127.0.0.1:" + port
s.Domain = "localhost" // TODO: make this configurable s.Domain = "localhost" // TODO: make this configurable
s.AllowInsecureAuth = true // TODO: remove this s.AllowInsecureAuth = true // TODO: remove this
//s.Debug = os.Stdout
log.Println("Starting SMTP server at", s.Addr) log.Println("Starting SMTP server at", s.Addr)
log.Fatal(s.ListenAndServe()) log.Fatal(s.ListenAndServe())

7
protonmail/protonmail.go
View File

@ -4,6 +4,7 @@ package protonmail
import ( import (
"bytes" "bytes"
"encoding/json" "encoding/json"
"fmt"
"io" "io"
"io/ioutil" "io/ioutil"
"net/http" "net/http"
@ -23,7 +24,8 @@ type resp struct {
func (r *resp) Err() error { func (r *resp) Err() error {
if err := r.apiError; err != nil { if err := r.apiError; err != nil {
return r.apiError err.code = r.Code
return err
} }
return nil return nil
} }
@ -33,11 +35,12 @@ type maybeError interface {
} }
type apiError struct { type apiError struct {
code int // populated by resp
Message string `json:"Error"` Message string `json:"Error"`
} }
func (err apiError) Error() string { func (err apiError) Error() string {
return err.Message return fmt.Sprintf("[%v] %v", err.code, err.Message)
} }
// Client is a ProtonMail API client. // Client is a ProtonMail API client.

2
smtp/smtp.go
View File

@ -237,7 +237,7 @@ func (u *user) Send(from string, to []string, r io.Reader) error {
if len(resp.Keys) == 0 { if len(resp.Keys) == 0 {
plaintextRecipients = append(plaintextRecipients, rcpt.Address) plaintextRecipients = append(plaintextRecipients, rcpt.Address)
break continue
} }
// TODO: only keys with Send == 1 // TODO: only keys with Send == 1