diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2019-02-27 17:19:45 +0300 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2019-02-27 17:19:45 +0300 |
| commit | 9bf7ca89711064214c12b584192ae22aeb9193c2 (patch) | |
| tree | abd2049c81345f2b99080dd1a23bf84a6e3d371a /app | |
| parent | b510221f50557357cd127ae446fc5280d2cb8941 (diff) | |
| parent | 0e53c34f669fd6449d8ce636e31a5f85c7082300 (diff) | |
Merge branch 'security-kubernetes-local-ssrf-11-7' into '11-7-stable'
Block local URLs for Kubernetes integration
See merge request gitlab/gitlabhq!2960
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/clusters/platforms/kubernetes.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/clusters/platforms/kubernetes.rb b/app/models/clusters/platforms/kubernetes.rb index 1cc170c8c4d..c8484923502 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 |