fix: block based on query operation name length

router-tests/security_test.go

@@ -1,6 +1,8 @@
 package integration
 
 import (
+	"fmt"
+	"github.com/wundergraph/cosmo/router/core"
 	"net/http"
 	"testing"
 
@@ -109,3 +111,255 @@ func TestParserHardLimits(t *testing.T) {
 		})
 	})
 }
+
+func TestQueryNamingLimits(t *testing.T) {
+	t.Parallel()
+
+	t.Run("verify operation query naming limits", func(t *testing.T) {
+		t.Parallel()
+
+		t.Run("with large query name and no operation name", func(t *testing.T) {
+			t.Parallel()
+			maxLength := 2
+			queryName := "longstring"
+
+			testenv.Run(t, &testenv.Config{
+				ModifySecurityConfiguration: func(securityConfiguration *config.SecurityConfiguration) {
+					securityConfiguration.OperationNameLengthLimit = maxLength
+				},
+			}, func(t *testing.T, xEnv *testenv.Environment) {
+				expectedErrorMessage := fmt.Sprintf(`{"errors":[{"message":"operation name of length %d exceeds max length of %d"}]}`, len(queryName), maxLength)
+
+				resPost, err := xEnv.MakeGraphQLRequest(testenv.GraphQLRequest{
+					Query: "query " + queryName + " { employees { id } }",
+				})
+				require.NoError(t, err)
+				require.JSONEq(t, expectedErrorMessage, resPost.Body)
+				require.Equal(t, http.StatusBadRequest, resPost.Response.StatusCode)
+
+				resGet, err := xEnv.MakeGraphQLRequestOverGET(testenv.GraphQLRequest{
+					Query: "query " + queryName + " { employees { id } }",
+				})
+				require.NoError(t, err)
+				require.JSONEq(t, expectedErrorMessage, resGet.Body)
+				require.Equal(t, http.StatusBadRequest, resGet.Response.StatusCode)
+			})
+		})
+
+		t.Run("with large query name and small operation name", func(t *testing.T) {
+			t.Parallel()
+			maxLength := 6
+			queryName := "longstring"
+			operationNameGet := `short`
+			operationNamePost := `"short"`
+
+			testenv.Run(t, &testenv.Config{
+				ModifySecurityConfiguration: func(securityConfiguration *config.SecurityConfiguration) {
+					securityConfiguration.OperationNameLengthLimit = maxLength
+				},
+			}, func(t *testing.T, xEnv *testenv.Environment) {
+				expectedErrorMessage := fmt.Sprintf(`{"errors":[{"message":"operation name of length %d exceeds max length of %d"}]}`, len(queryName), maxLength)
+
+				resPost, err := xEnv.MakeGraphQLRequest(testenv.GraphQLRequest{
+					Query:         "query " + queryName + " { employees { id } }",
+					OperationName: []byte(operationNamePost),
+				})
+				require.NoError(t, err)
+				require.JSONEq(t, expectedErrorMessage, resPost.Body)
+				require.Equal(t, http.StatusBadRequest, resPost.Response.StatusCode)
+
+				resGet, err := xEnv.MakeGraphQLRequestOverGET(testenv.GraphQLRequest{
+					Query:         "query " + queryName + " { employees { id } }",
+					OperationName: []byte(operationNameGet),
+				})
+				require.NoError(t, err)
+				require.JSONEq(t, expectedErrorMessage, resGet.Body)
+				require.Equal(t, http.StatusBadRequest, resGet.Response.StatusCode)
+			})
+		})
+
+		t.Run("with small query name and large operation name", func(t *testing.T) {
+			t.Parallel()
+
+			maxLength := 6
+			queryName := "short"
+			operationNameGet := `longname`
+			operationNamePost := `"longname"`
+
+			testenv.Run(t, &testenv.Config{
+				ModifySecurityConfiguration: func(securityConfiguration *config.SecurityConfiguration) {
+					securityConfiguration.OperationNameLengthLimit = maxLength
+				},
+			}, func(t *testing.T, xEnv *testenv.Environment) {
+				expectedErrorMessage := fmt.Sprintf(`{"errors":[{"message":"operation name of length %d exceeds max length of %d"}]}`, len(operationNameGet), maxLength)
+
+				resPost, err := xEnv.MakeGraphQLRequest(testenv.GraphQLRequest{
+					Query:         "query " + queryName + " { employees { id } }",
+					OperationName: []byte(operationNamePost),
+				})
+				require.NoError(t, err)
+				require.JSONEq(t, expectedErrorMessage, resPost.Body)
+				require.Equal(t, http.StatusBadRequest, resPost.Response.StatusCode)
+
+				resGet, err := xEnv.MakeGraphQLRequestOverGET(testenv.GraphQLRequest{
+					Query:         "query " + queryName + " { employees { id } }",
+					OperationName: []byte(operationNameGet),
+				})
+				require.NoError(t, err)
+				require.JSONEq(t, expectedErrorMessage, resGet.Body)
+				require.Equal(t, http.StatusBadRequest, resGet.Response.StatusCode)
+			})
+		})
+
+		t.Run("with small query name and small operation name", func(t *testing.T) {
+			t.Parallel()
+
+			liitSize := 7
+			queryName := "short"
+			operationNameGet := `short`
+			operationNamePost := `"short"`
+
+			testenv.Run(t, &testenv.Config{
+				ModifySecurityConfiguration: func(securityConfiguration *config.SecurityConfiguration) {
+					securityConfiguration.OperationNameLengthLimit = liitSize
+				},
+			}, func(t *testing.T, xEnv *testenv.Environment) {
+				resPost, err := xEnv.MakeGraphQLRequest(testenv.GraphQLRequest{
+					Query:         "query " + queryName + " { employees { id } }",
+					OperationName: []byte(operationNamePost),
+				})
+				require.NoError(t, err)
+				require.JSONEq(t, `{"data":{"employees":[{"id":1},{"id":2},{"id":3},{"id":4},{"id":5},{"id":7},{"id":8},{"id":10},{"id":11},{"id":12}]}}`, resPost.Body)
+				require.Equal(t, http.StatusOK, resPost.Response.StatusCode)
+
+				resGet, err := xEnv.MakeGraphQLRequestOverGET(testenv.GraphQLRequest{
+					Query:         "query " + queryName + " { employees { id } }",
+					OperationName: []byte(operationNameGet),
+				})
+				require.NoError(t, err)
+				require.JSONEq(t, `{"data":{"employees":[{"id":1},{"id":2},{"id":3},{"id":4},{"id":5},{"id":7},{"id":8},{"id":10},{"id":11},{"id":12}]}}`, resGet.Body)
+				require.Equal(t, http.StatusOK, resGet.Response.StatusCode)
+			})
+		})
+
+		t.Run("with multiple queries of which one is large", func(t *testing.T) {
+			t.Parallel()
+
+			maxLength := 6
+			query1Name := "short"
+			query2Name := "longstring"
+
+			testenv.Run(t, &testenv.Config{
+				ModifySecurityConfiguration: func(securityConfiguration *config.SecurityConfiguration) {
+					securityConfiguration.OperationNameLengthLimit = maxLength
+				},
+			}, func(t *testing.T, xEnv *testenv.Environment) {
+				expectedErrorMessage := fmt.Sprintf(`{"errors":[{"message":"operation name of length %d exceeds max length of %d"}]}`, len(query2Name), maxLength)
+
+				resPost, err := xEnv.MakeGraphQLRequest(testenv.GraphQLRequest{
+					Query: "query " + query1Name + " { employees { id } } query " + query2Name + " { employees { id } }",
+				})
+				require.NoError(t, err)
+				require.JSONEq(t, expectedErrorMessage, resPost.Body)
+				require.Equal(t, http.StatusBadRequest, resPost.Response.StatusCode)
+
+				resGet, err := xEnv.MakeGraphQLRequestOverGET(testenv.GraphQLRequest{
+					Query: "query " + query1Name + " { employees { id } } query " + query2Name + " { employees { id } }",
+				})
+				require.NoError(t, err)
+				require.JSONEq(t, expectedErrorMessage, resGet.Body)
+				require.Equal(t, http.StatusBadRequest, resGet.Response.StatusCode)
+			})
+		})
+
+		t.Run("with multiple queries of which both are small", func(t *testing.T) {
+			t.Parallel()
+
+			maxLength := 6
+			query1Name := "short1"
+			query2Name := "short2"
+
+			testenv.Run(t, &testenv.Config{
+				ModifySecurityConfiguration: func(securityConfiguration *config.SecurityConfiguration) {
+					securityConfiguration.OperationNameLengthLimit = maxLength
+				},
+			}, func(t *testing.T, xEnv *testenv.Environment) {
+				resPost, err := xEnv.MakeGraphQLRequest(testenv.GraphQLRequest{
+					Query: "query " + query1Name + " { employees { id } } query " + query2Name + " { employees { id } }",
+				})
+				require.NoError(t, err)
+				require.JSONEq(t, `{"data":{"employees":[{"id":1},{"id":2},{"id":3},{"id":4},{"id":5},{"id":7},{"id":8},{"id":10},{"id":11},{"id":12}]}}`, resPost.Body)
+				require.Equal(t, http.StatusOK, resPost.Response.StatusCode)
+
+				resGet, err := xEnv.MakeGraphQLRequestOverGET(testenv.GraphQLRequest{
+					Query: "query " + query1Name + " { employees { id } } query " + query2Name + " { employees { id } }",
+				})
+				require.NoError(t, err)
+				require.JSONEq(t, `{"data":{"employees":[{"id":1},{"id":2},{"id":3},{"id":4},{"id":5},{"id":7},{"id":8},{"id":10},{"id":11},{"id":12}]}}`, resGet.Body)
+				require.Equal(t, http.StatusOK, resGet.Response.StatusCode)
+			})
+		})
+
+		t.Run("with large queries with max length of 0 where the validation is not enabled", func(t *testing.T) {
+			t.Parallel()
+
+			maxLength := 0
+			query1Name := "longlonglonglonglonglonglonglonglonglong1"
+			query2Name := "short2"
+
+			testenv.Run(t, &testenv.Config{
+				ModifySecurityConfiguration: func(securityConfiguration *config.SecurityConfiguration) {
+					securityConfiguration.OperationNameLengthLimit = maxLength
+				},
+			}, func(t *testing.T, xEnv *testenv.Environment) {
+				resPost, err := xEnv.MakeGraphQLRequest(testenv.GraphQLRequest{
+					Query: "query " + query1Name + " { employees { id } } query " + query2Name + " { employees { id } }",
+				})
+				require.NoError(t, err)
+				require.JSONEq(t, `{"data":{"employees":[{"id":1},{"id":2},{"id":3},{"id":4},{"id":5},{"id":7},{"id":8},{"id":10},{"id":11},{"id":12}]}}`, resPost.Body)
+				require.Equal(t, http.StatusOK, resPost.Response.StatusCode)
+
+				resGet, err := xEnv.MakeGraphQLRequestOverGET(testenv.GraphQLRequest{
+					Query: "query " + query1Name + " { employees { id } } query " + query2Name + " { employees { id } }",
+				})
+				require.NoError(t, err)
+				require.JSONEq(t, `{"data":{"employees":[{"id":1},{"id":2},{"id":3},{"id":4},{"id":5},{"id":7},{"id":8},{"id":10},{"id":11},{"id":12}]}}`, resGet.Body)
+				require.Equal(t, http.StatusOK, resGet.Response.StatusCode)
+			})
+		})
+
+		// In case of introspection checks, we could potentially early return
+		t.Run("with multiple queries with introspection disabled", func(t *testing.T) {
+			t.Parallel()
+
+			maxLength := 6
+			query1Name := "longquery"
+			query2Name := "short2"
+
+			testenv.Run(t, &testenv.Config{
+				ModifySecurityConfiguration: func(securityConfiguration *config.SecurityConfiguration) {
+					securityConfiguration.OperationNameLengthLimit = maxLength
+				},
+				RouterOptions: []core.Option{
+					core.WithIntrospection(false),
+				},
+			}, func(t *testing.T, xEnv *testenv.Environment) {
+				expectedErrorMessage := fmt.Sprintf(`{"errors":[{"message":"operation name of length %d exceeds max length of %d"}]}`, len(query1Name), maxLength)
+
+				resPost, err := xEnv.MakeGraphQLRequest(testenv.GraphQLRequest{
+					Query: "query " + query1Name + " { __schema { __typename } } query " + query2Name + " { employees { id } }",
+				})
+				require.NoError(t, err)
+				require.JSONEq(t, expectedErrorMessage, resPost.Body)
+				require.Equal(t, http.StatusBadRequest, resPost.Response.StatusCode)
+
+				resGet, err := xEnv.MakeGraphQLRequestOverGET(testenv.GraphQLRequest{
+					Query: "query " + query1Name + " { __schema { __typename } } query " + query2Name + " { employees { id } }",
+				})
+				require.NoError(t, err)
+				require.JSONEq(t, expectedErrorMessage, resGet.Body)
+				require.Equal(t, http.StatusBadRequest, resGet.Response.StatusCode)
+			})
+		})
+	})
+}

