mirror of
				https://github.com/superseriousbusiness/gotosocial.git
				synced 2025-10-31 06:42:25 -05:00 
			
		
		
		
	[chore] update direct Go dependencies (#4162)
- update gruf/go-stroage v0.2.0 -> v0.2.1 - update KimMachineGun/automemlimit v0.7.1 -> v0.7.2 - update miekg/dns v1.1.65 -> v1.1.66 - update ncruces/go-sqlite3 v0.25.1 -> v0.25.2 - update spf13/cast v1.7.1 -> v1.8.0 - update tdewolff/minify/v2 v2.23.1 -> v2.23.5 - update x/crypto v0.37.0 -> v0.38.0 - update x/image v0.26.0 -> v0.27.0 - update x/net v0.39.0 -> v0.40.0 - update x/oauth2 v0.29.0 -> v0.30.0 - update x/sys v0.32.0 -> v0.33.0 - update x/text v0.24.0 -> v0.25.0 Reviewed-on: https://codeberg.org/superseriousbusiness/gotosocial/pulls/4162 Co-authored-by: kim <grufwub@gmail.com> Co-committed-by: kim <grufwub@gmail.com>
This commit is contained in:
		
					parent
					
						
							
								8c1511a494
							
						
					
				
			
			
				commit
				
					
						d2f13e7564
					
				
			
		
					 65 changed files with 1586 additions and 797 deletions
				
			
		
							
								
								
									
										55
									
								
								vendor/golang.org/x/oauth2/oauth2.go
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										55
									
								
								vendor/golang.org/x/oauth2/oauth2.go
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -22,9 +22,9 @@ import ( | |||
| ) | ||||
| 
 | ||||
| // NoContext is the default context you should supply if not using | ||||
| // your own context.Context (see https://golang.org/x/net/context). | ||||
| // your own [context.Context]. | ||||
| // | ||||
| // Deprecated: Use context.Background() or context.TODO() instead. | ||||
| // Deprecated: Use [context.Background] or [context.TODO] instead. | ||||
| var NoContext = context.TODO() | ||||
| 
 | ||||
| // RegisterBrokenAuthHeaderProvider previously did something. It is now a no-op. | ||||
|  | @ -37,8 +37,8 @@ func RegisterBrokenAuthHeaderProvider(tokenURL string) {} | |||
| 
 | ||||
| // Config describes a typical 3-legged OAuth2 flow, with both the | ||||
| // client application information and the server's endpoint URLs. | ||||
| // For the client credentials 2-legged OAuth2 flow, see the clientcredentials | ||||
| // package (https://golang.org/x/oauth2/clientcredentials). | ||||
| // For the client credentials 2-legged OAuth2 flow, see the | ||||
| // [golang.org/x/oauth2/clientcredentials] package. | ||||
| type Config struct { | ||||
| 	// ClientID is the application's ID. | ||||
| 	ClientID string | ||||
|  | @ -46,7 +46,7 @@ type Config struct { | |||
| 	// ClientSecret is the application's secret. | ||||
| 	ClientSecret string | ||||
| 
 | ||||
| 	// Endpoint contains the resource server's token endpoint | ||||
| 	// Endpoint contains the authorization server's token endpoint | ||||
| 	// URLs. These are constants specific to each server and are | ||||
| 	// often available via site-specific packages, such as | ||||
| 	// google.Endpoint or github.Endpoint. | ||||
|  | @ -135,7 +135,7 @@ type setParam struct{ k, v string } | |||
| 
 | ||||
| func (p setParam) setValue(m url.Values) { m.Set(p.k, p.v) } | ||||
| 
 | ||||
| // SetAuthURLParam builds an AuthCodeOption which passes key/value parameters | ||||
| // SetAuthURLParam builds an [AuthCodeOption] which passes key/value parameters | ||||
| // to a provider's authorization endpoint. | ||||
| func SetAuthURLParam(key, value string) AuthCodeOption { | ||||
| 	return setParam{key, value} | ||||
|  | @ -148,8 +148,8 @@ func SetAuthURLParam(key, value string) AuthCodeOption { | |||
| // request and callback. The authorization server includes this value when | ||||
| // redirecting the user agent back to the client. | ||||
| // | ||||
| // Opts may include AccessTypeOnline or AccessTypeOffline, as well | ||||
| // as ApprovalForce. | ||||
| // Opts may include [AccessTypeOnline] or [AccessTypeOffline], as well | ||||
| // as [ApprovalForce]. | ||||
| // | ||||
| // To protect against CSRF attacks, opts should include a PKCE challenge | ||||
| // (S256ChallengeOption). Not all servers support PKCE. An alternative is to | ||||
|  | @ -194,7 +194,7 @@ func (c *Config) AuthCodeURL(state string, opts ...AuthCodeOption) string { | |||
| // and when other authorization grant types are not available." | ||||
| // See https://tools.ietf.org/html/rfc6749#section-4.3 for more info. | ||||
| // | ||||
| // The provided context optionally controls which HTTP client is used. See the HTTPClient variable. | ||||
| // The provided context optionally controls which HTTP client is used. See the [HTTPClient] variable. | ||||
| func (c *Config) PasswordCredentialsToken(ctx context.Context, username, password string) (*Token, error) { | ||||
| 	v := url.Values{ | ||||
| 		"grant_type": {"password"}, | ||||
|  | @ -212,10 +212,10 @@ func (c *Config) PasswordCredentialsToken(ctx context.Context, username, passwor | |||
| // It is used after a resource provider redirects the user back | ||||
| // to the Redirect URI (the URL obtained from AuthCodeURL). | ||||
| // | ||||
| // The provided context optionally controls which HTTP client is used. See the HTTPClient variable. | ||||
| // The provided context optionally controls which HTTP client is used. See the [HTTPClient] variable. | ||||
| // | ||||
| // The code will be in the *http.Request.FormValue("code"). Before | ||||
| // calling Exchange, be sure to validate FormValue("state") if you are | ||||
| // The code will be in the [http.Request.FormValue]("code"). Before | ||||
| // calling Exchange, be sure to validate [http.Request.FormValue]("state") if you are | ||||
| // using it to protect against CSRF attacks. | ||||
| // | ||||
| // If using PKCE to protect against CSRF attacks, opts should include a | ||||
|  | @ -242,10 +242,10 @@ func (c *Config) Client(ctx context.Context, t *Token) *http.Client { | |||
| 	return NewClient(ctx, c.TokenSource(ctx, t)) | ||||
| } | ||||
| 
 | ||||
| // TokenSource returns a TokenSource that returns t until t expires, | ||||
| // TokenSource returns a [TokenSource] that returns t until t expires, | ||||
| // automatically refreshing it as necessary using the provided context. | ||||
| // | ||||
| // Most users will use Config.Client instead. | ||||
| // Most users will use [Config.Client] instead. | ||||
| func (c *Config) TokenSource(ctx context.Context, t *Token) TokenSource { | ||||
| 	tkr := &tokenRefresher{ | ||||
| 		ctx:  ctx, | ||||
|  | @ -260,7 +260,7 @@ func (c *Config) TokenSource(ctx context.Context, t *Token) TokenSource { | |||
| 	} | ||||
| } | ||||
| 
 | ||||
| // tokenRefresher is a TokenSource that makes "grant_type"=="refresh_token" | ||||
| // tokenRefresher is a TokenSource that makes "grant_type=refresh_token" | ||||
| // HTTP requests to renew a token using a RefreshToken. | ||||
| type tokenRefresher struct { | ||||
| 	ctx          context.Context // used to get HTTP requests | ||||
|  | @ -305,8 +305,7 @@ type reuseTokenSource struct { | |||
| } | ||||
| 
 | ||||
| // Token returns the current token if it's still valid, else will | ||||
| // refresh the current token (using r.Context for HTTP client | ||||
| // information) and return the new one. | ||||
| // refresh the current token and return the new one. | ||||
| func (s *reuseTokenSource) Token() (*Token, error) { | ||||
| 	s.mu.Lock() | ||||
| 	defer s.mu.Unlock() | ||||
|  | @ -322,7 +321,7 @@ func (s *reuseTokenSource) Token() (*Token, error) { | |||
| 	return t, nil | ||||
| } | ||||
| 
 | ||||
| // StaticTokenSource returns a TokenSource that always returns the same token. | ||||
| // StaticTokenSource returns a [TokenSource] that always returns the same token. | ||||
| // Because the provided token t is never refreshed, StaticTokenSource is only | ||||
| // useful for tokens that never expire. | ||||
| func StaticTokenSource(t *Token) TokenSource { | ||||
|  | @ -338,16 +337,16 @@ func (s staticTokenSource) Token() (*Token, error) { | |||
| 	return s.t, nil | ||||
| } | ||||
| 
 | ||||
| // HTTPClient is the context key to use with golang.org/x/net/context's | ||||
| // WithValue function to associate an *http.Client value with a context. | ||||
| // HTTPClient is the context key to use with [context.WithValue] | ||||
| // to associate a [*http.Client] value with a context. | ||||
| var HTTPClient internal.ContextKey | ||||
| 
 | ||||
| // NewClient creates an *http.Client from a Context and TokenSource. | ||||
| // NewClient creates an [*http.Client] from a [context.Context] and [TokenSource]. | ||||
| // The returned client is not valid beyond the lifetime of the context. | ||||
| // | ||||
| // Note that if a custom *http.Client is provided via the Context it | ||||
| // Note that if a custom [*http.Client] is provided via the [context.Context] it | ||||
| // is used only for token acquisition and is not used to configure the | ||||
| // *http.Client returned from NewClient. | ||||
| // [*http.Client] returned from NewClient. | ||||
| // | ||||
| // As a special case, if src is nil, a non-OAuth2 client is returned | ||||
| // using the provided context. This exists to support related OAuth2 | ||||
|  | @ -368,7 +367,7 @@ func NewClient(ctx context.Context, src TokenSource) *http.Client { | |||
| 	} | ||||
| } | ||||
| 
 | ||||
| // ReuseTokenSource returns a TokenSource which repeatedly returns the | ||||
| // ReuseTokenSource returns a [TokenSource] which repeatedly returns the | ||||
| // same token as long as it's valid, starting with t. | ||||
| // When its cached token is invalid, a new token is obtained from src. | ||||
| // | ||||
|  | @ -376,10 +375,10 @@ func NewClient(ctx context.Context, src TokenSource) *http.Client { | |||
| // (such as a file on disk) between runs of a program, rather than | ||||
| // obtaining new tokens unnecessarily. | ||||
| // | ||||
| // The initial token t may be nil, in which case the TokenSource is | ||||
| // The initial token t may be nil, in which case the [TokenSource] is | ||||
| // wrapped in a caching version if it isn't one already. This also | ||||
| // means it's always safe to wrap ReuseTokenSource around any other | ||||
| // TokenSource without adverse effects. | ||||
| // [TokenSource] without adverse effects. | ||||
| func ReuseTokenSource(t *Token, src TokenSource) TokenSource { | ||||
| 	// Don't wrap a reuseTokenSource in itself. That would work, | ||||
| 	// but cause an unnecessary number of mutex operations. | ||||
|  | @ -397,8 +396,8 @@ func ReuseTokenSource(t *Token, src TokenSource) TokenSource { | |||
| 	} | ||||
| } | ||||
| 
 | ||||
| // ReuseTokenSourceWithExpiry returns a TokenSource that acts in the same manner as the | ||||
| // TokenSource returned by ReuseTokenSource, except the expiry buffer is | ||||
| // ReuseTokenSourceWithExpiry returns a [TokenSource] that acts in the same manner as the | ||||
| // [TokenSource] returned by [ReuseTokenSource], except the expiry buffer is | ||||
| // configurable. The expiration time of a token is calculated as | ||||
| // t.Expiry.Add(-earlyExpiry). | ||||
| func ReuseTokenSourceWithExpiry(t *Token, src TokenSource, earlyExpiry time.Duration) TokenSource { | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue