From 1e040b1bfdef1fd14ec3ed2c5af6ff2e09cedcdb Mon Sep 17 00:00:00 2001 From: Adam Chalkley Date: Thu, 15 Feb 2024 06:56:23 -0600 Subject: [PATCH] Update emersion/go-sasl dependency Update pseudo-version from v0.0.0-20220912192320-0145f2c60ead to v0.0.0-20231106173351-e73c9f7bad43 --- go.mod | 2 +- go.sum | 4 ++-- vendor/github.com/emersion/go-sasl/external.go | 2 +- vendor/github.com/emersion/go-sasl/oauthbearer.go | 4 ++-- vendor/github.com/emersion/go-sasl/plain.go | 2 +- vendor/modules.txt | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index ef600d64..77e42bd3 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.19 require ( github.com/atc0005/go-nagios v0.16.1 github.com/emersion/go-imap v1.2.1 - github.com/emersion/go-sasl v0.0.0-20220912192320-0145f2c60ead + github.com/emersion/go-sasl v0.0.0-20231106173351-e73c9f7bad43 github.com/google/go-cmp v0.6.0 github.com/rs/zerolog v1.32.0 github.com/sqs/go-xoauth2 v0.0.0-20120917012134-0911dad68e56 diff --git a/go.sum b/go.sum index 5407dfc1..ae5ad0b8 100644 --- a/go.sum +++ b/go.sum @@ -6,8 +6,8 @@ github.com/emersion/go-imap v1.2.1 h1:+s9ZjMEjOB8NzZMVTM3cCenz2JrQIGGo5j1df19WjT github.com/emersion/go-imap v1.2.1/go.mod h1:Qlx1FSx2FTxjnjWpIlVNEuX+ylerZQNFE5NsmKFSejY= github.com/emersion/go-message v0.15.0/go.mod h1:wQUEfE+38+7EW8p8aZ96ptg6bAb1iwdgej19uXASlE4= github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21/go.mod h1:iL2twTeMvZnrg54ZoPDNfJaJaqy0xIQFuBdrLsmspwQ= -github.com/emersion/go-sasl v0.0.0-20220912192320-0145f2c60ead h1:fI1Jck0vUrXT8bnphprS1EoVRe2Q5CKCX8iDlpqjQ/Y= -github.com/emersion/go-sasl v0.0.0-20220912192320-0145f2c60ead/go.mod h1:iL2twTeMvZnrg54ZoPDNfJaJaqy0xIQFuBdrLsmspwQ= +github.com/emersion/go-sasl v0.0.0-20231106173351-e73c9f7bad43 h1:hH4PQfOndHDlpzYfLAAfl63E8Le6F2+EL/cdhlkyRJY= +github.com/emersion/go-sasl v0.0.0-20231106173351-e73c9f7bad43/go.mod h1:iL2twTeMvZnrg54ZoPDNfJaJaqy0xIQFuBdrLsmspwQ= github.com/emersion/go-textwrapper v0.0.0-20200911093747-65d896831594/go.mod h1:aqO8z8wPrjkscevZJFVE1wXJrLpC5LtJG7fqLOsPb2U= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= diff --git a/vendor/github.com/emersion/go-sasl/external.go b/vendor/github.com/emersion/go-sasl/external.go index 65723519..ba24ccc0 100644 --- a/vendor/github.com/emersion/go-sasl/external.go +++ b/vendor/github.com/emersion/go-sasl/external.go @@ -54,7 +54,7 @@ func (a *externalServer) Next(response []byte) (challenge []byte, done bool, err a.done = true if bytes.Contains(response, []byte("\x00")) { - return nil, false, errors.New("identity contains a NUL character") + return nil, false, errors.New("sasl: identity contains a NUL character") } return nil, true, a.authenticate(string(response)) diff --git a/vendor/github.com/emersion/go-sasl/oauthbearer.go b/vendor/github.com/emersion/go-sasl/oauthbearer.go index 299afc5e..7b2c503c 100644 --- a/vendor/github.com/emersion/go-sasl/oauthbearer.go +++ b/vendor/github.com/emersion/go-sasl/oauthbearer.go @@ -84,7 +84,7 @@ func (a *oauthBearerServer) fail(descr string) ([]byte, bool, error) { if err != nil { panic(err) // wtf } - a.failErr = errors.New(descr) + a.failErr = errors.New("sasl: client error: " + descr) return blob, false, nil } @@ -98,7 +98,7 @@ func (a *oauthBearerServer) Next(response []byte) (challenge []byte, done bool, // indirectly OAUTHBEARER) defines a protocol-independent way to do so // using 0x01. if len(response) != 1 && response[0] != 0x01 { - return nil, true, errors.New("unexpected response") + return nil, true, errors.New("sasl: invalid response") } return nil, true, a.failErr } diff --git a/vendor/github.com/emersion/go-sasl/plain.go b/vendor/github.com/emersion/go-sasl/plain.go index 419c9522..5017bdc4 100644 --- a/vendor/github.com/emersion/go-sasl/plain.go +++ b/vendor/github.com/emersion/go-sasl/plain.go @@ -57,7 +57,7 @@ func (a *plainServer) Next(response []byte) (challenge []byte, done bool, err er parts := bytes.Split(response, []byte("\x00")) if len(parts) != 3 { - err = errors.New("Invalid response") + err = errors.New("sasl: invalid response") return } diff --git a/vendor/modules.txt b/vendor/modules.txt index 1ffd6db5..561360fc 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -8,7 +8,7 @@ github.com/emersion/go-imap/client github.com/emersion/go-imap/commands github.com/emersion/go-imap/responses github.com/emersion/go-imap/utf7 -# github.com/emersion/go-sasl v0.0.0-20220912192320-0145f2c60ead +# github.com/emersion/go-sasl v0.0.0-20231106173351-e73c9f7bad43 ## explicit; go 1.12 github.com/emersion/go-sasl # github.com/golang/protobuf v1.5.3