router-tests/testenv/testenv.go

@@ -1326,8 +1326,17 @@ func configureRouter(listenerAddr string, testConfig *Config, routerConfig *node
 	}
 
 	if testConfig.ModifySecurityConfiguration != nil {
-		testConfig.ModifySecurityConfiguration(&cfg.SecurityConfiguration)
+		originalFunc := testConfig.ModifySecurityConfiguration
+		testConfig.ModifySecurityConfiguration = func(securityConfiguration *config.SecurityConfiguration) {
+			securityConfiguration.OperationNameLengthLimit = 512
+			originalFunc(securityConfiguration)
+		}
+	} else {
+		testConfig.ModifySecurityConfiguration = func(securityConfiguration *config.SecurityConfiguration) {
+			securityConfiguration.OperationNameLengthLimit = 512
+		}
 	}
+	testConfig.ModifySecurityConfiguration(&cfg.SecurityConfiguration)
 
 	if testConfig.ModifySubgraphErrorPropagation != nil {
 		testConfig.ModifySubgraphErrorPropagation(&cfg.SubgraphErrorPropagation)

router/core/graph_server.go

@@ -1207,6 +1207,7 @@ func (s *graphServer) buildGraphMux(
 			MaxDepth:  s.Config.securityConfiguration.ParserLimits.ApproximateDepthLimit,
 			MaxFields: s.Config.securityConfiguration.ParserLimits.TotalFieldsLimit,
 		},
+		OperationNameLengthLimit:                         s.securityConfiguration.OperationNameLengthLimit,
 		ApolloCompatibilityFlags:                         s.apolloCompatibilityFlags,
 		ApolloRouterCompatibilityFlags:                   s.apolloRouterCompatibilityFlags,
 		DisableExposingVariablesContentOnValidationError: s.engineExecutionConfiguration.DisableExposingVariablesContentOnValidationError,

router/core/graphql_prehandler.go

@@ -529,6 +529,15 @@ func (h *PreHandler) handleOperation(req *http.Request, variablesParser *astjson
 		}
 	}
 
