Merge branch 'flevour/gitlab-ce-project-path-insensitive-lookup'

6 files changed, 34 insertions, 7 deletions

diff --git a/CHANGELOG b/CHANGELOG
index a499dda2bb3..53f787c5c4c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -102,6 +102,7 @@ v 8.0.0
   - Webhook for issue now contains repository field (Jungkook Park)
   - Add ability to add custom text to the help page (Jeroen van Baarsen)
   - Add pg_schema to backup config
+  - Redirect from incorrectly cased group or project path to correct one (Francesco Levorato)
   - Removed API calls from CE to CI
 
 v 7.14.3
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 9b6472a7b13..527c9da0faa 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -117,9 +117,14 @@ class ApplicationController < ActionController::Base
         redirect_to request.original_url.gsub(/\.git\Z/, '') and return
       end
 
-      @project = Project.find_with_namespace("#{namespace}/#{id}")
+      project_path = "#{namespace}/#{id}"
+      @project = Project.find_with_namespace(project_path)
+
 
       if @project and can?(current_user, :read_project, @project)
+        if @project.path_with_namespace != project_path
+          redirect_to request.original_url.gsub(project_path, @project.path_with_namespace) and return
+        end
         @project
       elsif current_user.nil?
         @project = nil
diff --git a/app/models/project.rb b/app/models/project.rb
index 953b37e3f7a..4bcc16d8e9c 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -238,10 +238,10 @@ class Project < ActiveRecord::Base
       return nil unless id.include?('/')
 
       id = id.split('/')
-      namespace = Namespace.find_by(path: id.first)
+      namespace = Namespace.by_path(id.first)
       return nil unless namespace
 
-      where(namespace_id: namespace.id).find_by(path: id.second)
+      where(namespace_id: namespace.id).where("LOWER(projects.path) = :path", path: id.second.downcase).first
     end
 
     def visibility_levels
diff --git a/spec/controllers/projects/issues_controller_spec.rb b/spec/controllers/projects/issues_controller_spec.rb
index 871b9219ca9..76d56bc989d 100644
--- a/spec/controllers/projects/issues_controller_spec.rb
+++ b/spec/controllers/projects/issues_controller_spec.rb
@@ -8,28 +8,34 @@ describe Projects::IssuesController do
   before do
     sign_in(user)
     project.team << [user, :developer]
-    controller.instance_variable_set(:@project, project)
   end
 
   describe "GET #index" do
     it "returns index" do
-      get :index, namespace_id: project.namespace.id, project_id: project.id
+      get :index, namespace_id: project.namespace.path, project_id: project.path
 
       expect(response.status).to eq(200)
     end
 
+    it "return 301 if request path doesn't match project path" do
+      get :index, namespace_id: project.namespace.path, project_id: project.path.upcase
+
+      expect(response).to redirect_to(namespace_project_issues_path(project.namespace, project))
+    end
+
     it "returns 404 when issues are disabled" do
       project.issues_enabled = false
       project.save
 
-      get :index, namespace_id: project.namespace.id, project_id: project.id
+      get :index, namespace_id: project.namespace.path, project_id: project.path
       expect(response.status).to eq(404)
     end
 
     it "returns 404 when external issue tracker is enabled" do
+      controller.instance_variable_set(:@project, project)
       allow(project).to receive(:default_issues_tracker?).and_return(false)
 
-      get :index, namespace_id: project.namespace.id, project_id: project.id
+      get :index, namespace_id: project.namespace.path, project_id: project.path
       expect(response.status).to eq(404)
     end
 
diff --git a/spec/controllers/projects_controller_spec.rb b/spec/controllers/projects_controller_spec.rb
index 29233e9fae6..21beaf37fce 100644
--- a/spec/controllers/projects_controller_spec.rb
+++ b/spec/controllers/projects_controller_spec.rb
@@ -21,6 +21,20 @@ describe ProjectsController do
         expect(response.body).to include("content='#{content}'")
       end
     end
+
+    context "when requested with case sensitive namespace and project path" do
+      it "redirects to the normalized path for case mismatch" do
+        get :show, namespace_id: public_project.namespace.path, id: public_project.path.upcase
+
+        expect(response).to redirect_to("/#{public_project.path_with_namespace}")
+      end
+
+      it "loads the page if normalized path matches request path" do
+        get :show, namespace_id: public_project.namespace.path, id: public_project.path
+
+        expect(response.status).to eq(200)
+      end
+    end
   end
 
   describe "POST #toggle_star" do
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index ba8897b95d9..fe7bb2cc13f 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -220,6 +220,7 @@ describe Project do
       end
 
       it { expect(Project.find_with_namespace('gitlab/gitlabhq')).to eq(@project) }
+      it { expect(Project.find_with_namespace('GitLab/GitlabHQ')).to eq(@project) }
       it { expect(Project.find_with_namespace('gitlab-ci')).to be_nil }
     end
   end