mirror of
				https://github.com/superseriousbusiness/gotosocial.git
				synced 2025-10-31 02:12:24 -05:00 
			
		
		
		
	[chore]: Bump golang.org/x/oauth2 from 0.11.0 to 0.12.0 (#2223)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
This commit is contained in:
		
					parent
					
						
							
								380d83f9a9
							
						
					
				
			
			
				commit
				
					
						d45a75e475
					
				
			
		
					 6 changed files with 54 additions and 30 deletions
				
			
		
							
								
								
									
										70
									
								
								vendor/golang.org/x/oauth2/internal/token.go
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										70
									
								
								vendor/golang.org/x/oauth2/internal/token.go
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -18,6 +18,7 @@ import ( | |||
| 	"strconv" | ||||
| 	"strings" | ||||
| 	"sync" | ||||
| 	"sync/atomic" | ||||
| 	"time" | ||||
| ) | ||||
| 
 | ||||
|  | @ -115,41 +116,60 @@ const ( | |||
| 	AuthStyleInHeader AuthStyle = 2 | ||||
| ) | ||||
| 
 | ||||
| // authStyleCache is the set of tokenURLs we've successfully used via | ||||
| // LazyAuthStyleCache is a backwards compatibility compromise to let Configs | ||||
| // have a lazily-initialized AuthStyleCache. | ||||
| // | ||||
| // The two users of this, oauth2.Config and oauth2/clientcredentials.Config, | ||||
| // both would ideally just embed an unexported AuthStyleCache but because both | ||||
| // were historically allowed to be copied by value we can't retroactively add an | ||||
| // uncopyable Mutex to them. | ||||
| // | ||||
| // We could use an atomic.Pointer, but that was added recently enough (in Go | ||||
| // 1.18) that we'd break Go 1.17 users where the tests as of 2023-08-03 | ||||
| // still pass. By using an atomic.Value, it supports both Go 1.17 and | ||||
| // copying by value, even if that's not ideal. | ||||
| type LazyAuthStyleCache struct { | ||||
| 	v atomic.Value // of *AuthStyleCache | ||||
| } | ||||
| 
 | ||||
| func (lc *LazyAuthStyleCache) Get() *AuthStyleCache { | ||||
| 	if c, ok := lc.v.Load().(*AuthStyleCache); ok { | ||||
| 		return c | ||||
| 	} | ||||
| 	c := new(AuthStyleCache) | ||||
| 	if !lc.v.CompareAndSwap(nil, c) { | ||||
| 		c = lc.v.Load().(*AuthStyleCache) | ||||
| 	} | ||||
| 	return c | ||||
| } | ||||
| 
 | ||||
| // AuthStyleCache is the set of tokenURLs we've successfully used via | ||||
| // RetrieveToken and which style auth we ended up using. | ||||
| // It's called a cache, but it doesn't (yet?) shrink. It's expected that | ||||
| // the set of OAuth2 servers a program contacts over time is fixed and | ||||
| // small. | ||||
| var authStyleCache struct { | ||||
| 	sync.Mutex | ||||
| 	m map[string]AuthStyle // keyed by tokenURL | ||||
| } | ||||
| 
 | ||||
| // ResetAuthCache resets the global authentication style cache used | ||||
| // for AuthStyleUnknown token requests. | ||||
| func ResetAuthCache() { | ||||
| 	authStyleCache.Lock() | ||||
| 	defer authStyleCache.Unlock() | ||||
| 	authStyleCache.m = nil | ||||
| type AuthStyleCache struct { | ||||
| 	mu sync.Mutex | ||||
| 	m  map[string]AuthStyle // keyed by tokenURL | ||||
| } | ||||
| 
 | ||||
| // lookupAuthStyle reports which auth style we last used with tokenURL | ||||
| // when calling RetrieveToken and whether we have ever done so. | ||||
| func lookupAuthStyle(tokenURL string) (style AuthStyle, ok bool) { | ||||
| 	authStyleCache.Lock() | ||||
| 	defer authStyleCache.Unlock() | ||||
| 	style, ok = authStyleCache.m[tokenURL] | ||||
| func (c *AuthStyleCache) lookupAuthStyle(tokenURL string) (style AuthStyle, ok bool) { | ||||
| 	c.mu.Lock() | ||||
| 	defer c.mu.Unlock() | ||||
| 	style, ok = c.m[tokenURL] | ||||
| 	return | ||||
| } | ||||
| 
 | ||||
| // setAuthStyle adds an entry to authStyleCache, documented above. | ||||
| func setAuthStyle(tokenURL string, v AuthStyle) { | ||||
| 	authStyleCache.Lock() | ||||
| 	defer authStyleCache.Unlock() | ||||
| 	if authStyleCache.m == nil { | ||||
| 		authStyleCache.m = make(map[string]AuthStyle) | ||||
| func (c *AuthStyleCache) setAuthStyle(tokenURL string, v AuthStyle) { | ||||
| 	c.mu.Lock() | ||||
| 	defer c.mu.Unlock() | ||||
| 	if c.m == nil { | ||||
| 		c.m = make(map[string]AuthStyle) | ||||
| 	} | ||||
| 	authStyleCache.m[tokenURL] = v | ||||
| 	c.m[tokenURL] = v | ||||
| } | ||||
| 
 | ||||
| // newTokenRequest returns a new *http.Request to retrieve a new token | ||||
|  | @ -189,10 +209,10 @@ func cloneURLValues(v url.Values) url.Values { | |||
| 	return v2 | ||||
| } | ||||
| 
 | ||||
| func RetrieveToken(ctx context.Context, clientID, clientSecret, tokenURL string, v url.Values, authStyle AuthStyle) (*Token, error) { | ||||
| func RetrieveToken(ctx context.Context, clientID, clientSecret, tokenURL string, v url.Values, authStyle AuthStyle, styleCache *AuthStyleCache) (*Token, error) { | ||||
| 	needsAuthStyleProbe := authStyle == 0 | ||||
| 	if needsAuthStyleProbe { | ||||
| 		if style, ok := lookupAuthStyle(tokenURL); ok { | ||||
| 		if style, ok := styleCache.lookupAuthStyle(tokenURL); ok { | ||||
| 			authStyle = style | ||||
| 			needsAuthStyleProbe = false | ||||
| 		} else { | ||||
|  | @ -222,7 +242,7 @@ func RetrieveToken(ctx context.Context, clientID, clientSecret, tokenURL string, | |||
| 		token, err = doTokenRoundTrip(ctx, req) | ||||
| 	} | ||||
| 	if needsAuthStyleProbe && err == nil { | ||||
| 		setAuthStyle(tokenURL, authStyle) | ||||
| 		styleCache.setAuthStyle(tokenURL, authStyle) | ||||
| 	} | ||||
| 	// Don't overwrite `RefreshToken` with an empty value | ||||
| 	// if this was a token refreshing request. | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue