mirror of
				https://github.com/superseriousbusiness/gotosocial.git
				synced 2025-10-31 14:22:25 -05:00 
			
		
		
		
	[chore]: Bump github.com/go-jose/go-jose/v4 from 4.0.2 to 4.0.5 (#3831)
Bumps [github.com/go-jose/go-jose/v4](https://github.com/go-jose/go-jose) from 4.0.2 to 4.0.5. - [Release notes](https://github.com/go-jose/go-jose/releases) - [Changelog](https://github.com/go-jose/go-jose/blob/main/CHANGELOG.md) - [Commits](https://github.com/go-jose/go-jose/compare/v4.0.2...v4.0.5) --- updated-dependencies: - dependency-name: github.com/go-jose/go-jose/v4 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
This commit is contained in:
		
					parent
					
						
							
								b4bb97225e
							
						
					
				
			
			
				commit
				
					
						a7485ae251
					
				
			
		
					 12 changed files with 72 additions and 34 deletions
				
			
		
							
								
								
									
										2
									
								
								go.mod
									
										
									
									
									
								
							
							
						
						
									
										2
									
								
								go.mod
									
										
									
									
									
								
							|  | @ -122,7 +122,7 @@ require ( | ||||||
| 	github.com/go-errors/errors v1.1.1 // indirect | 	github.com/go-errors/errors v1.1.1 // indirect | ||||||
| 	github.com/go-fed/httpsig v1.1.0 // indirect | 	github.com/go-fed/httpsig v1.1.0 // indirect | ||||||
| 	github.com/go-ini/ini v1.67.0 // indirect | 	github.com/go-ini/ini v1.67.0 // indirect | ||||||
| 	github.com/go-jose/go-jose/v4 v4.0.2 // indirect | 	github.com/go-jose/go-jose/v4 v4.0.5 // indirect | ||||||
| 	github.com/go-logr/logr v1.4.2 // indirect | 	github.com/go-logr/logr v1.4.2 // indirect | ||||||
| 	github.com/go-logr/stdr v1.2.2 // indirect | 	github.com/go-logr/stdr v1.2.2 // indirect | ||||||
| 	github.com/go-openapi/analysis v0.23.0 // indirect | 	github.com/go-openapi/analysis v0.23.0 // indirect | ||||||
|  |  | ||||||
							
								
								
									
										4
									
								
								go.sum
									
										
									
										generated
									
									
									
								
							
							
						
						
									
										4
									
								
								go.sum
									
										
									
										generated
									
									
									
								
							|  | @ -191,8 +191,8 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2 | ||||||
| github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= | github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= | ||||||
| github.com/go-ini/ini v1.67.0 h1:z6ZrTEZqSWOTyH2FlglNbNgARyHG8oLW9gMELqKr06A= | github.com/go-ini/ini v1.67.0 h1:z6ZrTEZqSWOTyH2FlglNbNgARyHG8oLW9gMELqKr06A= | ||||||
| github.com/go-ini/ini v1.67.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= | github.com/go-ini/ini v1.67.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= | ||||||
| github.com/go-jose/go-jose/v4 v4.0.2 h1:R3l3kkBds16bO7ZFAEEcofK0MkrAJt3jlJznWZG0nvk= | github.com/go-jose/go-jose/v4 v4.0.5 h1:M6T8+mKZl/+fNNuFHvGIzDz7BTLQPIounk/b9dw3AaE= | ||||||
| github.com/go-jose/go-jose/v4 v4.0.2/go.mod h1:WVf9LFMHh/QVrmqrOfqun0C45tMe3RoiKJMPvgWwLfY= | github.com/go-jose/go-jose/v4 v4.0.5/go.mod h1:s3P1lRrkT8igV8D9OjyL4WRyHvjB6a4JSllnOrmmBOA= | ||||||
| github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= | github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= | ||||||
| github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= | github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= | ||||||
| github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= | github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= | ||||||
|  |  | ||||||
							
								
								
									
										24
									
								
								vendor/github.com/go-jose/go-jose/v4/CHANGELOG.md
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										24
									
								
								vendor/github.com/go-jose/go-jose/v4/CHANGELOG.md
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -1,3 +1,27 @@ | ||||||
|  | # v4.0.4 | ||||||
|  | 
 | ||||||
|  | ## Fixed | ||||||
|  | 
 | ||||||
|  |  - Reverted "Allow unmarshalling JSONWebKeySets with unsupported key types" as a | ||||||
|  |    breaking change. See #136 / #137. | ||||||
|  | 
 | ||||||
|  | # v4.0.3 | ||||||
|  | 
 | ||||||
|  | ## Changed | ||||||
|  | 
 | ||||||
|  |  - Allow unmarshalling JSONWebKeySets with unsupported key types (#130) | ||||||
|  |  - Document that OpaqueKeyEncrypter can't be implemented (for now) (#129) | ||||||
|  |  - Dependency updates | ||||||
|  | 
 | ||||||
|  | # v4.0.2 | ||||||
|  | 
 | ||||||
|  | ## Changed | ||||||
|  | 
 | ||||||
|  |  - Improved documentation of Verify() to note that JSONWebKeySet is a supported | ||||||
|  |    argument type (#104) | ||||||
|  |  - Defined exported error values for missing x5c header and unsupported elliptic | ||||||
|  |    curves error cases (#117) | ||||||
|  | 
 | ||||||
| # v4.0.1 | # v4.0.1 | ||||||
| 
 | 
 | ||||||
| ## Fixed | ## Fixed | ||||||
|  |  | ||||||
							
								
								
									
										6
									
								
								vendor/github.com/go-jose/go-jose/v4/CONTRIBUTING.md
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										6
									
								
								vendor/github.com/go-jose/go-jose/v4/CONTRIBUTING.md
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -7,9 +7,3 @@ When submitting code, please make every effort to follow existing conventions | ||||||
| and style in order to keep the code as readable as possible. Please also make | and style in order to keep the code as readable as possible. Please also make | ||||||
| sure all tests pass by running `go test`, and format your code with `go fmt`. | sure all tests pass by running `go test`, and format your code with `go fmt`. | ||||||
| We also recommend using `golint` and `errcheck`. | We also recommend using `golint` and `errcheck`. | ||||||
| 
 |  | ||||||
| Before your code can be accepted into the project you must also sign the |  | ||||||
| Individual Contributor License Agreement.  We use [cla-assistant.io][1] and you |  | ||||||
| will be prompted to sign once a pull request is opened. |  | ||||||
| 
 |  | ||||||
| [1]: https://cla-assistant.io/ |  | ||||||
|  |  | ||||||
							
								
								
									
										10
									
								
								vendor/github.com/go-jose/go-jose/v4/README.md
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										10
									
								
								vendor/github.com/go-jose/go-jose/v4/README.md
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -9,14 +9,6 @@ Package jose aims to provide an implementation of the Javascript Object Signing | ||||||
| and Encryption set of standards. This includes support for JSON Web Encryption, | and Encryption set of standards. This includes support for JSON Web Encryption, | ||||||
| JSON Web Signature, and JSON Web Token standards. | JSON Web Signature, and JSON Web Token standards. | ||||||
| 
 | 
 | ||||||
| **Disclaimer**: This library contains encryption software that is subject to |  | ||||||
| the U.S. Export Administration Regulations. You may not export, re-export, |  | ||||||
| transfer or download this code or any part of it in violation of any United |  | ||||||
| States law, directive or regulation. In particular this software may not be |  | ||||||
| exported or re-exported in any form or on any media to Iran, North Sudan, |  | ||||||
| Syria, Cuba, or North Korea, or to denied persons or entities mentioned on any |  | ||||||
| US maintained blocked list. |  | ||||||
| 
 |  | ||||||
| ## Overview | ## Overview | ||||||
| 
 | 
 | ||||||
| The implementation follows the | The implementation follows the | ||||||
|  | @ -109,6 +101,6 @@ allows attaching a key id. | ||||||
| 
 | 
 | ||||||
| Examples can be found in the Godoc | Examples can be found in the Godoc | ||||||
| reference for this package. The | reference for this package. The | ||||||
| [`jose-util`](https://github.com/go-jose/go-jose/tree/v4/jose-util) | [`jose-util`](https://github.com/go-jose/go-jose/tree/main/jose-util) | ||||||
| subdirectory also contains a small command-line utility which might be useful | subdirectory also contains a small command-line utility which might be useful | ||||||
| as an example as well. | as an example as well. | ||||||
|  |  | ||||||
							
								
								
									
										10
									
								
								vendor/github.com/go-jose/go-jose/v4/crypter.go
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										10
									
								
								vendor/github.com/go-jose/go-jose/v4/crypter.go
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -459,7 +459,10 @@ func (obj JSONWebEncryption) Decrypt(decryptionKey interface{}) ([]byte, error) | ||||||
| 		return nil, fmt.Errorf("go-jose/go-jose: unsupported crit header") | 		return nil, fmt.Errorf("go-jose/go-jose: unsupported crit header") | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	key := tryJWKS(decryptionKey, obj.Header) | 	key, err := tryJWKS(decryptionKey, obj.Header) | ||||||
|  | 	if err != nil { | ||||||
|  | 		return nil, err | ||||||
|  | 	} | ||||||
| 	decrypter, err := newDecrypter(key) | 	decrypter, err := newDecrypter(key) | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		return nil, err | 		return nil, err | ||||||
|  | @ -529,7 +532,10 @@ func (obj JSONWebEncryption) DecryptMulti(decryptionKey interface{}) (int, Heade | ||||||
| 		return -1, Header{}, nil, fmt.Errorf("go-jose/go-jose: unsupported crit header") | 		return -1, Header{}, nil, fmt.Errorf("go-jose/go-jose: unsupported crit header") | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	key := tryJWKS(decryptionKey, obj.Header) | 	key, err := tryJWKS(decryptionKey, obj.Header) | ||||||
|  | 	if err != nil { | ||||||
|  | 		return -1, Header{}, nil, err | ||||||
|  | 	} | ||||||
| 	decrypter, err := newDecrypter(key) | 	decrypter, err := newDecrypter(key) | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		return -1, Header{}, nil, err | 		return -1, Header{}, nil, err | ||||||
|  |  | ||||||
							
								
								
									
										5
									
								
								vendor/github.com/go-jose/go-jose/v4/jwe.go
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										5
									
								
								vendor/github.com/go-jose/go-jose/v4/jwe.go
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -288,10 +288,11 @@ func ParseEncryptedCompact( | ||||||
| 	keyAlgorithms []KeyAlgorithm, | 	keyAlgorithms []KeyAlgorithm, | ||||||
| 	contentEncryption []ContentEncryption, | 	contentEncryption []ContentEncryption, | ||||||
| ) (*JSONWebEncryption, error) { | ) (*JSONWebEncryption, error) { | ||||||
| 	parts := strings.Split(input, ".") | 	// Five parts is four separators | ||||||
| 	if len(parts) != 5 { | 	if strings.Count(input, ".") != 4 { | ||||||
| 		return nil, fmt.Errorf("go-jose/go-jose: compact JWE format must have five parts") | 		return nil, fmt.Errorf("go-jose/go-jose: compact JWE format must have five parts") | ||||||
| 	} | 	} | ||||||
|  | 	parts := strings.SplitN(input, ".", 5) | ||||||
| 
 | 
 | ||||||
| 	rawProtected, err := base64.RawURLEncoding.DecodeString(parts[0]) | 	rawProtected, err := base64.RawURLEncoding.DecodeString(parts[0]) | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
|  |  | ||||||
							
								
								
									
										25
									
								
								vendor/github.com/go-jose/go-jose/v4/jwk.go
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										25
									
								
								vendor/github.com/go-jose/go-jose/v4/jwk.go
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -239,10 +239,10 @@ func (k *JSONWebKey) UnmarshalJSON(data []byte) (err error) { | ||||||
| 				keyPub = key | 				keyPub = key | ||||||
| 			} | 			} | ||||||
| 		} else { | 		} else { | ||||||
| 			err = fmt.Errorf("go-jose/go-jose: unknown curve %s'", raw.Crv) | 			return fmt.Errorf("go-jose/go-jose: unknown curve %s'", raw.Crv) | ||||||
| 		} | 		} | ||||||
| 	default: | 	default: | ||||||
| 		err = fmt.Errorf("go-jose/go-jose: unknown json web key type '%s'", raw.Kty) | 		return fmt.Errorf("go-jose/go-jose: unknown json web key type '%s'", raw.Kty) | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
|  | @ -779,7 +779,13 @@ func (key rawJSONWebKey) symmetricKey() ([]byte, error) { | ||||||
| 	return key.K.bytes(), nil | 	return key.K.bytes(), nil | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| func tryJWKS(key interface{}, headers ...Header) interface{} { | var ( | ||||||
|  | 	// ErrJWKSKidNotFound is returned when a JWKS does not contain a JWK with a | ||||||
|  | 	// key ID which matches one in the provided tokens headers. | ||||||
|  | 	ErrJWKSKidNotFound = errors.New("go-jose/go-jose: JWK with matching kid not found in JWK Set") | ||||||
|  | ) | ||||||
|  | 
 | ||||||
|  | func tryJWKS(key interface{}, headers ...Header) (interface{}, error) { | ||||||
| 	var jwks JSONWebKeySet | 	var jwks JSONWebKeySet | ||||||
| 
 | 
 | ||||||
| 	switch jwksType := key.(type) { | 	switch jwksType := key.(type) { | ||||||
|  | @ -788,9 +794,11 @@ func tryJWKS(key interface{}, headers ...Header) interface{} { | ||||||
| 	case JSONWebKeySet: | 	case JSONWebKeySet: | ||||||
| 		jwks = jwksType | 		jwks = jwksType | ||||||
| 	default: | 	default: | ||||||
| 		return key | 		// If the specified key is not a JWKS, return as is. | ||||||
|  | 		return key, nil | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
|  | 	// Determine the KID to search for from the headers. | ||||||
| 	var kid string | 	var kid string | ||||||
| 	for _, header := range headers { | 	for _, header := range headers { | ||||||
| 		if header.KeyID != "" { | 		if header.KeyID != "" { | ||||||
|  | @ -799,14 +807,17 @@ func tryJWKS(key interface{}, headers ...Header) interface{} { | ||||||
| 		} | 		} | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
|  | 	// If no KID is specified in the headers, reject. | ||||||
| 	if kid == "" { | 	if kid == "" { | ||||||
| 		return key | 		return nil, ErrJWKSKidNotFound | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
|  | 	// Find the JWK with the matching KID. If no JWK with the specified KID is | ||||||
|  | 	// found, reject. | ||||||
| 	keys := jwks.Key(kid) | 	keys := jwks.Key(kid) | ||||||
| 	if len(keys) == 0 { | 	if len(keys) == 0 { | ||||||
| 		return key | 		return nil, ErrJWKSKidNotFound | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	return keys[0].Key | 	return keys[0].Key, nil | ||||||
| } | } | ||||||
|  |  | ||||||
							
								
								
									
										5
									
								
								vendor/github.com/go-jose/go-jose/v4/jws.go
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										5
									
								
								vendor/github.com/go-jose/go-jose/v4/jws.go
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -327,10 +327,11 @@ func parseSignedCompact( | ||||||
| 	payload []byte, | 	payload []byte, | ||||||
| 	signatureAlgorithms []SignatureAlgorithm, | 	signatureAlgorithms []SignatureAlgorithm, | ||||||
| ) (*JSONWebSignature, error) { | ) (*JSONWebSignature, error) { | ||||||
| 	parts := strings.Split(input, ".") | 	// Three parts is two separators | ||||||
| 	if len(parts) != 3 { | 	if strings.Count(input, ".") != 2 { | ||||||
| 		return nil, fmt.Errorf("go-jose/go-jose: compact JWS format must have three parts") | 		return nil, fmt.Errorf("go-jose/go-jose: compact JWS format must have three parts") | ||||||
| 	} | 	} | ||||||
|  | 	parts := strings.SplitN(input, ".", 3) | ||||||
| 
 | 
 | ||||||
| 	if parts[1] != "" && payload != nil { | 	if parts[1] != "" && payload != nil { | ||||||
| 		return nil, fmt.Errorf("go-jose/go-jose: payload is not detached") | 		return nil, fmt.Errorf("go-jose/go-jose: payload is not detached") | ||||||
|  |  | ||||||
							
								
								
									
										3
									
								
								vendor/github.com/go-jose/go-jose/v4/opaque.go
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								vendor/github.com/go-jose/go-jose/v4/opaque.go
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -83,6 +83,9 @@ func (o *opaqueVerifier) verifyPayload(payload []byte, signature []byte, alg Sig | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| // OpaqueKeyEncrypter is an interface that supports encrypting keys with an opaque key. | // OpaqueKeyEncrypter is an interface that supports encrypting keys with an opaque key. | ||||||
|  | // | ||||||
|  | // Note: this cannot currently be implemented outside this package because of its | ||||||
|  | // unexported method. | ||||||
| type OpaqueKeyEncrypter interface { | type OpaqueKeyEncrypter interface { | ||||||
| 	// KeyID returns the kid | 	// KeyID returns the kid | ||||||
| 	KeyID() string | 	KeyID() string | ||||||
|  |  | ||||||
							
								
								
									
										10
									
								
								vendor/github.com/go-jose/go-jose/v4/signing.go
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										10
									
								
								vendor/github.com/go-jose/go-jose/v4/signing.go
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -390,7 +390,10 @@ func (obj JSONWebSignature) UnsafePayloadWithoutVerification() []byte { | ||||||
| // The verificationKey argument must have one of the types allowed for the | // The verificationKey argument must have one of the types allowed for the | ||||||
| // verificationKey argument of JSONWebSignature.Verify(). | // verificationKey argument of JSONWebSignature.Verify(). | ||||||
| func (obj JSONWebSignature) DetachedVerify(payload []byte, verificationKey interface{}) error { | func (obj JSONWebSignature) DetachedVerify(payload []byte, verificationKey interface{}) error { | ||||||
| 	key := tryJWKS(verificationKey, obj.headers()...) | 	key, err := tryJWKS(verificationKey, obj.headers()...) | ||||||
|  | 	if err != nil { | ||||||
|  | 		return err | ||||||
|  | 	} | ||||||
| 	verifier, err := newVerifier(key) | 	verifier, err := newVerifier(key) | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		return err | 		return err | ||||||
|  | @ -455,7 +458,10 @@ func (obj JSONWebSignature) VerifyMulti(verificationKey interface{}) (int, Signa | ||||||
| // The verificationKey argument must have one of the types allowed for the | // The verificationKey argument must have one of the types allowed for the | ||||||
| // verificationKey argument of JSONWebSignature.Verify(). | // verificationKey argument of JSONWebSignature.Verify(). | ||||||
| func (obj JSONWebSignature) DetachedVerifyMulti(payload []byte, verificationKey interface{}) (int, Signature, error) { | func (obj JSONWebSignature) DetachedVerifyMulti(payload []byte, verificationKey interface{}) (int, Signature, error) { | ||||||
| 	key := tryJWKS(verificationKey, obj.headers()...) | 	key, err := tryJWKS(verificationKey, obj.headers()...) | ||||||
|  | 	if err != nil { | ||||||
|  | 		return -1, Signature{}, err | ||||||
|  | 	} | ||||||
| 	verifier, err := newVerifier(key) | 	verifier, err := newVerifier(key) | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		return -1, Signature{}, err | 		return -1, Signature{}, err | ||||||
|  |  | ||||||
							
								
								
									
										2
									
								
								vendor/modules.txt
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								vendor/modules.txt
									
										
									
									
										vendored
									
									
								
							|  | @ -220,7 +220,7 @@ github.com/go-fed/httpsig | ||||||
| # github.com/go-ini/ini v1.67.0 | # github.com/go-ini/ini v1.67.0 | ||||||
| ## explicit | ## explicit | ||||||
| github.com/go-ini/ini | github.com/go-ini/ini | ||||||
| # github.com/go-jose/go-jose/v4 v4.0.2 | # github.com/go-jose/go-jose/v4 v4.0.5 | ||||||
| ## explicit; go 1.21 | ## explicit; go 1.21 | ||||||
| github.com/go-jose/go-jose/v4 | github.com/go-jose/go-jose/v4 | ||||||
| github.com/go-jose/go-jose/v4/cipher | github.com/go-jose/go-jose/v4/cipher | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue