ruby-openid 2.6.0 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd3bd50f7d5012fb0ca2dbac47882264537e2d0c
-  data.tar.gz: 71049966e5a9e4994a8876ad89486d15c4afa495
+  metadata.gz: a42bebb6d79a5270a97ab8a8f7e408a2c606f19e
+  data.tar.gz: 37f0f842916738b876794d2836d6bf27a502a659
 SHA512:
-  metadata.gz: dc63fe46a5f925792ba2c4f94c701363743cb590d3cf74f63eaa204f01bb364f5baf2a44e140eae7c26bf50175cbfb2a39848f49f9c8054658107b15315c4404
-  data.tar.gz: 70fccef825665d1046c4f338ed735ff1b5fe841edadffdea955414381e1859a7bc74516a4938ef4cf60d64dff9a679f6301d11c76fe36059adf0d89296be7488
+  metadata.gz: ca1ee03431ac62f5ce84956a9cd522001fe44a9b1afe200ceca4d03060bb0a1c822955c96381fb25e6bdc876c6e20043574c407cf19be146a85349e1702a56b1
+  data.tar.gz: 10c21a26954a56214f1679af6beec7640ef13b66c1cd28fe308e235d2fcd6dd7e1ab9cc25004891e7792a786858f1e334327441d8cdd927b518878d900faa06a

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 2.7.0
+
+* Use RFC 2396 compatible URI parser for trustroot - 7c84ec9ced3ccbdad575e02dbfa81e53b52f909e
+  See https://github.com/openid/ruby-openid/pull/85
+* Use HMAC from OpenSSL rather than Digest - ce2e30d7ff3308f17ef7d8c19d6f4752f76c9c40
+  See https://github.com/openid/ruby-openid/pull/84
+* Check if OpenSSL is loaded - 751e55820d958ee781f5abb466a576d83ddde6fd
+
 ## 2.6.0
 
 * More safely build filenames - 1c4a90630b183e7572b8ab5f2e3a3e0c0fecd2c7

data/lib/openid/association.rb

@@ -165,7 +165,7 @@ module OpenID
 
       signed_list = []
       message_keys.each { |k|
-        if k.starts_with?('openid.')
+        if k.start_with?('openid.')
           signed_list << k[7..-1]
         end
       }

data/lib/openid/cryptutil.rb

@@ -2,7 +2,7 @@ require "openid/util"
 require "digest/sha1"
 require "digest/sha2"
 begin
-  require "digest/hmac"
+  require "openssl"
 rescue LoadError
   begin
     # Try loading the ruby-hmac files if they exist
@@ -37,8 +37,8 @@ module OpenID
     end
 
     def CryptUtil.hmac_sha1(key, text)
-      if Digest.const_defined? :HMAC
-        Digest::HMAC.new(key,Digest::SHA1).update(text).digest
+      if defined? OpenSSL
+        OpenSSL::HMAC.digest(OpenSSL::Digest::SHA1.new, key, text)
       else
         return HMAC::SHA1.digest(key, text)
       end
@@ -49,8 +49,8 @@ module OpenID
     end
 
     def CryptUtil.hmac_sha256(key, text)
-      if Digest.const_defined? :HMAC
-        Digest::HMAC.new(key,Digest::SHA256).update(text).digest
+      if defined? OpenSSL
+        OpenSSL::HMAC.digest(OpenSSL::Digest::SHA256.new, key, text)
       else
         return HMAC::SHA256.digest(key, text)
       end

data/lib/openid/message.rb

