fix(coderd/provisionerdserver): prevent NPE if no user link exists (#15289)

johnstcn · web-flow · commit 591cefa4286d · 2024-10-30T19:16:59.000Z
diff --git a/coderd/provisionerdserver/provisionerdserver.go b/coderd/provisionerdserver/provisionerdserver.go
@@ -2026,7 +2026,7 @@ func obtainOIDCAccessToken(ctx context.Context, db database.Store, oidcConfig pr
 		LoginType: database.LoginTypeOIDC,
 	})
 	if errors.Is(err, sql.ErrNoRows) {
-		err = nil
+		return "", nil
 	}
 	if err != nil {
 		return "", xerrors.Errorf("get owner oidc link: %w", err)
diff --git a/coderd/provisionerdserver/provisionerdserver_internal_test.go b/coderd/provisionerdserver/provisionerdserver_internal_test.go
@@ -38,6 +38,16 @@ func TestObtainOIDCAccessToken(t *testing.T) {
 		_, err := obtainOIDCAccessToken(ctx, db, &oauth2.Config{}, user.ID)
 		require.NoError(t, err)
 	})
+	t.Run("MissingLink", func(t *testing.T) {
+		t.Parallel()
+		db := dbmem.New()
+		user := dbgen.User(t, db, database.User{
+			LoginType: database.LoginTypeOIDC,
+		})
+		tok, err := obtainOIDCAccessToken(ctx, db, &oauth2.Config{}, user.ID)
+		require.Empty(t, tok)
+		require.NoError(t, err)
+	})
 	t.Run("Exchange", func(t *testing.T) {
 		t.Parallel()
 		db := dbmem.New()

Original file line number	Diff line number	Diff line change
`@@ -2026,7 +2026,7 @@ func obtainOIDCAccessToken(ctx context.Context, db database.Store, oidcConfig pr`
`2026`	`2026`	`LoginType: database.LoginTypeOIDC,`
`2027`	`2027`	`})`
`2028`	`2028`	`if errors.Is(err, sql.ErrNoRows) {`
`2029`		`- err = nil`
	`2029`	`+ return "", nil`
`2030`	`2030`	`}`
`2031`	`2031`	`if err != nil {`
`2032`	`2032`	`return "", xerrors.Errorf("get owner oidc link: %w", err)`