Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-19 00:27:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: don't doubly apply 822 texwrapper

Browse Source
This commit is contained in:
James Houlahan
2020-09-03 13:41:03 +02:00
parent 5d0e3f36b4
commit 3e8e3c912b
1 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/message/parser.go
View File

@ -30,7 +30,6 @@ import (
pmmime "github.com/ProtonMail/proton-bridge/pkg/mime" pmmime "github.com/ProtonMail/proton-bridge/pkg/mime"
"github.com/ProtonMail/proton-bridge/pkg/pmapi" "github.com/ProtonMail/proton-bridge/pkg/pmapi"
"github.com/emersion/go-message" "github.com/emersion/go-message"
"github.com/emersion/go-textwrapper"
"github.com/jaytaylor/html2text" "github.com/jaytaylor/html2text"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
@ -76,10 +75,7 @@ func Parse(r io.Reader, key, keyName string) (m *pmapi.Message, mimeBody, plainB
// signed/encrypted external recipients. It's not important for it to be // signed/encrypted external recipients. It's not important for it to be
// collected as an attachment; that's already done when we upload the draft. // collected as an attachment; that's already done when we upload the draft.
if key != "" { if key != "" {
if err = attachPublicKey(p.Root(), key, keyName); err != nil { attachPublicKey(p.Root(), key, keyName)
err = errors.Wrap(err, "failed to attach public key")
return
}
} }
mimeBodyBuffer := new(bytes.Buffer) mimeBodyBuffer := new(bytes.Buffer)
@ -346,25 +342,17 @@ func getPlainBody(part *parser.Part) []byte {
} }
} }
func attachPublicKey(p *parser.Part, key, keyName string) error { func attachPublicKey(p *parser.Part, key, keyName string) {
h := message.Header{} h := message.Header{}
h.Set("Content-Type", fmt.Sprintf(`application/pgp-keys; name="%v.asc"; filename="%v.asc"`, keyName, keyName)) h.Set("Content-Type", fmt.Sprintf(`application/pgp-keys; name="%v.asc"; filename="%v.asc"`, keyName, keyName))
h.Set("Content-Disposition", fmt.Sprintf(`attachment; name="%v.asc"; filename="%v.asc"`, keyName, keyName)) h.Set("Content-Disposition", fmt.Sprintf(`attachment; name="%v.asc"; filename="%v.asc"`, keyName, keyName))
h.Set("Content-Transfer-Encoding", "base64") h.Set("Content-Transfer-Encoding", "base64")
body := new(bytes.Buffer)
if _, err := textwrapper.NewRFC822(body).Write([]byte(key)); err != nil {
return err
}
p.AddChild(&parser.Part{ p.AddChild(&parser.Part{
Header: h, Header: h,
Body: body.Bytes(), Body: []byte(key),
}) })
return nil
} }
// NOTE: We should use our own ParseAddressList here. // NOTE: We should use our own ParseAddressList here.