summaryrefslogtreecommitdiff
path: root/app/graphql
diff options
context:
space:
mode:
authorcharlieablett <cablett@gitlab.com>2019-08-23 00:17:38 +1000
committercharlieablett <cablett@gitlab.com>2019-10-23 15:40:12 +1300
commit1689559facc7d50130c11c8fdc496641f719ae75 (patch)
tree5172eab690cda555a78e29d4ef88cc10c84f8426 /app/graphql
parent1425a56c75beecaa289ad59587d636f8f469509e (diff)
downloadgitlab-ce-1689559facc7d50130c11c8fdc496641f719ae75.tar.gz
Check for recursion and fail if too recursive
- List all overly-recursive fields - Reduce recursion threshold to 2 - Add test for not-recursive-enough query - Use reusable methods in tests - Add changelog - Set changeable acceptable recursion level - Add error check test helpers
Diffstat (limited to 'app/graphql')
-rw-r--r--app/graphql/gitlab_schema.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/app/graphql/gitlab_schema.rb b/app/graphql/gitlab_schema.rb
index 4c8612c8f2e..1899278ff3c 100644
--- a/app/graphql/gitlab_schema.rb
+++ b/app/graphql/gitlab_schema.rb
@@ -18,15 +18,15 @@ class GitlabSchema < GraphQL::Schema
use Gitlab::Graphql::GenericTracing
query_analyzer Gitlab::Graphql::QueryAnalyzers::LoggerAnalyzer.new
-
- query(Types::QueryType)
-
- default_max_page_size 100
+ query_analyzer Gitlab::Graphql::QueryAnalyzers::RecursionAnalyzer.new
max_complexity DEFAULT_MAX_COMPLEXITY
max_depth DEFAULT_MAX_DEPTH
- mutation(Types::MutationType)
+ query Types::QueryType
+ mutation Types::MutationType
+
+ default_max_page_size 100
class << self
def multiplex(queries, **kwargs)