bartt-ssl_requirement 1.4.1 → 1.4.2

data/VERSION

@@ -1 +1 @@
-1.4.1
+1.4.2

data/lib/ssl_requirement.rb

@@ -24,7 +24,8 @@ require "active_support/core_ext/class"
 module SslRequirement
   extend ActiveSupport::Concern
 
-  mattr_writer :ssl_host, :ssl_port, :non_ssl_host, :disable_ssl_check
+  mattr_writer :ssl_host, :ssl_port, :non_ssl_host, :non_ssl_port,
+    :disable_ssl_check
   mattr_accessor :redirect_status
 
   def self.ssl_host
@@ -39,6 +40,10 @@ module SslRequirement
     determine_host(@@non_ssl_host) rescue nil
   end
 
+  def self.non_ssl_port
+    @@non_ssl_port ||= 80
+  end
+
   # mattr_reader would generate both ssl_host and self.ssl_host
   def ssl_host
     SslRequirement.ssl_host
@@ -52,6 +57,10 @@ module SslRequirement
     SslRequirement.non_ssl_host
   end
 
+  def non_ssl_port
+    SslRequirement.non_ssl_port
+  end
+
   def self.disable_ssl_check?
     @@disable_ssl_check ||= false
   end
@@ -135,10 +144,28 @@ module SslRequirement
     request_port = request.port
 
     if ssl
-      "#{(ssl_host || request_host)}#{determine_port_string(request_port || ssl_port)}"
+      "#{ssl_host || request_host}#{determine_ssl_port_string request.port}"
+    else
+      "#{non_ssl_host || request_host}#{determine_non_ssl_port_string request.port}"
+    end
+  end
+
+  def determine_ssl_port_string(request_port)
+    if request_port == non_ssl_port
+      port = ssl_port
+    else
+      port = request_port || ssl_port
+    end
+    determine_port_string port
+  end
+
+  def determine_non_ssl_port_string(request_port)
+    if request_port == ssl_port
+      port = non_ssl_port
     else
-      "#{(non_ssl_host || request_host)}#{determine_port_string(request_port)}"
+      port = request_port || non_ssl_port
     end
+    determine_port_string port
   end
 
   def self.determine_host(host)

data/test/ssl_requirement_test.rb

@@ -159,6 +159,20 @@ class SslRequirementTest < ActionController::TestCase
     assert_match %r{^https://.*:4567/}, @response.headers['Location']
   end
 
+  def test_redirect_to_https_ignores_known_non_ssl_port
+    SslRequirement.non_ssl_port = 4567
+
+    assert_not_equal "on", @request.env["HTTPS"]
+    @request.host = 'www.example.com:4567'
+    @request.port = 4567
+
+    get :b
+    assert_response :redirect
+    assert_match %r{^https://.+\.com/}, @response.headers['Location']
+
+    SslRequirement.non_ssl_port = 80
+  end
+
   def test_redirect_to_https_does_not_preserve_normal_port
     assert_not_equal "on", @request.env["HTTPS"]
     get :b
@@ -166,6 +180,32 @@ class SslRequirementTest < ActionController::TestCase
     assert_match %r{^https://.*[^:]/}, @response.headers['Location']
   end
 
+  def redirect_to_http_preserves_non_normal_port
+    @request.env['HTTPS'] = "on"
+    @request.host = 'www.example.com:4567'
+    @request.port = 4567
+
+    get :d
+
+    assert_response :redirect
+    assert_match %r{^http://.*:4567/}, @response.headers['Location']
+  end
+
+  def test_redirect_to_http_ignores_known_ssl_port
+    SslRequirement.ssl_port = 6789
+
+    @request.env['HTTPS'] = "on"
+    @request.host = 'www.example.com:6789'
+    @request.port = 6789
+
+    get :d
+
+    assert_response :redirect
+    assert_match %r{^http://.*\.com/}, @response.headers['Location']
+
+    SslRequirement.ssl_port = 443
+  end
+
   # flash-related tests
 
   def test_redirect_to_https_preserves_flash

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bartt-ssl_requirement
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-03 00:00:00.000000000 Z
+date: 2012-03-24 00:00:00.000000000 Z
 dependencies: []
 description: SSL requirement adds a declarative way of specifying that certain actions
   should only be allowed to run under SSL, and if they're accessed without it, they
@@ -58,7 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Allow controller actions to force SSL on specific parts of the site.