summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2019-03-04 18:36:37 +0000
committerYorick Peterse <yorickpeterse@gmail.com>2019-03-04 18:36:37 +0000
commit6c3482d166955cd112b034598f4aaac57af544c3 (patch)
treed75e188edfbb455ec6f444b99c07f82420c6762b /lib
parent72db8ae2b2d9bc79a96937f3b4943462b053af96 (diff)
parent9d046c8704c0e7df18d2f9e380e987d22b9a0b2e (diff)
downloadgitlab-ce-6c3482d166955cd112b034598f4aaac57af544c3.tar.gz
Merge branch 'security-50334' into 'master'
Fix git clone revealing private repo's presence See merge request gitlab/gitlabhq!2937
Diffstat (limited to 'lib')
-rw-r--r--lib/constraints/project_url_constrainer.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/constraints/project_url_constrainer.rb b/lib/constraints/project_url_constrainer.rb
index eadfbf7bc01..d41490d2ebd 100644
--- a/lib/constraints/project_url_constrainer.rb
+++ b/lib/constraints/project_url_constrainer.rb
@@ -2,12 +2,13 @@
module Constraints
class ProjectUrlConstrainer
- def matches?(request)
+ def matches?(request, existence_check: true)
namespace_path = request.params[:namespace_id]
project_path = request.params[:project_id] || request.params[:id]
full_path = [namespace_path, project_path].join('/')
return false unless ProjectPathValidator.valid_path?(full_path)
+ return true unless existence_check
# We intentionally allow SELECT(*) here so result of this query can be used
# as cache for further Project.find_by_full_path calls within request