Skip to content

Commit

Permalink
Add web changes into main (#5025)
Browse files Browse the repository at this point in the history 
Add sensu web changes into main:
* [GraphQL] Generate & Implement RBAC types (#4793)
* Allow Graphql Middleware Init funcs to add to Context (#4910)
* add graphql query validation for max depth on unauthed requests
* update graph query depth limit
* update graphql-max-depth rule provider
* make graphql-depth-limit validator parameterized
* update graphql depth test cases
* add more test cases and comments to graphql max-depth validator
* convert graphql validators test indents to spaces for readability
* run graphql depth limit query on authenticated requests
* make graphql query depth limit validation unskippable
---------
Signed-off-by: James Phillips <[email protected]>
Signed-off-by: Christian Kruse <[email protected]>
Signed-off-by: Gustav Danielsson <[email protected]>
Co-authored-by: James Phillips <[email protected]>
Co-authored-by: Christian Kruse <[email protected]>
Co-authored-by: Gustav Danielsson <[email protected]>
  • Loading branch information
@dabria
dabria authored Jun 26, 2023
1 parent 2b7a065 commit 531dfea
Show file tree
Hide file tree
Showing 15 changed files with 939 additions and 1,072 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG-6.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ Versioning](http://semver.org/spec/v2.0.0.html).
### Added
- Adding a flag at agent level to avoid collecting system.networks property in the agent entity state

### Added
- Adding a flag at agent level to avoid collecting system.networks property in the agent entity state
- Added silences sorting by expiration to GraphQL service
- Added GraphQL validator for query node depth

## [6.9.1] - 2022-12-01

### Changed
Expand Down
110 changes: 110 additions & 0 deletions backend/apid/graphql/corev2.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@ import (
"github.com/sensu/core/v3/types"
)

//
// CoreV2Pipeline
//

var _ schema.CoreV2PipelineExtensionOverridesFieldResolvers = (*corev2PipelineImpl)(nil)

type corev2PipelineImpl struct {
schema.CoreV2PipelineAliases
}
Expand All @@ -27,3 +33,107 @@ func (*corev2PipelineImpl) IsTypeOf(s interface{}, p graphql.IsTypeOfParams) boo
_, ok := s.(*corev2.Pipeline)
return ok
}

//
// Implement ClusterRoleFieldResolvers
//

var _ schema.CoreV2ClusterRoleExtensionOverridesFieldResolvers = (*clusterRoleImpl)(nil)

type clusterRoleImpl struct {
schema.CoreV2ClusterRoleAliases
}

// ID implements response to request for 'id' field.
func (*clusterRoleImpl) ID(p graphql.ResolveParams) (string, error) {
return globalid.ClusterRoleTranslator.EncodeToString(p.Context, p.Source), nil
}

// ToJSON implements response to request for 'toJSON' field.
func (*clusterRoleImpl) ToJSON(p graphql.ResolveParams) (interface{}, error) {
return types.WrapResource(p.Source.(corev2.Resource)), nil
}

// IsTypeOf is used to determine if a given value is associated with the type
func (*clusterRoleImpl) IsTypeOf(s interface{}, p graphql.IsTypeOfParams) bool {
_, ok := s.(*corev2.ClusterRole)
return ok
}

//
// Implement ClusterRoleBindingFieldResolvers
//

var _ schema.CoreV2ClusterRoleBindingExtensionOverridesFieldResolvers = (*clusterRoleBindingImpl)(nil)

type clusterRoleBindingImpl struct {
schema.CoreV2ClusterRoleBindingAliases
}

// ID implements response to request for 'id' field.
func (*clusterRoleBindingImpl) ID(p graphql.ResolveParams) (string, error) {
return globalid.ClusterRoleBindingTranslator.EncodeToString(p.Context, p.Source), nil
}

// ToJSON implements response to request for 'toJSON' field.
func (*clusterRoleBindingImpl) ToJSON(p graphql.ResolveParams) (interface{}, error) {
return types.WrapResource(p.Source.(corev2.Resource)), nil
}

// IsTypeOf is used to determine if a given value is associated with the type
func (*clusterRoleBindingImpl) IsTypeOf(s interface{}, p graphql.IsTypeOfParams) bool {
_, ok := s.(*corev2.ClusterRoleBinding)
return ok
}

//
// Implement RoleFieldResolvers
//

var _ schema.CoreV2RoleExtensionOverridesFieldResolvers = (*roleImpl)(nil)

type roleImpl struct {
schema.CoreV2RoleAliases
}

// ID implements response to request for 'id' field.
func (*roleImpl) ID(p graphql.ResolveParams) (string, error) {
return globalid.RoleTranslator.EncodeToString(p.Context, p.Source), nil
}

// ToJSON implements response to request for 'toJSON' field.
func (*roleImpl) ToJSON(p graphql.ResolveParams) (interface{}, error) {
return types.WrapResource(p.Source.(corev2.Resource)), nil
}

// IsTypeOf is used to determine if a given value is associated with the type
func (*roleImpl) IsTypeOf(s interface{}, p graphql.IsTypeOfParams) bool {
_, ok := s.(*corev2.Role)
return ok
}

//
// Implement RoleBindingFieldResolvers
//

var _ schema.CoreV2RoleBindingExtensionOverridesFieldResolvers = (*roleBindingImpl)(nil)

type roleBindingImpl struct {
schema.CoreV2RoleBindingAliases
}

// ID implements response to request for 'id' field.
func (*roleBindingImpl) ID(p graphql.ResolveParams) (string, error) {
return globalid.RoleBindingTranslator.EncodeToString(p.Context, p.Source), nil
}

// ToJSON implements response to request for 'toJSON' field.
func (*roleBindingImpl) ToJSON(p graphql.ResolveParams) (interface{}, error) {
return types.WrapResource(p.Source.(corev2.Resource)), nil
}

// IsTypeOf is used to determine if a given value is associated with the type
func (*roleBindingImpl) IsTypeOf(s interface{}, p graphql.IsTypeOfParams) bool {
_, ok := s.(*corev2.RoleBinding)
return ok
}
178 changes: 147 additions & 31 deletions backend/apid/graphql/corev2_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package graphql

import (
"context"
"fmt"
"reflect"
"testing"

Expand All @@ -10,24 +11,56 @@ import (
"github.com/sensu/core/v3/types"
)

func Test_corev2PipelineImpl_ID(t *testing.T) {
func Test_corev2_ID(t *testing.T) {
tests := []struct {
name string
in *corev2.Pipeline
name string
resolver interface {
ID(p graphql.ResolveParams) (string, error)
}
in interface{}
want string
wantErr bool
}{
{
name: "default",
in: corev2.FixturePipeline("test", "default"),
want: "srn:corev2/pipeline:default:test",
wantErr: false,
name: "default",
resolver: &corev2PipelineImpl{},
in: corev2.FixturePipeline("test", "default"),
want: "srn:corev2/pipeline:default:test",
wantErr: false,
},
{
name: "role",
resolver: &roleImpl{},
in: corev2.FixtureRole("test", "default"),
want: "srn:roles:default:test",
wantErr: false,
},
{
name: "role_binding",
resolver: &roleBindingImpl{},
in: corev2.FixtureRoleBinding("test", "default"),
want: "srn:rolebindings:default:test",
wantErr: false,
},
{
name: "cluster_role",
resolver: &clusterRoleImpl{},
in: corev2.FixtureClusterRole("test"),
want: "srn:clusterroles:test",
wantErr: false,
},
{
name: "cluster_role_binding",
resolver: &clusterRoleBindingImpl{},
in: corev2.FixtureClusterRoleBinding("test"),
want: "srn:clusterrolebindings:test",
wantErr: false,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
tr := &corev2PipelineImpl{}
got, err := tr.ID(graphql.ResolveParams{Context: context.Background(), Source: tt.in})
t.Run(fmt.Sprintf("%T/%s", tt.resolver, tt.name), func(t *testing.T) {
params := graphql.ResolveParams{Context: context.Background(), Source: tt.in}
got, err := tt.resolver.ID(params)
if (err != nil) != tt.wantErr {
t.Errorf("corev2PipelineImpl.ID() error = %v, wantErr %v", err, tt.wantErr)
return
Expand All @@ -39,24 +72,55 @@ func Test_corev2PipelineImpl_ID(t *testing.T) {
}
}

func Test_corev2PipelineImp_ToJSON(t *testing.T) {
func Test_corev2_ToJSON(t *testing.T) {
tests := []struct {
name string
in *corev2.Pipeline
name string
resolver interface {
ToJSON(p graphql.ResolveParams) (interface{}, error)
}
in interface{}
want interface{}
wantErr bool
}{
{
name: "default",
in: corev2.FixturePipeline("name", "default"),
want: types.WrapResource(corev2.FixturePipeline("name", "default")),
wantErr: false,
name: "default",
resolver: &corev2PipelineImpl{},
in: corev2.FixturePipeline("name", "default"),
want: types.WrapResource(corev2.FixturePipeline("name", "default")),
wantErr: false,
},
{
name: "default",
resolver: &roleImpl{},
in: corev2.FixtureRole("name", "default"),
want: types.WrapResource(corev2.FixtureRole("name", "default")),
wantErr: false,
},
{
name: "default",
resolver: &roleBindingImpl{},
in: corev2.FixtureRoleBinding("name", "default"),
want: types.WrapResource(corev2.FixtureRoleBinding("name", "default")),
wantErr: false,
},
{
name: "default",
resolver: &clusterRoleImpl{},
in: corev2.FixtureClusterRole("name"),
want: types.WrapResource(corev2.FixtureClusterRole("name")),
wantErr: false,
},
{
name: "default",
resolver: &clusterRoleBindingImpl{},
in: corev2.FixtureClusterRoleBinding("name"),
want: types.WrapResource(corev2.FixtureClusterRoleBinding("name")),
wantErr: false,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
tr := &corev2PipelineImpl{}
got, err := tr.ToJSON(graphql.ResolveParams{Context: context.Background(), Source: tt.in})
t.Run(fmt.Sprintf("%T/%s", tt.resolver, tt.name), func(t *testing.T) {
got, err := tt.resolver.ToJSON(graphql.ResolveParams{Context: context.Background(), Source: tt.in})
if (err != nil) != tt.wantErr {
t.Errorf("corev2PipelineImpl.ToJSON() error = %v, wantErr %v", err, tt.wantErr)
return
Expand All @@ -68,27 +132,79 @@ func Test_corev2PipelineImp_ToJSON(t *testing.T) {
}
}

func Test_corev2PipelineImp_IsTypeOf(t *testing.T) {
func Test_corev2types_IsTypeOf(t *testing.T) {
tests := []struct {
name string
name string
resolver interface {
IsTypeOf(s interface{}, p graphql.IsTypeOfParams) bool
}
in interface{}
want bool
}{
{
name: "match",
in: corev2.FixturePipeline("name", "default"),
want: true,
name: "match",
resolver: &corev2PipelineImpl{},
in: corev2.FixturePipeline("name", "default"),
want: true,
},
{
name: "no match",
resolver: &corev2PipelineImpl{},
in: corev2.FixtureEntity("name"),
want: false,
},
{
name: "match",
resolver: &roleImpl{},
in: corev2.FixtureRole("name", "default"),
want: true,
},
{
name: "no match",
resolver: &roleImpl{},
in: corev2.FixtureEntity("name"),
want: false,
},
{
name: "match",
resolver: &roleBindingImpl{},
in: corev2.FixtureRoleBinding("name", "default"),
want: true,
},
{
name: "no match",
resolver: &roleBindingImpl{},
in: corev2.FixtureEntity("name"),
want: false,
},
{
name: "match",
resolver: &clusterRoleImpl{},
in: corev2.FixtureClusterRole("name"),
want: true,
},
{
name: "no match",
resolver: &clusterRoleImpl{},
in: corev2.FixtureEntity("name"),
want: false,
},
{
name: "match",
resolver: &clusterRoleBindingImpl{},
in: corev2.FixtureClusterRoleBinding("name"),
want: true,
},
{
name: "no match",
in: corev2.FixtureEntity("name"),
want: false,
name: "no match",
resolver: &clusterRoleBindingImpl{},
in: corev2.FixtureEntity("name"),
want: false,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
tr := &corev2PipelineImpl{}
got := tr.IsTypeOf(tt.in, graphql.IsTypeOfParams{Context: context.Background()})
t.Run(fmt.Sprintf("%T/%s", tt.resolver, tt.name), func(t *testing.T) {
got := tt.resolver.IsTypeOf(tt.in, graphql.IsTypeOfParams{Context: context.Background()})
if !reflect.DeepEqual(got, tt.want) {
t.Errorf("corev2PipelineImpl.ToJSON() = %v, want %v", got, tt.want)
}
Expand Down
Loading

0 comments on commit 531dfea

Please sign in to comment.