mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-10-31 21:28:11 +09:00 
			
		
		
		
	[Vendor] Update Batch 2020-11 (#13746)
* github.com/alecthomas/chroma v0.8.1 -> v0.8.2 Changelog: https://github.com/alecthomas/chroma/releases/tag/v0.8.2 * github.com/blevesearch/bleve v1.0.12 -> v1.0.13 Changelog: https://github.com/blevesearch/bleve/releases/tag/v1.0.13 * github.com/editorconfig/editorconfig-core-go v2.3.8 -> v2.3.9 Changelog: https://github.com/editorconfig/editorconfig-core-go/releases/tag/v2.3.9 * github.com/klauspost/compress v1.11.2 -> v1.11.3 Changelog: https://github.com/klauspost/compress/releases/tag/v1.11.3 * github.com/minio/minio-go v7.0.5 -> v7.0.6 Changelog: https://github.com/minio/minio-go/releases/tag/v7.0.6 Co-authored-by: Lauris BH <lauris@nix.lv>
This commit is contained in:
		
							
								
								
									
										2
									
								
								vendor/github.com/minio/minio-go/v7/pkg/credentials/assume_role.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								vendor/github.com/minio/minio-go/v7/pkg/credentials/assume_role.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -144,7 +144,7 @@ func closeResponse(resp *http.Response) { | ||||
| func getAssumeRoleCredentials(clnt *http.Client, endpoint string, opts STSAssumeRoleOptions) (AssumeRoleResponse, error) { | ||||
| 	v := url.Values{} | ||||
| 	v.Set("Action", "AssumeRole") | ||||
| 	v.Set("Version", "2011-06-15") | ||||
| 	v.Set("Version", STSVersion) | ||||
| 	if opts.RoleARN != "" { | ||||
| 		v.Set("RoleArn", opts.RoleARN) | ||||
| 	} | ||||
|   | ||||
							
								
								
									
										3
									
								
								vendor/github.com/minio/minio-go/v7/pkg/credentials/credentials.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								vendor/github.com/minio/minio-go/v7/pkg/credentials/credentials.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -22,6 +22,9 @@ import ( | ||||
| 	"time" | ||||
| ) | ||||
|  | ||||
| // STSVersion sts version string | ||||
| const STSVersion = "2011-06-15" | ||||
|  | ||||
| // A Value is the AWS credentials value for individual credential fields. | ||||
| type Value struct { | ||||
| 	// AWS Access key ID | ||||
|   | ||||
							
								
								
									
										22
									
								
								vendor/github.com/minio/minio-go/v7/pkg/credentials/iam_aws.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										22
									
								
								vendor/github.com/minio/minio-go/v7/pkg/credentials/iam_aws.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -48,7 +48,7 @@ type IAM struct { | ||||
| 	Client *http.Client | ||||
|  | ||||
| 	// Custom endpoint to fetch IAM role credentials. | ||||
| 	endpoint string | ||||
| 	Endpoint string | ||||
| } | ||||
|  | ||||
| // IAM Roles for Amazon EC2 | ||||
| @@ -62,13 +62,12 @@ const ( | ||||
|  | ||||
| // NewIAM returns a pointer to a new Credentials object wrapping the IAM. | ||||
| func NewIAM(endpoint string) *Credentials { | ||||
| 	p := &IAM{ | ||||
| 	return New(&IAM{ | ||||
| 		Client: &http.Client{ | ||||
| 			Transport: http.DefaultTransport, | ||||
| 		}, | ||||
| 		endpoint: endpoint, | ||||
| 	} | ||||
| 	return New(p) | ||||
| 		Endpoint: endpoint, | ||||
| 	}) | ||||
| } | ||||
|  | ||||
| // Retrieve retrieves credentials from the EC2 service. | ||||
| @@ -78,7 +77,7 @@ func (m *IAM) Retrieve() (Value, error) { | ||||
| 	var roleCreds ec2RoleCredRespBody | ||||
| 	var err error | ||||
|  | ||||
| 	endpoint := m.endpoint | ||||
| 	endpoint := m.Endpoint | ||||
| 	switch { | ||||
| 	case len(os.Getenv("AWS_WEB_IDENTITY_TOKEN_FILE")) > 0: | ||||
| 		if len(endpoint) == 0 { | ||||
| @@ -90,11 +89,9 @@ func (m *IAM) Retrieve() (Value, error) { | ||||
| 		} | ||||
|  | ||||
| 		creds := &STSWebIdentity{ | ||||
| 			Client:          m.Client, | ||||
| 			stsEndpoint:     endpoint, | ||||
| 			roleARN:         os.Getenv("AWS_ROLE_ARN"), | ||||
| 			roleSessionName: os.Getenv("AWS_ROLE_SESSION_NAME"), | ||||
| 			getWebIDTokenExpiry: func() (*WebIdentityToken, error) { | ||||
| 			Client:      m.Client, | ||||
| 			STSEndpoint: endpoint, | ||||
| 			GetWebIDTokenExpiry: func() (*WebIdentityToken, error) { | ||||
| 				token, err := ioutil.ReadFile(os.Getenv("AWS_WEB_IDENTITY_TOKEN_FILE")) | ||||
| 				if err != nil { | ||||
| 					return nil, err | ||||
| @@ -102,6 +99,8 @@ func (m *IAM) Retrieve() (Value, error) { | ||||
|  | ||||
| 				return &WebIdentityToken{Token: string(token)}, nil | ||||
| 			}, | ||||
| 			roleARN:         os.Getenv("AWS_ROLE_ARN"), | ||||
| 			roleSessionName: os.Getenv("AWS_ROLE_SESSION_NAME"), | ||||
| 		} | ||||
|  | ||||
| 		stsWebIdentityCreds, err := creds.Retrieve() | ||||
| @@ -121,7 +120,6 @@ func (m *IAM) Retrieve() (Value, error) { | ||||
| 	case len(os.Getenv("AWS_CONTAINER_CREDENTIALS_FULL_URI")) > 0: | ||||
| 		if len(endpoint) == 0 { | ||||
| 			endpoint = os.Getenv("AWS_CONTAINER_CREDENTIALS_FULL_URI") | ||||
|  | ||||
| 			var ok bool | ||||
| 			if ok, err = isLoopback(endpoint); !ok { | ||||
| 				if err == nil { | ||||
|   | ||||
							
								
								
									
										12
									
								
								vendor/github.com/minio/minio-go/v7/pkg/credentials/sts_client_grants.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										12
									
								
								vendor/github.com/minio/minio-go/v7/pkg/credentials/sts_client_grants.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -73,7 +73,7 @@ type STSClientGrants struct { | ||||
| 	Client *http.Client | ||||
|  | ||||
| 	// MinIO endpoint to fetch STS credentials. | ||||
| 	stsEndpoint string | ||||
| 	STSEndpoint string | ||||
|  | ||||
| 	// getClientGrantsTokenExpiry function to retrieve tokens | ||||
| 	// from IDP This function should return two values one is | ||||
| @@ -81,7 +81,7 @@ type STSClientGrants struct { | ||||
| 	// and second return value is the expiry associated with | ||||
| 	// this token. This is a customer provided function and | ||||
| 	// is mandatory. | ||||
| 	getClientGrantsTokenExpiry func() (*ClientGrantsToken, error) | ||||
| 	GetClientGrantsTokenExpiry func() (*ClientGrantsToken, error) | ||||
| } | ||||
|  | ||||
| // NewSTSClientGrants returns a pointer to a new | ||||
| @@ -97,8 +97,8 @@ func NewSTSClientGrants(stsEndpoint string, getClientGrantsTokenExpiry func() (* | ||||
| 		Client: &http.Client{ | ||||
| 			Transport: http.DefaultTransport, | ||||
| 		}, | ||||
| 		stsEndpoint:                stsEndpoint, | ||||
| 		getClientGrantsTokenExpiry: getClientGrantsTokenExpiry, | ||||
| 		STSEndpoint:                stsEndpoint, | ||||
| 		GetClientGrantsTokenExpiry: getClientGrantsTokenExpiry, | ||||
| 	}), nil | ||||
| } | ||||
|  | ||||
| @@ -114,7 +114,7 @@ func getClientGrantsCredentials(clnt *http.Client, endpoint string, | ||||
| 	v.Set("Action", "AssumeRoleWithClientGrants") | ||||
| 	v.Set("Token", accessToken.Token) | ||||
| 	v.Set("DurationSeconds", fmt.Sprintf("%d", accessToken.Expiry)) | ||||
| 	v.Set("Version", "2011-06-15") | ||||
| 	v.Set("Version", STSVersion) | ||||
|  | ||||
| 	u, err := url.Parse(endpoint) | ||||
| 	if err != nil { | ||||
| @@ -145,7 +145,7 @@ func getClientGrantsCredentials(clnt *http.Client, endpoint string, | ||||
| // Retrieve retrieves credentials from the MinIO service. | ||||
| // Error will be returned if the request fails. | ||||
| func (m *STSClientGrants) Retrieve() (Value, error) { | ||||
| 	a, err := getClientGrantsCredentials(m.Client, m.stsEndpoint, m.getClientGrantsTokenExpiry) | ||||
| 	a, err := getClientGrantsCredentials(m.Client, m.STSEndpoint, m.GetClientGrantsTokenExpiry) | ||||
| 	if err != nil { | ||||
| 		return Value{}, err | ||||
| 	} | ||||
|   | ||||
							
								
								
									
										27
									
								
								vendor/github.com/minio/minio-go/v7/pkg/credentials/sts_ldap_identity.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										27
									
								
								vendor/github.com/minio/minio-go/v7/pkg/credentials/sts_ldap_identity.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -52,36 +52,41 @@ type LDAPIdentityResult struct { | ||||
| type LDAPIdentity struct { | ||||
| 	Expiry | ||||
|  | ||||
| 	stsEndpoint string | ||||
| 	// Required http Client to use when connecting to MinIO STS service. | ||||
| 	Client *http.Client | ||||
|  | ||||
| 	ldapUsername, ldapPassword string | ||||
| 	// Exported STS endpoint to fetch STS credentials. | ||||
| 	STSEndpoint string | ||||
|  | ||||
| 	// LDAP username/password used to fetch LDAP STS credentials. | ||||
| 	LDAPUsername, LDAPPassword string | ||||
| } | ||||
|  | ||||
| // NewLDAPIdentity returns new credentials object that uses LDAP | ||||
| // Identity. | ||||
| func NewLDAPIdentity(stsEndpoint, ldapUsername, ldapPassword string) (*Credentials, error) { | ||||
| 	return New(&LDAPIdentity{ | ||||
| 		stsEndpoint:  stsEndpoint, | ||||
| 		ldapUsername: ldapUsername, | ||||
| 		ldapPassword: ldapPassword, | ||||
| 		Client:       &http.Client{Transport: http.DefaultTransport}, | ||||
| 		STSEndpoint:  stsEndpoint, | ||||
| 		LDAPUsername: ldapUsername, | ||||
| 		LDAPPassword: ldapPassword, | ||||
| 	}), nil | ||||
| } | ||||
|  | ||||
| // Retrieve gets the credential by calling the MinIO STS API for | ||||
| // LDAP on the configured stsEndpoint. | ||||
| func (k *LDAPIdentity) Retrieve() (value Value, err error) { | ||||
| 	u, kerr := url.Parse(k.stsEndpoint) | ||||
| 	u, kerr := url.Parse(k.STSEndpoint) | ||||
| 	if kerr != nil { | ||||
| 		err = kerr | ||||
| 		return | ||||
| 	} | ||||
|  | ||||
| 	clnt := &http.Client{Transport: http.DefaultTransport} | ||||
| 	v := url.Values{} | ||||
| 	v.Set("Action", "AssumeRoleWithLDAPIdentity") | ||||
| 	v.Set("Version", "2011-06-15") | ||||
| 	v.Set("LDAPUsername", k.ldapUsername) | ||||
| 	v.Set("LDAPPassword", k.ldapPassword) | ||||
| 	v.Set("Version", STSVersion) | ||||
| 	v.Set("LDAPUsername", k.LDAPUsername) | ||||
| 	v.Set("LDAPPassword", k.LDAPPassword) | ||||
|  | ||||
| 	u.RawQuery = v.Encode() | ||||
|  | ||||
| @@ -91,7 +96,7 @@ func (k *LDAPIdentity) Retrieve() (value Value, err error) { | ||||
| 		return | ||||
| 	} | ||||
|  | ||||
| 	resp, kerr := clnt.Do(req) | ||||
| 	resp, kerr := k.Client.Do(req) | ||||
| 	if kerr != nil { | ||||
| 		err = kerr | ||||
| 		return | ||||
|   | ||||
							
								
								
									
										20
									
								
								vendor/github.com/minio/minio-go/v7/pkg/credentials/sts_web_identity.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										20
									
								
								vendor/github.com/minio/minio-go/v7/pkg/credentials/sts_web_identity.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -66,16 +66,16 @@ type STSWebIdentity struct { | ||||
| 	// Required http Client to use when connecting to MinIO STS service. | ||||
| 	Client *http.Client | ||||
|  | ||||
| 	// MinIO endpoint to fetch STS credentials. | ||||
| 	stsEndpoint string | ||||
| 	// Exported STS endpoint to fetch STS credentials. | ||||
| 	STSEndpoint string | ||||
|  | ||||
| 	// getWebIDTokenExpiry function which returns ID tokens | ||||
| 	// from IDP. This function should return two values one | ||||
| 	// is ID token which is a self contained ID token (JWT) | ||||
| 	// Exported GetWebIDTokenExpiry function which returns ID | ||||
| 	// tokens from IDP. This function should return two values | ||||
| 	// one is ID token which is a self contained ID token (JWT) | ||||
| 	// and second return value is the expiry associated with | ||||
| 	// this token. | ||||
| 	// This is a customer provided function and is mandatory. | ||||
| 	getWebIDTokenExpiry func() (*WebIdentityToken, error) | ||||
| 	GetWebIDTokenExpiry func() (*WebIdentityToken, error) | ||||
|  | ||||
| 	// roleARN is the Amazon Resource Name (ARN) of the role that the caller is | ||||
| 	// assuming. | ||||
| @@ -98,8 +98,8 @@ func NewSTSWebIdentity(stsEndpoint string, getWebIDTokenExpiry func() (*WebIdent | ||||
| 		Client: &http.Client{ | ||||
| 			Transport: http.DefaultTransport, | ||||
| 		}, | ||||
| 		stsEndpoint:         stsEndpoint, | ||||
| 		getWebIDTokenExpiry: getWebIDTokenExpiry, | ||||
| 		STSEndpoint:         stsEndpoint, | ||||
| 		GetWebIDTokenExpiry: getWebIDTokenExpiry, | ||||
| 	}), nil | ||||
| } | ||||
|  | ||||
| @@ -124,7 +124,7 @@ func getWebIdentityCredentials(clnt *http.Client, endpoint, roleARN, roleSession | ||||
| 	if idToken.Expiry > 0 { | ||||
| 		v.Set("DurationSeconds", fmt.Sprintf("%d", idToken.Expiry)) | ||||
| 	} | ||||
| 	v.Set("Version", "2011-06-15") | ||||
| 	v.Set("Version", STSVersion) | ||||
|  | ||||
| 	u, err := url.Parse(endpoint) | ||||
| 	if err != nil { | ||||
| @@ -159,7 +159,7 @@ func getWebIdentityCredentials(clnt *http.Client, endpoint, roleARN, roleSession | ||||
| // Retrieve retrieves credentials from the MinIO service. | ||||
| // Error will be returned if the request fails. | ||||
| func (m *STSWebIdentity) Retrieve() (Value, error) { | ||||
| 	a, err := getWebIdentityCredentials(m.Client, m.stsEndpoint, m.roleARN, m.roleSessionName, m.getWebIDTokenExpiry) | ||||
| 	a, err := getWebIdentityCredentials(m.Client, m.STSEndpoint, m.roleARN, m.roleSessionName, m.GetWebIDTokenExpiry) | ||||
| 	if err != nil { | ||||
| 		return Value{}, err | ||||
| 	} | ||||
|   | ||||
		Reference in New Issue
	
	Block a user