Changeset 8780

Timestamp:

02/02/08 05:16:53 (6 months ago)

Author:

bitsweat

Message:

SSL requirement plugin keeps flash when it redirects. Closes #8649 [rundeks, fogle]

Files:

• plugins/ssl_requirement/lib/ssl_requirement.rb (modified) (1 diff)
• plugins/ssl_requirement/test/ssl_requirement_test.rb (modified) (3 diffs)

plugins/ssl_requirement/lib/ssl_requirement.rb

@@ -52 +52 @@
-      if ssl_required? && !request.ssl?
-        redirect_to "https://" + request.host + request.request_uri
+        flash.keep
-        return false
-      elsif request.ssl? && !ssl_required?
-        redirect_to "http://" + request.host + request.request_uri
+        flash.keep
-        return false
-      end

plugins/ssl_requirement/test/ssl_requirement_test.rb

@@ -45 +45 @@
-    render :nothing => true
-  end
+  
+  def set_flash
+    flash[:foo] = "bar"
+  end
-end
-
@@ -54 +58 @@
-  end
-  
+  def test_redirect_to_https_preserves_flash
+    get :set_flash
+    get :b
+    assert_response :redirect
+    assert_equal "bar", flash[:foo]
+  end
+  
+  def test_not_redirecting_to_https_does_not_preserve_the_flash
+    get :set_flash
+    get :d
+    assert_response :success
+    assert_nil flash[:foo]
+  end
+  
+  def test_redirect_to_http_preserves_flash
+    get :set_flash
+    @request.env['HTTPS'] = "on"
+    get :d
+    assert_response :redirect
+    assert_equal "bar", flash[:foo]
+  end
+  
+  def test_not_redirecting_to_http_does_not_preserve_the_flash
+    get :set_flash
+    @request.env['HTTPS'] = "on"
+    get :a
+    assert_response :success
+    assert_nil flash[:foo]
+  end
+  
-  def test_required_without_ssl
-    assert_not_equal "on", @request.env["HTTPS"]
-    get :a
-    assert_response :redirect
-l
+L
-    get :b
-    assert_response :redirect
-l
+L
-  end
-  
@@ -82 +116 @@
-    get :d
-    assert_response :redirect
-l
+L
-  end
-