From 04421b355eb93de2888f12801cc0ebe123414264 Mon Sep 17 00:00:00 2001 From: Azul Date: Thu, 11 Oct 2012 17:02:15 +0200 Subject: authenticate returns the user, to_json includes M2. bumped version to 0.1.3 This way the controller can easily use @user = @session.authenticate; respond_with @sessoin; --- lib/srp/session.rb | 3 ++- ruby-srp.gemspec | 2 +- test/session_test.rb | 4 +++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/srp/session.rb b/lib/srp/session.rb index defbaa8..f4b7430 100644 --- a/lib/srp/session.rb +++ b/lib/srp/session.rb @@ -25,7 +25,8 @@ module SRP def authenticate(m) if(m == calculate_m(server_secret)) - return @m2 = calculate_m2 + @m2 = calculate_m2 + return @user end end diff --git a/ruby-srp.gemspec b/ruby-srp.gemspec index 1ab1aa0..9f39071 100644 --- a/ruby-srp.gemspec +++ b/ruby-srp.gemspec @@ -1,6 +1,6 @@ Gem::Specification.new do |s| s.name = "ruby-srp" - s.version = "0.1.2" + s.version = "0.1.3" s.platform = Gem::Platform::RUBY s.authors = ["Azul"] s.email = ["azul@leap.se"] diff --git a/test/session_test.rb b/test/session_test.rb index 9d1b92f..8327a63 100644 --- a/test/session_test.rb +++ b/test/session_test.rb @@ -1,4 +1,5 @@ require File.expand_path(File.dirname(__FILE__) + '/test_helper') +require 'json' class SessionTest < Test::Unit::TestCase @@ -21,7 +22,8 @@ class SessionTest < Test::Unit::TestCase session = SRP::Session.new(self, aa) session.send(:initialize_server, aa, b) # seeding b to compare to py_srp assert_equal bb.to_s(16), session.bb.to_s(16) - assert_equal m2, session.authenticate(m) + assert_equal self, session.authenticate(m) + assert_equal({'M2' => m2.to_s(16)}.to_json, session.to_json) end def test_zero_padded_salt -- cgit v1.2.3