Don't need _message as it's in the class name already

This commit is contained in:
Michael Koziarski 2008-11-23 16:33:56 +01:00
parent d460c9a255
commit f9b1aa7f4c
2 changed files with 8 additions and 8 deletions

@ -6,11 +6,11 @@ module ActiveSupport
# session store isn't suitable or available.
#
# Remember Me:
# cookies[:remember_me] = @verifier.generate_message([@user.id, 2.weeks.from_now])
# cookies[:remember_me] = @verifier.generate([@user.id, 2.weeks.from_now])
#
# In the authentication filter:
#
# id, time = @verifier.verify_message(cookies[:remember_me])
# id, time = @verifier.verify(cookies[:remember_me])
# if time < Time.now
# self.current_user = User.find(id)
# end
@ -23,7 +23,7 @@ def initialize(secret, digest = 'SHA1')
@digest = digest
end
def verify_message(signed_message)
def verify(signed_message)
data, digest = signed_message.split("--")
if digest != generate_digest(data)
raise InvalidSignature
@ -32,7 +32,7 @@ def verify_message(signed_message)
end
end
def generate_message(value)
def generate(value)
data = ActiveSupport::Base64.encode64s(Marshal.dump(value))
"#{data}--#{generate_digest(data)}"
end

@ -7,19 +7,19 @@ def setup
end
def test_simple_round_tripping
message = @verifier.generate_message(@data)
assert_equal @data, @verifier.verify_message(message)
message = @verifier.generate(@data)
assert_equal @data, @verifier.verify(message)
end
def test_tampered_data_raises
data, hash = @verifier.generate_message(@data).split("--")
data, hash = @verifier.generate(@data).split("--")
assert_not_verified("#{data.reverse}--#{hash}")
assert_not_verified("#{data}--#{hash.reverse}")
end
def assert_not_verified(message)
assert_raises(ActiveSupport::MessageVerifier::InvalidSignature) do
@verifier.verify_message(message)
@verifier.verify(message)
end
end
end