lysann/passforios-gopenpgp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor: Reused pm-mime method

Browse source
This commit is contained in:
Jakub Lehotsky 2018-09-19 12:51:44 +02:00
parent d005dca0a4
commit e22a4910e6
1 changed files with 14 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

51
crypto/signature_collector.go
View file

@ -1,17 +1,17 @@
package crypto package crypto
import ( import (
"bufio"
"bytes"
"golang.org/x/crypto/openpgp"
"golang.org/x/crypto/openpgp/packet"
"io" "io"
"io/ioutil"
"mime"
"mime/multipart"
"net/textproto" "net/textproto"
"proton/pmmime" "proton/pmmime"
"golang.org/x/crypto/openpgp/packet" )
"golang.org/x/crypto/openpgp"
"io/ioutil"
"bytes"
"bufio"
"mime/multipart"
"mime"
)
type SignatureCollector struct { type SignatureCollector struct {
config *packet.Config config *packet.Config
@ -23,8 +23,8 @@ type SignatureCollector struct {
func newSignatureCollector(targetAccepter pmmime.VisitAcceptor, keyring openpgp.KeyRing, config *packet.Config) *SignatureCollector { func newSignatureCollector(targetAccepter pmmime.VisitAcceptor, keyring openpgp.KeyRing, config *packet.Config) *SignatureCollector {
return &SignatureCollector{ return &SignatureCollector{
target: targetAccepter, target: targetAccepter,
config: config, config: config,
keyring: keyring, keyring: keyring,
} }
} }
@ -70,39 +70,16 @@ func getRawMimePart(rawdata io.Reader, boundary string) (io.Reader, io.Reader) {
} }
ioutil.ReadAll(reader) ioutil.ReadAll(reader)
data := bodyBuffer.Bytes() data := bodyBuffer.Bytes()
return tee, bytes.NewReader(data[0:len(data) - lineEndingLength]) return tee, bytes.NewReader(data[0 : len(data)-lineEndingLength])
}
func getMultipartParts(r io.Reader, params map[string]string) (parts []io.Reader, headers []textproto.MIMEHeader, err error) {
mr := multipart.NewReader(r, params["boundary"])
parts = []io.Reader{}
headers = []textproto.MIMEHeader{}
var p *multipart.Part
for {
p, err = mr.NextPart()
if err == io.EOF {
err = nil
break
}
if err != nil {
return
}
b, _ := ioutil.ReadAll(p)
buffer := bytes.NewBuffer(b)
parts = append(parts, buffer)
headers = append(headers, p.Header)
}
return
} }
func (sc *SignatureCollector) Accept(part io.Reader, header textproto.MIMEHeader, hasPlainSibling bool, isFirst, isLast bool) (err error) { func (sc *SignatureCollector) Accept(part io.Reader, header textproto.MIMEHeader, hasPlainSibling bool, isFirst, isLast bool) (err error) {
parentMediaType, params, _ := mime.ParseMediaType(header.Get("Content-Type")) parentMediaType, params, _ := mime.ParseMediaType(header.Get("Content-Type"))
if parentMediaType == "multipart/signed" { if parentMediaType == "multipart/signed" {
newPart, rawBody := getRawMimePart(part, "--" + params["boundary"]) newPart, rawBody := getRawMimePart(part, "--"+params["boundary"])
var multiparts []io.Reader var multiparts []io.Reader
var multipartHeaders []textproto.MIMEHeader var multipartHeaders []textproto.MIMEHeader
if multiparts, multipartHeaders, err = getMultipartParts(newPart, params); err != nil { if multiparts, multipartHeaders, err = mime.GetMultipartParts(newPart, params); err != nil {
return return
} else { } else {
hasPlainChild := false hasPlainChild := false
@ -140,7 +117,7 @@ func (sc *SignatureCollector) Accept(part io.Reader, header textproto.MIMEHeader
return err return err
} }
sc.signature = string(buffer) sc.signature = string(buffer)
str, _ := ioutil.ReadAll(rawBody) str, _ := ioutil.ReadAll(rawBody)
rawBody = bytes.NewReader(str) rawBody = bytes.NewReader(str)
if sc.keyring != nil { if sc.keyring != nil {
_, err = openpgp.CheckArmoredDetachedSignature(sc.keyring, rawBody, bytes.NewReader(buffer), sc.config) _, err = openpgp.CheckArmoredDetachedSignature(sc.keyring, rawBody, bytes.NewReader(buffer), sc.config)