fix(coderd/cryptokeys): relock mutex to avoid double unlock (#16802)

mafredri · web-flow · commit 6dd71b105554 · 2025-03-04T17:10:12.000Z
diff --git a/coderd/cryptokeys/cache.go b/coderd/cryptokeys/cache.go
@@ -251,14 +251,14 @@ func (c *cache) cryptoKey(ctx context.Context, sequence int32) (string, []byte,
 	}
 
 	c.fetching = true
-	c.mu.Unlock()
 
+	c.mu.Unlock()
 	keys, err := c.cryptoKeys(ctx)
+	c.mu.Lock()
 	if err != nil {
 		return "", nil, xerrors.Errorf("get keys: %w", err)
 	}
 
-	c.mu.Lock()
 	c.lastFetch = c.clock.Now()
 	c.refresher.Reset(refreshInterval)
 	c.keys = keys

Original file line number	Diff line number	Diff line change
`@@ -251,14 +251,14 @@ func (c *cache) cryptoKey(ctx context.Context, sequence int32) (string, []byte,`
`251`	`251`	`}`
`252`	`252`
`253`	`253`	`c.fetching = true`
`254`		`- c.mu.Unlock()`
`255`	`254`
	`255`	`+ c.mu.Unlock()`
`256`	`256`	`keys, err := c.cryptoKeys(ctx)`
	`257`	`+ c.mu.Lock()`
`257`	`258`	`if err != nil {`
`258`	`259`	`return "", nil, xerrors.Errorf("get keys: %w", err)`
`259`	`260`	`}`
`260`	`261`
`261`		`- c.mu.Lock()`
`262`	`262`	`c.lastFetch = c.clock.Now()`
`263`	`263`	`c.refresher.Reset(refreshInterval)`
`264`	`264`	`c.keys = keys`