diff --git a/go.mod b/go.mod index 973f412b61499ca2736e94e81b95dcae1bdfd291..06e869039000ba287703ebf7c8cbed757238b643 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( git.autistici.org/id/auth v0.0.0-20211206094959-05544c3c95bb git.autistici.org/id/go-sso v0.0.0-20210117165919-e56e6579953d git.autistici.org/id/usermetadb v0.0.0-20210507085300-ad16aa223703 - github.com/ProtonMail/gopenpgp/v2 v2.4.5 + github.com/ProtonMail/gopenpgp/v2 v2.4.6 github.com/go-ldap/ldap/v3 v3.4.2 github.com/go-test/deep v1.0.7 github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect diff --git a/go.sum b/go.sum index 7e1c34e057f63f8f47ffb78c3975cc1dbe5e1cce..7c5b110f1e18766e52b45d38ffa0c59bb9ad04a4 100644 --- a/go.sum +++ b/go.sum @@ -70,8 +70,12 @@ github.com/ProtonMail/go-crypto v0.0.0-20220113124808-70ae35bab23f h1:J2FzIrXN82 github.com/ProtonMail/go-crypto v0.0.0-20220113124808-70ae35bab23f/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo= github.com/ProtonMail/go-mime v0.0.0-20190923161245-9b5a4261663a h1:W6RrgN/sTxg1msqzFFb+G80MFmpjMw61IU+slm+wln4= github.com/ProtonMail/go-mime v0.0.0-20190923161245-9b5a4261663a/go.mod h1:NYt+V3/4rEeDuaev/zw1zCq8uqVEuPHzDPo3OZrlGJ4= +github.com/ProtonMail/go-mime v0.0.0-20220302105931-303f85f7fe0f h1:CGq7OieOz3wyQJ1fO8S0eO9TCW1JyvLrf8fhzz1i8ko= +github.com/ProtonMail/go-mime v0.0.0-20220302105931-303f85f7fe0f/go.mod h1:NYt+V3/4rEeDuaev/zw1zCq8uqVEuPHzDPo3OZrlGJ4= github.com/ProtonMail/gopenpgp/v2 v2.4.5 h1:G7fOIAEcdwRUreFBUNVrZqiJPZQe6nn6V/5aNr6ZfYw= github.com/ProtonMail/gopenpgp/v2 v2.4.5/go.mod h1:0byYFEOo6x4F/1YqhN7Z6m015Cqnxllz3CGb5cjJueY= +github.com/ProtonMail/gopenpgp/v2 v2.4.6 h1:/EcJsFIsE0ywShAJ+lNLafcaSd6GBhIzHsaBID5pGXw= +github.com/ProtonMail/gopenpgp/v2 v2.4.6/go.mod h1:ZW1KxHNG6q5LMgFKf9Ap/d2eVYeyGf5+fAUEAjJWtmo= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= diff --git a/vendor/github.com/ProtonMail/go-mime/parser.go b/vendor/github.com/ProtonMail/go-mime/parser.go index c5c59628ceec8cc5b8a4755ce4578e37cf5fff0b..4bbc0d735217315c7875ff2aa4c993baa42907b5 100644 --- a/vendor/github.com/ProtonMail/go-mime/parser.go +++ b/vendor/github.com/ProtonMail/go-mime/parser.go @@ -377,7 +377,7 @@ func (ptc *PlainTextCollector) Accept(partReader io.Reader, header textproto.MIM buffer, err = DecodeCharset(buffer, mediaType, params) if err != nil { log.Warnln("Decode charset error:", err) - return err + err = nil // Don't fail parsing on decoding errors, use original } ptc.plainTextContents.Write(buffer) } @@ -432,7 +432,7 @@ func (bc *BodyCollector) Accept(partReader io.Reader, header textproto.MIMEHeade buffer, err = DecodeCharset(buffer, mediaType, params) if err != nil { log.Warnln("Decode charset error:", err) - return err + err = nil // Don't fail parsing on decoding errors, use original } if mediaType == "text/html" { bc.hasHtml = true @@ -501,7 +501,7 @@ func (ac *AttachmentsCollector) Accept(partReader io.Reader, header textproto.MI buffer, err = DecodeCharset(buffer, mediaType, params) if err != nil { log.Warnln("Decode charset error:", err) - return err + err = nil // Don't fail parsing on decoding errors, use original } headerBuf := new(bytes.Buffer) http.Header(header).Write(headerBuf) diff --git a/vendor/github.com/ProtonMail/gopenpgp/v2/constants/armor.go b/vendor/github.com/ProtonMail/gopenpgp/v2/constants/armor.go index 725254167724ff8ce328b020ca903a54899f7eb1..546158c90c3fe6f6de6271256fd96b120b016d1d 100644 --- a/vendor/github.com/ProtonMail/gopenpgp/v2/constants/armor.go +++ b/vendor/github.com/ProtonMail/gopenpgp/v2/constants/armor.go @@ -3,7 +3,7 @@ package constants // Constants for armored data. const ( - ArmorHeaderVersion = "GopenPGP 2.4.5" + ArmorHeaderVersion = "GopenPGP 2.4.6" ArmorHeaderComment = "https://gopenpgp.org" PGPMessageHeader = "PGP MESSAGE" PGPSignatureHeader = "PGP SIGNATURE" diff --git a/vendor/github.com/ProtonMail/gopenpgp/v2/constants/version.go b/vendor/github.com/ProtonMail/gopenpgp/v2/constants/version.go index ea9f344b47478ce5df289446ecb844e5d69f82c3..1b290de9868df80ba7c3d818f30f14e558edc617 100644 --- a/vendor/github.com/ProtonMail/gopenpgp/v2/constants/version.go +++ b/vendor/github.com/ProtonMail/gopenpgp/v2/constants/version.go @@ -1,3 +1,3 @@ package constants -const Version = "2.4.5" +const Version = "2.4.6" diff --git a/vendor/github.com/ProtonMail/gopenpgp/v2/crypto/signature_collector.go b/vendor/github.com/ProtonMail/gopenpgp/v2/crypto/signature_collector.go index 5b96a0aa0831f59686fe64d8167707c375dbaf7e..b5aefa62153c93e2c4021913ea432e94a784aa14 100644 --- a/vendor/github.com/ProtonMail/gopenpgp/v2/crypto/signature_collector.go +++ b/vendor/github.com/ProtonMail/gopenpgp/v2/crypto/signature_collector.go @@ -8,6 +8,7 @@ import ( "net/textproto" pgpErrors "github.com/ProtonMail/go-crypto/openpgp/errors" + "github.com/ProtonMail/gopenpgp/v2/internal" "github.com/ProtonMail/go-crypto/openpgp" "github.com/ProtonMail/go-crypto/openpgp/packet" @@ -98,7 +99,8 @@ func (sc *SignatureCollector) Accept( } sc.signature = string(buffer) str, _ := ioutil.ReadAll(rawBody) - rawBody = bytes.NewReader(str) + canonicalizedBody := internal.CanonicalizeAndTrim(string(str)) + rawBody = bytes.NewReader([]byte(canonicalizedBody)) if sc.keyring != nil { _, err = openpgp.CheckArmoredDetachedSignature(sc.keyring, rawBody, bytes.NewReader(buffer), sc.config) diff --git a/vendor/modules.txt b/vendor/modules.txt index e010589bc913c9c36d5d05059fff6732d179f332..810cdda35fa81140192396d93f84775bd0d3378b 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -52,9 +52,9 @@ github.com/ProtonMail/go-crypto/openpgp/internal/ecc github.com/ProtonMail/go-crypto/openpgp/internal/encoding github.com/ProtonMail/go-crypto/openpgp/packet github.com/ProtonMail/go-crypto/openpgp/s2k -# github.com/ProtonMail/go-mime v0.0.0-20190923161245-9b5a4261663a +# github.com/ProtonMail/go-mime v0.0.0-20220302105931-303f85f7fe0f github.com/ProtonMail/go-mime -# github.com/ProtonMail/gopenpgp/v2 v2.4.5 +# github.com/ProtonMail/gopenpgp/v2 v2.4.6 ## explicit github.com/ProtonMail/gopenpgp/v2/armor github.com/ProtonMail/gopenpgp/v2/constants