Skip to content

[ROX-13403] : Fix node -> topVuln sub resolver bug when node cves is empty #3689

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
charmik-redhat merged 3 commits into from
Nov 9, 2022
Merged

[ROX-13403] : Fix node -> topVuln sub resolver bug when node cves is empty #3689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
27323dc
Fix topVuln sub resolver in nodes graphQL
charmik-redhat Nov 4, 2022
cfc693b
Add back build directives to test
charmik-redhat Nov 7, 2022
f4012d4
Address PR comments
charmik-redhat Nov 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions central/graphql/resolvers/images.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,9 @@ func (resolver *imageResolver) DeploymentCount(ctx context.Context, args RawQuer
func (resolver *imageResolver) TopImageVulnerability(ctx context.Context, args RawQuery) (ImageVulnerabilityResolver, error) {
defer metrics.SetGraphQLOperationDurationTime(time.Now(), pkgMetrics.Images, "TopImageVulnerability")
if !env.PostgresDatastoreEnabled.BooleanSetting() {
if resolver.data.GetSetTopCvss() == nil {
return nil, nil
}
vulnResolver, err := resolver.topVulnV2(ctx, args)
if err != nil || vulnResolver == nil {
return nil, err
Expand All @@ -207,6 +210,9 @@ func (resolver *imageResolver) TopVuln(ctx context.Context, args RawQuery) (Vuln
return nil, errors.New("TopVuln not supported with postgres enabled. Please use TopImageVulnerability.")
}

if resolver.data.GetSetTopCvss() == nil {
return nil, nil
}
vulnResolver, err := resolver.topVulnV2(ctx, args)
if err != nil || vulnResolver == nil {
return nil, err
Expand All @@ -220,10 +226,6 @@ func (resolver *imageResolver) topVulnV2(ctx context.Context, args RawQuery) (*c
return nil, err
}

if resolver.data.GetSetTopCvss() == nil {
return nil, nil
}

query = search.ConjunctionQuery(query, resolver.getImageQuery())
query.Pagination = &v1.QueryPagination{
SortOptions: []*v1.QuerySortOption{
Expand Down
51 changes: 40 additions & 11 deletions central/graphql/resolvers/node_vulnerabilities_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
nodeCVESearch "github.com/stackrox/rox/central/cve/node/datastore/search"
nodeCVEPostgres "github.com/stackrox/rox/central/cve/node/datastore/store/postgres"
"github.com/stackrox/rox/central/graphql/resolvers/loaders"
nodeDackboxDataStore "github.com/stackrox/rox/central/node/datastore/dackbox/datastore"
nodeDS "github.com/stackrox/rox/central/node/datastore/dackbox/datastore"
nodeGlobalDataStore "github.com/stackrox/rox/central/node/datastore/dackbox/globaldatastore"
nodeSearch "github.com/stackrox/rox/central/node/datastore/search"
nodePostgres "github.com/stackrox/rox/central/node/datastore/store/postgres"
Expand Down Expand Up @@ -58,10 +58,12 @@ Remaining TODO tasks:
type GraphQLNodeVulnerabilityTestSuite struct {
suite.Suite

ctx context.Context
db *pgxpool.Pool
gormDB *gorm.DB
resolver *Resolver
ctx context.Context
db *pgxpool.Pool
gormDB *gorm.DB
resolver *Resolver
nodeDatastore nodeDS.DataStore
riskMockDS *mockRisks.MockDataStore
}

func (s *GraphQLNodeVulnerabilityTestSuite) SetupSuite() {
Expand Down Expand Up @@ -102,20 +104,20 @@ func (s *GraphQLNodeVulnerabilityTestSuite) SetupSuite() {
s.resolver.NodeCVEDataStore = nodeCVEDatastore

// node datastore
riskMock := mockRisks.NewMockDataStore(gomock.NewController(s.T()))
s.riskMockDS = mockRisks.NewMockDataStore(gomock.NewController(s.T()))
nodeStore := nodePostgres.CreateTableAndNewStore(s.ctx, s.T(), s.db, s.gormDB, false)
nodeIndexer := nodePostgres.NewIndexer(s.db)
nodeSearcher := nodeSearch.NewV2(nodeStore, nodeIndexer)
nodePostgresDataStore := nodeDackboxDataStore.NewWithPostgres(nodeStore, nodeIndexer, nodeSearcher, riskMock, ranking.NewRanker(), ranking.NewRanker())
nodeGlobalDatastore, err := nodeGlobalDataStore.New(nodePostgresDataStore)
s.nodeDatastore = nodeDS.NewWithPostgres(nodeStore, nodeIndexer, nodeSearcher, s.riskMockDS, ranking.NewRanker(), ranking.NewRanker())
nodeGlobalDatastore, err := nodeGlobalDataStore.New(s.nodeDatastore)
s.NoError(err, "Failed to create nodeGlobalDatastore")
s.resolver.NodeGlobalDataStore = nodeGlobalDatastore

// nodeComponent datastore
nodeCompStore := nodeComponentPostgres.CreateTableAndNewStore(s.ctx, s.db, s.gormDB)
nodeCompIndexer := nodeComponentPostgres.NewIndexer(s.db)
nodeCompSearcher := nodeComponentSearch.New(nodeCompStore, nodeCompIndexer)
s.resolver.NodeComponentDataStore = nodeComponentDataStore.New(nodeCompStore, nodeCompIndexer, nodeCompSearcher, riskMock, ranking.NewRanker())
s.resolver.NodeComponentDataStore = nodeComponentDataStore.New(nodeCompStore, nodeCompIndexer, nodeCompSearcher, s.riskMockDS, ranking.NewRanker())

// nodeComponentCVEEdge datastore
nodeComponentCveEdgeStore := nodeComponentCVEEdgePostgres.CreateTableAndNewStore(s.ctx, s.db, s.gormDB)
Expand All @@ -139,7 +141,7 @@ func (s *GraphQLNodeVulnerabilityTestSuite) SetupSuite() {

// loaders used by graphql layer
loaders.RegisterTypeFactory(reflect.TypeOf(storage.Node{}), func() interface{} {
return loaders.NewNodeLoader(nodePostgresDataStore)
return loaders.NewNodeLoader(s.nodeDatastore)
})
loaders.RegisterTypeFactory(reflect.TypeOf(storage.NodeComponent{}), func() interface{} {
return loaders.NewNodeComponentLoader(s.resolver.NodeComponentDataStore)
Expand All @@ -156,7 +158,7 @@ func (s *GraphQLNodeVulnerabilityTestSuite) SetupSuite() {
s.NoError(err)
}
for _, node := range testNodes {
err = nodePostgresDataStore.UpsertNode(s.ctx, node)
err = s.nodeDatastore.UpsertNode(s.ctx, node)
s.NoError(err)
}
}
Expand Down Expand Up @@ -449,6 +451,33 @@ func (s *GraphQLNodeVulnerabilityTestSuite) TestTopNodeVulnerability() {
topVuln, err := node.TopNodeVulnerability(ctx, RawQuery{})
s.NoError(err)
s.Equal(expected, topVuln.Id(ctx))

// test no error on node without any cves
testNode := &storage.Node{
Id: "nodeWithoutCves",
Name: "node-without-cves",
SetCves: &storage.Node_Cves{
Cves: 0,
},
Scan: &storage.NodeScan{
Components: []*storage.EmbeddedNodeScanComponent{
{
Name: "comp-without-cves",
Version: "v",
},
},
},
}
err = s.nodeDatastore.UpsertNode(ctx, testNode)
s.NoError(err)

node = getNodeResolver(ctx, s.T(), s.resolver, testNode.GetId())
topVuln, err = node.TopNodeVulnerability(ctx, RawQuery{})
s.NoError(err)
s.Nil(topVuln)
s.riskMockDS.EXPECT().RemoveRisk(gomock.Any(), gomock.Any(), gomock.Any()).Times(1).Return(nil)
err = s.nodeDatastore.DeleteNodes(ctx, testNode.GetId())
s.NoError(err)
}

func (s *GraphQLNodeVulnerabilityTestSuite) TestNodeVulnerabilityEnvImpact() {
Expand Down
10 changes: 6 additions & 4 deletions central/graphql/resolvers/nodes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,9 @@ func (resolver *nodeResolver) TopVuln(ctx context.Context, args RawQuery) (Vulne
return nil, err
}

if resolver.data.GetSetTopCvss() == nil {
return nil, nil
}
query, err := resolver.getTopNodeCVEV1Query(args)
if err != nil {
return nil, err
Expand All @@ -393,6 +396,9 @@ func (resolver *nodeResolver) TopNodeVulnerability(ctx context.Context, args Raw
return nil, err
}

if resolver.data.GetSetTopCvss() == nil {
return nil, nil
}
query, err := resolver.getTopNodeCVEV1Query(args)
if err != nil {
return nil, err
Expand All @@ -416,10 +422,6 @@ func (resolver *nodeResolver) getTopNodeCVEV1Query(args RawQuery) (*v1.Query, er
return nil, err
}

if resolver.data.GetSetTopCvss() == nil {
return nil, nil
}

query = search.ConjunctionQuery(query, resolver.getNodeQuery())
query.Pagination = &v1.QueryPagination{
SortOptions: []*v1.QuerySortOption{
Expand Down