@@ -254,7 +254,7 @@ module OpenID
       post_args = self.to_post_args
       kvargs = {}
       post_args.each { |k,v|
-        if !k.starts_with?('openid.')
+        if !k.start_with?('openid.')
           raise ArgumentError, "This message can only be encoded as a POST, because it contains arguments that are not prefixed with 'openid.'"
         else
           kvargs[k[7..-1]] = v

data/lib/openid/trustroot.rb

@@ -178,7 +178,7 @@ module OpenID
         end
 
         begin
-          parsed = URI::parse(url)
+          parsed = URI::DEFAULT_PARSER.parse(url)
         rescue URI::InvalidURIError
           return nil
         end
@@ -315,7 +315,7 @@ module OpenID
             return false
           end
         elsif ((@host != '') and
-               (!host.ends_with?('.' + @host)) and
+               (!host.end_with?('.' + @host)) and
                (host != @host))
           return false
         end

data/lib/openid/urinorm.rb

@@ -1,7 +1,5 @@
 require 'uri'
 
-require "openid/extras"
-
 module OpenID
 
   module URINorm
@@ -42,15 +40,15 @@ module OpenID
       result_segments = []
 
       while path.length > 0
-        if path.starts_with?('../')
+        if path.start_with?('../')
           path = path[3..-1]
-        elsif path.starts_with?('./')
+        elsif path.start_with?('./')
           path = path[2..-1]
-        elsif path.starts_with?('/./')
+        elsif path.start_with?('/./')
           path = path[2..-1]
         elsif path == '/.'
           path = '/'
-        elsif path.starts_with?('/../')
+        elsif path.start_with?('/../')
           path = path[3..-1]
           result_segments.pop if result_segments.length > 0
         elsif path == '/..'

data/lib/openid/util.rb

@@ -2,8 +2,6 @@ require "cgi"
 require "uri"
 require "logger"
 
-require "openid/extras"
-
 # See OpenID::Consumer or OpenID::Server modules, as well as the store classes
 module OpenID
   class AssertionError < Exception

data/lib/openid/version.rb

@@ -1,3 +1,3 @@
 module OpenID
-  VERSION = "2.6.0"
+  VERSION = "2.7.0"
 end

data/test/discoverdata.rb

@@ -2,7 +2,6 @@
 require 'uri'
 require 'openid/yadis/constants'
 require 'openid/yadis/discovery'
-require 'openid/extras'
 require 'openid/util'
 
 module OpenID
@@ -106,7 +105,7 @@ module OpenID
 
       ctype = nil
       header_lines.each { |header_line|
-        if header_line.starts_with?('Content-Type:')
+        if header_line.start_with?('Content-Type:')
           _, ctype = header_line.split(':', 2)
           ctype = ctype.strip()
           break

data/test/test_accept.rb

@@ -1,12 +1,11 @@
-require 'test/unit'
+require 'minitest/autorun'
 require 'testutil'
 require 'openid/yadis/accept'
-require 'openid/extras'
 require 'openid/util'
 
 module OpenID
 
-  class AcceptTest < Test::Unit::TestCase
+  class AcceptTest < Minitest::Test
     include TestDataMixin
 
     def getTestData()
@@ -30,7 +29,7 @@ module OpenID
       chunk = []
       lines.each { |lineno, line|
         stripped = line.strip()
-        if (stripped == '') or stripped.starts_with?('#')
+        if (stripped == '') or stripped.start_with?('#')
           if chunk.length > 0
             chunks << chunk
             chunk = []
@@ -154,7 +153,7 @@ module OpenID
       ].each { |input, expected_header|
 
         if expected_header.nil?
-          assert_raise(ArgumentError) {
+          assert_raises(ArgumentError) {
             Yadis.generate_accept_header(*input)
           }
         else

data/test/test_association.rb

@@ -1,8 +1,9 @@
-require "test/unit"
+require "minitest/autorun"
 require "openid/association"
+require "openid/protocolerror"
 
 module OpenID
-  class AssociationTestCase < Test::Unit::TestCase
+  class AssociationTestCase < Minitest::Test
     def setup
       # Use this funny way of getting a time so that it does not have
       # fractional seconds, and so can be serialized exactly using our
@@ -202,7 +203,7 @@ module OpenID
     end
   end
 
-  class AssociationNegotiatorTestCase < Test::Unit::TestCase
+  class AssociationNegotiatorTestCase < Minitest::Test
     def assert_equal_under(item1, item2)
       val1 = yield(item1)
       val2 = yield(item2)

data/test/test_associationmanager.rb

@@ -1,23 +1,23 @@
-require "test/unit"
+require "minitest/autorun"
+require "testutil"
 require "openid/consumer/associationmanager"
 require "openid/association"
 require "openid/dh"
 require "openid/util"
 require "openid/cryptutil"
 require "openid/message"
+require "openid/protocolerror"
 require "openid/store/memory"
 require "util"
 require "time"
 
 module OpenID
-  class DHAssocSessionTest < Test::Unit::TestCase
+  class DHAssocSessionTest < Minitest::Test
     def test_sha1_get_request
       # Initialized without an explicit DH gets defaults
       sess = Consumer::DiffieHellmanSHA1Session.new
       assert_equal(['dh_consumer_public'], sess.get_request.keys)
-      assert_nothing_raised do
-        Util::from_base64(sess.get_request['dh_consumer_public'])
-      end
+      Util::from_base64(sess.get_request['dh_consumer_public'])
     end
 
     def test_sha1_get_request_custom_dh
@@ -28,9 +28,7 @@ module OpenID
                    req.keys.sort)
       assert_equal(dh.modulus, CryptUtil.base64_to_num(req['dh_modulus']))
       assert_equal(dh.generator, CryptUtil.base64_to_num(req['dh_gen']))
-      assert_nothing_raised do
-        Util::from_base64(req['dh_consumer_public'])
-      end
+      Util::from_base64(req['dh_consumer_public'])
     end
   end
 
@@ -102,7 +100,7 @@ module OpenID
     end
   end
 
-  class TestConsumerOpenID1DHSHA1 < Test::Unit::TestCase
+  class TestConsumerOpenID1DHSHA1 < Minitest::Test
     include TestDiffieHellmanResponseParametersMixin
     class << self
       attr_reader :session_cls, :message_namespace
@@ -112,7 +110,7 @@ module OpenID
     @message_namespace = OPENID1_NS
   end
 
-  class TestConsumerOpenID2DHSHA1 < Test::Unit::TestCase
+  class TestConsumerOpenID2DHSHA1 < Minitest::Test
     include TestDiffieHellmanResponseParametersMixin
     class << self
       attr_reader :session_cls, :message_namespace
@@ -122,7 +120,7 @@ module OpenID
     @message_namespace = OPENID2_NS
   end
 
-  class TestConsumerOpenID2DHSHA256 < Test::Unit::TestCase
+  class TestConsumerOpenID2DHSHA256 < Minitest::Test
     include TestDiffieHellmanResponseParametersMixin
     class << self
       attr_reader :session_cls, :message_namespace
@@ -132,7 +130,7 @@ module OpenID
     @message_namespace = OPENID2_NS
   end
 
-  class TestConsumerNoEncryptionSession < Test::Unit::TestCase
+  class TestConsumerNoEncryptionSession < Minitest::Test
     def setup
       @sess = Consumer::NoEncryptionSession.new
     end
@@ -149,7 +147,7 @@ module OpenID
     end
   end
 
-  class TestCreateAssociationRequest < Test::Unit::TestCase
+  class TestCreateAssociationRequest < Minitest::Test
     def setup
       @server_url = 'http://invalid/'
       @assoc_manager = Consumer::AssociationManager.new(nil, @server_url)
@@ -203,7 +201,7 @@ module OpenID
 
       # This is a random base-64 value, so just check that it's
       # present.
-      assert_not_nil(args.get_arg(OPENID1_NS, 'dh_consumer_public'))
+      refute_nil(args.get_arg(OPENID1_NS, 'dh_consumer_public'))
       args.del_arg(OPENID1_NS, 'dh_consumer_public')
 
       # OK, session_type is set here and not for no-encryption
@@ -216,7 +214,7 @@ module OpenID
     end
   end
 
-  class TestAssociationManagerExpiresIn < Test::Unit::TestCase
+  class TestAssociationManagerExpiresIn < Minitest::Test
     def expires_in_msg(val)
       msg = Message.from_openid_args({'expires_in' => val})
       Consumer::AssociationManager.extract_expires_in(msg)
@@ -248,7 +246,7 @@ module OpenID
     end
   end
 
-  class TestAssociationManagerCreateSession < Test::Unit::TestCase
+  class TestAssociationManagerCreateSession < Minitest::Test
     def test_invalid
       assert_raises(ArgumentError) {
         Consumer::AssociationManager.create_session('monkeys')
@@ -292,7 +290,7 @@ module OpenID
 
   # Test the session type negotiation behavior of an OpenID 2
   # consumer.
-  class TestOpenID2SessionNegotiation < Test::Unit::TestCase
+  class TestOpenID2SessionNegotiation < Minitest::Test
     include NegotiationTestMixin
 
     Compat = false
@@ -413,7 +411,7 @@ module OpenID
   # oidutil.log.  See the calls to self.failUnlessLogMatches.  Some of
   # these tests pass openid2-style messages to the openid 1
   # association processing logic to be sure it ignores the extra data.
-  class TestOpenID1SessionNegotiation < Test::Unit::TestCase
+  class TestOpenID1SessionNegotiation < Minitest::Test
     include NegotiationTestMixin
 
     Compat = true
@@ -498,7 +496,7 @@ module OpenID
   end
 
 
-  class TestExtractAssociation < Test::Unit::TestCase
+  class TestExtractAssociation < Minitest::Test
     include ProtocolErrorMixin
 
     # An OpenID associate response (without the namespace)
@@ -619,7 +617,7 @@ module OpenID
     end
   end
 
-  class GetOpenIDSessionTypeTest < Test::Unit::TestCase
+  class GetOpenIDSessionTypeTest < Minitest::Test
     include TestUtil
 
     SERVER_URL = 'http://invalid/'
@@ -666,7 +664,7 @@ module OpenID
     end
   end
 
-  class ExtractAssociationTest < Test::Unit::TestCase
+  class ExtractAssociationTest < Minitest::Test
     include ProtocolErrorMixin
 
     SERVER_URL = 'http://invalid/'
@@ -740,7 +738,7 @@ module OpenID
     end
   end
 
-  class TestExtractAssociationDiffieHellman < Test::Unit::TestCase
+  class TestExtractAssociationDiffieHellman < Minitest::Test
     include ProtocolErrorMixin
 
     SECRET = 'x' * 20
@@ -799,7 +797,7 @@ module OpenID
     end
   end
 
-  class TestAssocManagerGetAssociation < Test::Unit::TestCase
+  class TestAssocManagerGetAssociation < Minitest::Test
     include FetcherMixin
     include TestUtil
 
@@ -859,7 +857,7 @@ module OpenID
     end
   end
 
-  class TestAssocManagerRequestAssociation < Test::Unit::TestCase
+  class TestAssocManagerRequestAssociation < Minitest::Test
     include FetcherMixin
     include TestUtil
 

data/test/test_ax.rb

@@ -1,4 +1,4 @@
-require 'test/unit'
+require 'minitest/autorun'
 require 'openid/extensions/ax'
 require 'openid/message'
 require 'openid/consumer/responses'
@@ -23,7 +23,7 @@ module OpenID
       end
     end
 
-    class AXMessageTest < Test::Unit::TestCase
+    class AXMessageTest < Minitest::Test
       def setup
         @bax = BogusAXMessage.new
       end
@@ -38,7 +38,7 @@ module OpenID
       end
     end
 
-    class AttrInfoTest < Test::Unit::TestCase
+    class AttrInfoTest < Minitest::Test
       def test_construct
         assert_raises(ArgumentError) { AttrInfo.new }
         type_uri = 'uri geller'
@@ -51,7 +51,7 @@ module OpenID
       end
     end
 
-    class ToTypeURIsTest < Test::Unit::TestCase
+    class ToTypeURIsTest < Minitest::Test
       def setup
         @aliases = NamespaceMap.new
       end
@@ -91,7 +91,7 @@ module OpenID
       end
     end
 
-    class ParseAXValuesTest < Test::Unit::TestCase
+    class ParseAXValuesTest < Minitest::Test
       def ax_values(ax_args, expected_args)
         msg = KeyValueMessage.new
         msg.parse_extension_args(ax_args)
@@ -221,7 +221,7 @@ module OpenID
       end
     end
 
-    class FetchRequestTest < Test::Unit::TestCase
+    class FetchRequestTest < Minitest::Test
       def setup
         @msg = FetchRequest.new
         @type_a = 'http://janrain.example.com/a'
@@ -483,7 +483,7 @@ module OpenID
       end
     end
 
-    class FetchResponseTest < Test::Unit::TestCase
+    class FetchResponseTest < Minitest::Test
       def setup
         @msg = FetchResponse.new
         @value_a = 'commodity'
@@ -675,7 +675,7 @@ module OpenID
       end
     end
 
-    class StoreRequestTest < Test::Unit::TestCase
+    class StoreRequestTest < Minitest::Test
       def setup
         @msg = StoreRequest.new
         @type_a = 'http://oranges.are.for/'
@@ -729,7 +729,7 @@ module OpenID
       end
     end
 
-    class StoreResponseTest < Test::Unit::TestCase
+    class StoreResponseTest < Minitest::Test
       def test_success
         msg = StoreResponse.new
         assert(msg.succeeded?)