+	if operationKit.isOperationNameLimitExceeded(operationKit.parsedOperation.Request.OperationName) {
+		return &httpGraphqlError{
+			message: fmt.Sprintf("operation name of length %d exceeds max length of %d",
+				len(operationKit.parsedOperation.Request.OperationName),
+				operationKit.operationProcessor.operationNameLimit),
+			statusCode: http.StatusBadRequest,
+		}
+	}
+
 	// Compute the operation sha256 hash as soon as possible for observability reasons
 	if h.shouldComputeOperationSha256(operationKit) {
 		if err := operationKit.ComputeOperationSha256(); err != nil {

router/core/operation_processor.go

@@ -116,6 +116,7 @@ type OperationProcessorOptions struct {
 	DisableExposingVariablesContentOnValidationError bool
 	ComplexityLimits                                 *config.ComplexityLimits
 	ParserTokenizerLimits                            astparser.TokenizerLimits
+	OperationNameLengthLimit                         int
 }
 
 // OperationProcessor provides shared resources to the parseKit and OperationKit.
@@ -131,6 +132,7 @@ type OperationProcessor struct {
 	parseKitOptions          *parseKitOptions
 	complexityLimits         *config.ComplexityLimits
 	parserTokenizerLimits    astparser.TokenizerLimits
+	operationNameLimit       int
 }
 
 // parseKit is a helper struct to parse, normalize and validate operations
@@ -487,6 +489,14 @@ func (o *OperationKit) isIntrospectionQuery() (result bool, err error) {
 			ref := possibleOperationDefinitionRefs[i]
 			name := o.kit.doc.OperationDefinitionNameString(ref)
 
+			if o.isOperationNameLimitExceeded(name) {
+				return false, &httpGraphqlError{
+					message: fmt.Sprintf("operation name of length %d exceeds max length of %d",
+						len(name), o.operationProcessor.operationNameLimit),
+					statusCode: http.StatusBadRequest,
+				}
+			}
+
 			if o.parsedOperation.Request.OperationName == name {
 				operationDefinitionRef = ref
 				break
@@ -527,6 +537,13 @@ func (o *OperationKit) isIntrospectionQuery() (result bool, err error) {
 	return false, nil
 }
 
+func (o *OperationKit) isOperationNameLimitExceeded(operationName string) bool {
+	if o.operationProcessor.operationNameLimit == 0 {
+		return false
+	}
+	return len(operationName) > o.operationProcessor.operationNameLimit
+}
+
 // Parse parses the operation, populates the document and set the operation type.
 // UnmarshalOperationFromBody must be called before calling this method.
 func (o *OperationKit) Parse() error {
@@ -560,6 +577,11 @@ func (o *OperationKit) Parse() error {
 		isIntrospection, err := o.isIntrospectionQuery()
 
 		if err != nil {
+			var httpGqlError *httpGraphqlError
+			if errors.As(err, &httpGqlError) {
+				return httpGqlError
+			}
+
 			return &httpGraphqlError{
 				message:    "could not determine if operation was an introspection query",
 				statusCode: http.StatusOK,
@@ -582,13 +604,23 @@ func (o *OperationKit) Parse() error {
 		o.kit.numOperations++
 		ref := o.kit.doc.RootNodes[i].Ref
 		name := string(o.kit.doc.OperationDefinitionNameBytes(ref))
+
 		if len(name) == 0 {
 			anonymousOperationCount++
 			if anonymousOperationDefinitionRef == -1 {
 				anonymousOperationDefinitionRef = ref
 			}
 			continue
 		}
+
+		if o.isOperationNameLimitExceeded(name) {
+			return &httpGraphqlError{
+				message: fmt.Sprintf("operation name of length %d exceeds max length of %d",
+					len(name), o.operationProcessor.operationNameLimit),
+				statusCode: http.StatusBadRequest,
+			}
+		}
+
 		if o.parsedOperation.Request.OperationName == "" {
 			o.operationDefinitionRef = ref
 			o.originalOperationNameRef = o.kit.doc.OperationDefinitions[ref].Name
@@ -1256,6 +1288,7 @@ func NewOperationProcessor(opts OperationProcessorOptions) *OperationProcessor {
 		parseKitSemaphore:        make(chan int, opts.ParseKitPoolSize),
 		introspectionEnabled:     opts.IntrospectionEnabled,
 		parserTokenizerLimits:    opts.ParserTokenizerLimits,
+		operationNameLimit:       opts.OperationNameLengthLimit,
 		complexityLimits:         opts.ComplexityLimits,
 		parseKitOptions: &parseKitOptions{
 			apolloCompatibilityFlags:                         opts.ApolloCompatibilityFlags,