github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-26 20:15:47 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FEATURE: support query params when redirecting to internal link on login (#7829)

Browse Source
This commit is contained in:
Arpit Jalan 2019-07-04 11:11:43 +05:30 committed by GitHub
parent 32edaa3843
commit 1708be4f27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/static_controller.rb
View File

@ -101,8 +101,7 @@ class StaticController < ApplicationController
(uri.host.blank? || uri.host == forum_uri.host) &&
uri.path !~ /\./
destination = uri.path
destination = "#{uri.path}?#{uri.query}" if uri.path =~ /new-topic/ || uri.path =~ /new-message/ || uri.path =~ /user-api-key/
destination = "#{uri.path}#{uri.query ? "?#{uri.query}" : ""}"
end
rescue URI::Error
# Do nothing if the URI is invalid

7
spec/requests/static_controller_spec.rb
View File

@ -262,6 +262,13 @@ describe StaticController do
end
end
context 'with a redirect path with query params' do
it 'redirects to the redirect path and preserves query params' do
post "/login.json", params: { redirect: '/foo?bar=1' }
expect(response).to redirect_to('/foo?bar=1')
end
end
context 'with a period to force a new host' do
it 'redirects to the root path' do
post "/login.json", params: { redirect: ".org/foo" }