summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorcharlieablett <cablett@gitlab.com>2019-08-23 00:17:38 +1000
committerBrett Walker <bwalker@gitlab.com>2019-10-08 14:52:19 -0500
commit909b38f8ad0c737fbadd1782d5cc3e14f653b9e5 (patch)
treea5d037c77c971af4a76591c982954fa5722e097b /app
parent50d93f8d1686950fc58dda4823c4835fd0d8c14b (diff)
downloadgitlab-ce-909b38f8ad0c737fbadd1782d5cc3e14f653b9e5.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')
-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)