Use Pathname to make the repository storage path validations more robust

1 files changed, 6 insertions, 5 deletions

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