From 72f59ddf4c9d276bd565892c0cf79d5622906090 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Rodr=C3=ADguez?= Date: Mon, 11 Jul 2016 21:29:13 -0400 Subject: Use Pathname to make the repository storage path validations more robust --- config/initializers/6_validations.rb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'config') diff --git a/config/initializers/6_validations.rb b/config/initializers/6_validations.rb index 3ba9e36c567..83acdc8ab54 100644 --- a/config/initializers/6_validations.rb +++ b/config/initializers/6_validations.rb @@ -3,22 +3,23 @@ def storage_name_valid?(name) end def find_parent_path(name, path) + parent = Pathname.new(path).realpath.parent Gitlab.config.repositories.storages.detect do |n, p| - name != n && path.chomp('/').start_with?(p.chomp('/')) + name != n && Pathname.new(p).realpath == parent end end -def error(message) +def storage_validation_error(message) raise "#{message}. Please fix this in your gitlab.yml before starting GitLab." end -error('No repository storage path defined') if Gitlab.config.repositories.storages.empty? +storage_validation_error('No repository storage path defined') if Gitlab.config.repositories.storages.empty? Gitlab.config.repositories.storages.each do |name, path| - error("\"#{name}\" is not a valid storage name") unless storage_name_valid?(name) + storage_validation_error("\"#{name}\" is not a valid storage name") unless storage_name_valid?(name) parent_name, _parent_path = find_parent_path(name, path) if parent_name - error("#{name} is a nested path of #{parent_name}. Nested paths are not supported for repository storages") + storage_validation_error("#{name} is a nested path of #{parent_name}. Nested paths are not supported for repository storages") end end -- cgit v1.2.1