summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2019-02-27 14:19:48 +0000
committerYorick Peterse <yorickpeterse@gmail.com>2019-02-27 14:19:48 +0000
commit791325145d7ff9640e2ce652d135086906fa2bce (patch)
treeb9e2096d52c97f5e1a3a0891dd4407fbc0177461 /app
parenta738d03187624132ec1041e41cfda09401a5ffa4 (diff)
parente5181ff4facbf61bcb284e0d3a8d1fd2e8119b06 (diff)
downloadgitlab-ce-791325145d7ff9640e2ce652d135086906fa2bce.tar.gz
Merge branch 'security-kubernetes-local-ssrf-11-8' into '11-8-stable'
Block local URLs for Kubernetes integration See merge request gitlab/gitlabhq!2959
Diffstat (limited to 'app')
-rw-r--r--app/models/clusters/platforms/kubernetes.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/clusters/platforms/kubernetes.rb b/app/models/clusters/platforms/kubernetes.rb
index c8969351ed9..0e5928550e3 100644
--- a/app/models/clusters/platforms/kubernetes.rb
+++ b/app/models/clusters/platforms/kubernetes.rb
@@ -41,7 +41,7 @@ module Clusters
validate :no_namespace, unless: :allow_user_defined_namespace?
# We expect to be `active?` only when enabled and cluster is created (the api_url is assigned)
- validates :api_url, url: true, presence: true
+ validates :api_url, public_url: true, presence: true
validates :token, presence: true
validate :prevent_modification, on: :update