mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
e428ddecec
Some `require 'openssl'` statements were surrounded by `rescue` blocks to deal with Ruby versions that did not support `OpenSSL::Digest::SHA1` or `OpenSSL::PKCS5`.
[As @jeremy explains](a6a0904fcb (commitcomment-8826666)) in the original commit:
> If jruby didn't have jruby-openssl gem, the require wouldn't work. Not sure whether either of these are still relevant today.
According to the [release notes for JRuby 1.7.13](http://www.jruby.org/2014/06/24/jruby-1-7-13.html):
> jruby-openssl 0.9.5 bundled
which means the above `rescue` block is not needed anymore.
All the Ruby versions supported by the current version of Rails provide those OpenSSL libraries, so Travis CI should also be happy by removing the `rescue` blocks.
---
Just to confirm, with JRuby:
$ ruby --version #=> jruby 1.7.16.1 (1.9.3p392) 2014-10-28 4e93f31 on Java HotSpot(TM) 64-Bit Server VM 1.8.0_20-b26 +jit [darwin-x86_64]
$ irb
irb(main):001:0> require 'openssl' #=> true
irb(main):002:0> OpenSSL::Digest::SHA1 #=> OpenSSL::Digest::SHA1
irb(main):003:0> OpenSSL::PKCS5 # => OpenSSL::PKCS5
And with Ruby 2.1:
$ ruby --version #=> ruby 2.1.2p95 (2014-05-08 revision 45877) [x86_64-darwin13.0]
$ irb
irb(main):001:0> require 'openssl' #=> true
irb(main):002:0> OpenSSL::Digest::SHA1 #=> OpenSSL::Digest::SHA1
irb(main):003:0> OpenSSL::PKCS5 #=> OpenSSL::PKCS5
85 lines
2.9 KiB
Ruby
85 lines
2.9 KiB
Ruby
require 'abstract_unit'
|
|
require 'openssl'
|
|
require 'active_support/time'
|
|
require 'active_support/json'
|
|
|
|
class MessageVerifierTest < ActiveSupport::TestCase
|
|
|
|
class JSONSerializer
|
|
def dump(value)
|
|
ActiveSupport::JSON.encode(value)
|
|
end
|
|
|
|
def load(value)
|
|
ActiveSupport::JSON.decode(value)
|
|
end
|
|
end
|
|
|
|
def setup
|
|
@verifier = ActiveSupport::MessageVerifier.new("Hey, I'm a secret!")
|
|
@data = { :some => "data", :now => Time.local(2010) }
|
|
end
|
|
|
|
def test_valid_message
|
|
data, hash = @verifier.generate(@data).split("--")
|
|
assert !@verifier.valid_message?(nil)
|
|
assert !@verifier.valid_message?("")
|
|
assert !@verifier.valid_message?("#{data.reverse}--#{hash}")
|
|
assert !@verifier.valid_message?("#{data}--#{hash.reverse}")
|
|
assert !@verifier.valid_message?("purejunk")
|
|
end
|
|
|
|
def test_simple_round_tripping
|
|
message = @verifier.generate(@data)
|
|
assert_equal @data, @verifier.verified(message)
|
|
assert_equal @data, @verifier.verify(message)
|
|
end
|
|
|
|
def test_verified_returns_false_on_invalid_message
|
|
assert !@verifier.verified("purejunk")
|
|
end
|
|
|
|
def test_verify_exception_on_invalid_message
|
|
assert_raise(ActiveSupport::MessageVerifier::InvalidSignature) do
|
|
@verifier.verify("purejunk")
|
|
end
|
|
end
|
|
|
|
def test_alternative_serialization_method
|
|
prev = ActiveSupport.use_standard_json_time_format
|
|
ActiveSupport.use_standard_json_time_format = true
|
|
verifier = ActiveSupport::MessageVerifier.new("Hey, I'm a secret!", :serializer => JSONSerializer.new)
|
|
message = verifier.generate({ :foo => 123, 'bar' => Time.utc(2010) })
|
|
exp = { "foo" => 123, "bar" => "2010-01-01T00:00:00.000Z" }
|
|
assert_equal exp, verifier.verified(message)
|
|
assert_equal exp, verifier.verify(message)
|
|
ensure
|
|
ActiveSupport.use_standard_json_time_format = prev
|
|
end
|
|
|
|
def test_raise_error_when_argument_class_is_not_loaded
|
|
# To generate the valid message below:
|
|
#
|
|
# AutoloadClass = Struct.new(:foo)
|
|
# valid_message = @verifier.generate(foo: AutoloadClass.new('foo'))
|
|
#
|
|
valid_message = "BAh7BjoIZm9vbzonTWVzc2FnZVZlcmlmaWVyVGVzdDo6QXV0b2xvYWRDbGFzcwY6CUBmb29JIghmb28GOgZFVA==--f3ef39a5241c365083770566dc7a9eb5d6ace914"
|
|
exception = assert_raise(ArgumentError, NameError) do
|
|
@verifier.verified(valid_message)
|
|
end
|
|
assert_includes ["uninitialized constant MessageVerifierTest::AutoloadClass",
|
|
"undefined class/module MessageVerifierTest::AutoloadClass"], exception.message
|
|
exception = assert_raise(ArgumentError, NameError) do
|
|
@verifier.verify(valid_message)
|
|
end
|
|
assert_includes ["uninitialized constant MessageVerifierTest::AutoloadClass",
|
|
"undefined class/module MessageVerifierTest::AutoloadClass"], exception.message
|
|
end
|
|
|
|
def test_raise_error_when_secret_is_nil
|
|
exception = assert_raise(ArgumentError) do
|
|
ActiveSupport::MessageVerifier.new(nil)
|
|
end
|
|
assert_equal exception.message, 'Secret should not be nil.'
|
|
end
|
|
end
|