Commit 2f7fc7e9 authored by Douwe Maan's avatar Douwe Maan
Browse files

Prefer project with exact path to differently cased one when both exist.

parent 8c6a05d7701e
......@@ -118,8 +118,8 @@ def project
end
project_path = "#{namespace}/#{id}"
@project = Project.find_with_namespace(project_path)
@project = Project.find_with_namespace(project_path) ||
Project.find_with_namespace(project_path, case_sensitive: false)
if @project and can?(current_user, :read_project, @project)
if @project.path_with_namespace != project_path
......
......@@ -235,7 +235,7 @@ def search_by_title(query)
where('projects.archived = ?', false).where('LOWER(projects.name) LIKE :query', query: "%#{query.downcase}%")
end
def find_with_namespace(id)
def find_with_namespace(id, case_sensitive: true)
namespace_path, project_path = id.split('/')
return nil if !namespace_path || !project_path
......@@ -243,11 +243,18 @@ def find_with_namespace(id)
# Use of unscoped ensures we're not secretly adding any ORDER BYs, which
# have a negative impact on performance (and aren't needed for this
# query).
unscoped.
projects = unscoped.
joins(:namespace).
iwhere('namespaces.path' => namespace_path).
iwhere('projects.path' => project_path).
take
iwhere('namespaces.path' => namespace_path)
projects =
if case_sensitive
projects.where('projects.path' => project_path)
else
projects.iwhere('projects.path' => project_path)
end
projects.take
end
def visibility_levels
......
......@@ -51,16 +51,34 @@
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
context "when there is a match with the same casing" do
it "loads the project" do
get :show, namespace_id: public_project.namespace.path, id: public_project.path
expect(response).to redirect_to("/#{public_project.path_with_namespace}")
expect(assigns(:project)).to eq(public_project)
expect(response.status).to eq(200)
end
end
it "loads the page if normalized path matches request path" do
get :show, namespace_id: public_project.namespace.path, id: public_project.path
context "when there is a match with different casing" do
it "redirects to the normalized path" do
get :show, namespace_id: public_project.namespace.path, id: public_project.path.upcase
expect(assigns(:project)).to eq(public_project)
expect(response).to redirect_to("/#{public_project.path_with_namespace}")
end
expect(response.status).to eq(200)
context "when there is also a match with the same casing" do
let!(:other_project) { create(:project, :public, namespace: public_project.namespace, path: public_project.path.upcase) }
it "loads the exactly matched project" do
get :show, namespace_id: public_project.namespace.path, id: public_project.path.upcase
expect(assigns(:project)).to eq(other_project)
expect(response.status).to eq(200)
end
end
end
end
end
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment