fix comments

sreya · sreya · commit 6432b0d72630 · 2024-10-17T01:23:56.000Z
diff --git a/coderd/cryptokeys/cache.go b/coderd/cryptokeys/cache.go
@@ -198,14 +198,13 @@ func (c *cache) VerifyingKey(ctx context.Context, id string) (interface{}, error
 	if err != nil {
 		return nil, xerrors.Errorf("parse id: %w", err)
 	}
-
+	//nolint:gocritic // cache can only read crypto keys.
+	ctx = dbauthz.AsKeyReader(ctx)
 	_, secret, err := c.cryptoKey(ctx, int32(seq))
 	if err != nil {
 		return nil, xerrors.Errorf("crypto key: %w", err)
 	}
 
-	//nolint:gocritic // cache can only read crypto keys.
-	ctx = dbauthz.AsKeyReader(ctx)
 	return secret, nil
 }
 
diff --git a/coderd/userauth.go b/coderd/userauth.go
@@ -167,8 +167,6 @@ func (api *API) postConvertLoginType(rw http.ResponseWriter, r *http.Request) {
 		ToLoginType:   req.ToType,
 	}
 
-	//nolint:gocritic // We need to read the system signing key
-	// in order to sign the token.
 	token, err := jwtutils.Sign(ctx, api.OIDCConvertKeyCache, claims)
 	if err != nil {
 		httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
@@ -1679,8 +1677,6 @@ func (api *API) convertUserToOauth(ctx context.Context, r *http.Request, db data
 	}
 	var claims OAuthConvertStateClaims
 
-	//nolint:gocritic // We need to read the system signing key
-	// in order to verify the token.
 	err = jwtutils.Verify(ctx, api.OIDCConvertKeyCache, jwtCookie.Value, &claims)
 	if xerrors.Is(err, cryptokeys.ErrKeyNotFound) || xerrors.Is(err, cryptokeys.ErrKeyInvalid) || xerrors.Is(err, jose.ErrCryptoFailure) {
 		// These errors are probably because the user is mixing 2 coder deployments.
diff --git a/enterprise/wsproxy/wsproxy_test.go b/enterprise/wsproxy/wsproxy_test.go
@@ -8,7 +8,6 @@ import (
 	"net/http"
 	"net/http/httptest"
 	"net/url"
-	"runtime/debug"
 	"testing"
 	"time"
 
@@ -322,11 +321,6 @@ resourceLoop:
 
 func TestDERPEndToEnd(t *testing.T) {
 	t.Parallel()
-	defer func() {
-		if r := recover(); r != nil {
-			debug.PrintStack()
-		}
-	}()
 
 	deploymentValues := coderdtest.DeploymentValues(t)
 	deploymentValues.Experiments = []string{

Original file line number	Diff line number	Diff line change
`@@ -198,14 +198,13 @@ func (c *cache) VerifyingKey(ctx context.Context, id string) (interface{}, error`
`198`	`198`	`if err != nil {`
`199`	`199`	`return nil, xerrors.Errorf("parse id: %w", err)`
`200`	`200`	`}`
`201`		`-`
	`201`	`+ //nolint:gocritic // cache can only read crypto keys.`
	`202`	`+ ctx = dbauthz.AsKeyReader(ctx)`
`202`	`203`	`_, secret, err := c.cryptoKey(ctx, int32(seq))`
`203`	`204`	`if err != nil {`
`204`	`205`	`return nil, xerrors.Errorf("crypto key: %w", err)`
`205`	`206`	`}`
`206`	`207`
`207`		`- //nolint:gocritic // cache can only read crypto keys.`
`208`		`- ctx = dbauthz.AsKeyReader(ctx)`
`209`	`208`	`return secret, nil`
`210`	`209`	`}`
`211`	`210`