Merge pull request #106 from finnlabs/pulls/652/fixes_redirect_containing_umlaute

[#652] fixes wrong redirect after login

Merge pull request #106 from finnlabs/pulls/652/fixes_redirect_containing_umlaute
[#652] fixes wrong redirect after login
92dd2934 · Felix Schäfer · 3cc95353 · 34dc06a8 · 92dd2934 · 92dd2934
Commit 92dd2934 authored Oct 29, 2011 by Felix Schäfer
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 1 deletion

application_controller.rb app/controllers/application_controller.rb +1 -1

account_test.rb test/integration/account_test.rb +9 -0

No files found.
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -262,7 +262,7 @@ class ApplicationController < ActionController::Base
  end

  def redirect_back_or_default(default)
-    back_url = CGI.unescape(params[:back_url].to_s)
+    back_url = URI.escape(CGI.unescape(params[:back_url].to_s))
    if !back_url.blank?
      begin
        uri = URI.parse(back_url)

--- a/test/integration/account_test.rb
+++ b/test/integration/account_test.rb
@@ -32,6 +32,15 @@ class AccountTest < ActionController::IntegrationTest
    assert_template "my/account"
  end

+  def test_redirect_after_login
+    target_url =  "/my/account?q=%C3%A4"
+
+    get target_url
+    post "/login", :username => 'jsmith', :password => 'jsmith', :back_url => @response.redirected_to[:back_url]
+
+    assert_redirected_to target_url
+  end
+
  def test_autologin
    user = User.find(1)
    Setting.autologin = "7"