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

protonmail: implement Attachment.Read

This commit is contained in:
emersion 2018-01-08 11:46:49 +01:00
parent 091387cdb7
commit 44f2e11a69
No known key found for this signature in database
GPG Key ID: 0FDE7BE0E88F5E48
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
protonmail/attachments.go
View File

@ -98,11 +98,21 @@ func (att *Attachment) Encrypt(ciphertext io.Writer, signed *openpgp.Entity) (cl
}
func (att *Attachment) Read(ciphertext io.Reader, keyring openpgp.KeyRing, prompt openpgp.PromptFunction) (*openpgp.MessageDetails, error) {
// TODO
if len(att.KeyPackets) == 0 {
return &openpgp.MessageDetails{
IsEncrypted: false,
IsSigned: false,
UnverifiedBody: ciphertext,
}, nil
} else {
kpr := base64.NewDecoder(base64.StdEncoding, strings.NewReader(att.KeyPackets))
r := io.MultiReader(kpr, ciphertext)
return openpgp.ReadMessage(r, keyring, prompt, nil)
}
}
// GetAttachment downloads an attachment's payload. The returned io.ReadCloser
// may be encrypted.
// may be encrypted, use Attachment.Read to decrypt it.
func (c *Client) GetAttachment(id string) (io.ReadCloser, error) {
req, err := c.newRequest(http.MethodGet, "/attachments/"+id, nil)
if err != nil {