Commit df667303 authored by Yorick Peterse's avatar Yorick Peterse

Merge branch 'security-fix-new-issues-login-message-11-5' into 'security-11-5'

[11.5] Use common error for not logged in users when creating issues

See merge request gitlab/gitlabhq!2813

(cherry picked from commit 6a1c300fadddd9d534cacc9a7c0afd5ea6b04014)

0cb3920b Use common error for unauthenticated users
parent f50b909b
......@@ -19,7 +19,7 @@ class Projects::IssuesController < Projects::ApplicationController
prepend_before_action(only: [:index]) { authenticate_sessionless_user!(:rss) }
prepend_before_action(only: [:calendar]) { authenticate_sessionless_user!(:ics) }
prepend_before_action :authenticate_new_issue!, only: [:new]
prepend_before_action :authenticate_user!, only: [:new]
prepend_before_action :store_uri, only: [:new, :show]
before_action :whitelist_query_limiting, only: [:create, :create_merge_request, :move, :bulk_update]
......@@ -229,14 +229,6 @@ class Projects::IssuesController < Projects::ApplicationController
] + [{ label_ids: [], assignee_ids: [] }]
def authenticate_new_issue!
return if current_user
notice = "Please sign in to create the new issue."
redirect_to new_user_session_path, notice: notice
def store_uri
if request.get? && !request.xhr?
store_location_for :user, request.fullpath
title: Use common error for unauthenticated users when creating issues
type: security
......@@ -121,7 +121,7 @@ describe Projects::IssuesController do
it 'redirects to signin if not logged in' do
get :new, namespace_id: project.namespace, project_id: project
expect(flash[:notice]).to eq 'Please sign in to create the new issue.'
expect(flash[:alert]).to eq 'You need to sign in or sign up before continuing.'
expect(response).to redirect_to(new_user_session_path)
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