Commit591cefa

authored

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

1 parent3de98c2 commit591cefaCopy full SHA for 591cefa

File tree

+11

-1

lines changed

+11

-1

lines changed

Lines changed: 1 addition & 1 deletion

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`	`iferrors.Is(err,sql.ErrNoRows) {`
`2029`		`-err=nil`
	`2029`	`+return"",nil`
`2030`	`2030`	`}`
`2031`	`2031`	`iferr!=nil {`
`2032`	`2032`	`return"",xerrors.Errorf("get owner oidc link: %w",err)`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,16 @@ func TestObtainOIDCAccessToken(t *testing.T) {`
`38`	`38`	`_,err:=obtainOIDCAccessToken(ctx,db,&oauth2.Config{},user.ID)`
`39`	`39`	`require.NoError(t,err)`
`40`	`40`	`})`
	`41`	`+t.Run("MissingLink",func(t*testing.T) {`
	`42`	`+t.Parallel()`
	`43`	`+db:=dbmem.New()`
	`44`	`+user:=dbgen.User(t,db, database.User{`
	`45`	`+LoginType:database.LoginTypeOIDC,`
	`46`	`+})`
	`47`	`+tok,err:=obtainOIDCAccessToken(ctx,db,&oauth2.Config{},user.ID)`
	`48`	`+require.Empty(t,tok)`
	`49`	`+require.NoError(t,err)`
	`50`	`+})`
`41`	`51`	`t.Run("Exchange",func(t*testing.T) {`
`42`	`52`	`t.Parallel()`
`43`	`53`	`db:=dbmem.New()`

Comments

(0)