ruby-openid 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 960a9b7585a6a770e6f7e99dd3ed8f64af0fb325
-  data.tar.gz: d9eb9ac0de887467777f10bf2f366aff41a1ed92
+  metadata.gz: 9fbaf8c0eb91738a8f831057ca44c96803c50e46
+  data.tar.gz: b8ba0a1278cb1f452734608ea079baf63e9772ac
 SHA512:
-  metadata.gz: c56446c19163fe6b11c54103221759fe166221d488e267c86b66195311c45d5e190447b8d76be994dc6e9d23b95d21a10a7ba534fa612ad063fcbc0bca82029b
-  data.tar.gz: 1e84491b6d4912d92950ff161d9662cbe56b4ae67897361ef9bf0851431ca5bb21a32f0885cc439c0c755368101019226b93fd3b76148eac4afbe24c04b11715
+  metadata.gz: dfad5f054b6b04f6d488584b2902aac70d10636ff9ba7c53140c61f7474dc6a463f771ce8a07c2cda0ae501a0a45db745b927427625407873ed35b22b2eb4572
+  data.tar.gz: e4f5e210aceead1e8c7502304b4d45746daf600d0ac4ba2bd65133b446d6dcf0355d4f7a1a636289b4f5221beecf7ca5b7b8d3904862198fe895bcac197fd9e0

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 2.4.0
+
+* Allow expecting a parameter to be nil during return_to verification - 708e992ab3e6c26d478283fc11faa6a0a74bfec0
+* Serialize to objects that can be stored as json - db1d8f7b171a333dec4e861fe0fa53ac1d98b188
+* Fixed missing XRDS HTTP header in sample provider - dc15fa07fd59fdcf46d659cce34c6ef7a6768fde
+
 ## 2.3.0
 
 * Deprecated Ruby 1.8 support - 0694bebc83de0313cfef73a5d0ffd9a293ae71a0

data/examples/rails_openid/app/controllers/server_controller.rb

@@ -207,8 +207,7 @@ EOS
 </xrds:XRDS>
 EOS
 
-    response.headers['content-type'] = 'application/xrds+xml'
-    render :text => yadis
+    render :text => yadis, :content_type => 'application/xrds+xml'
   end
 
   def add_sreg(oidreq, oidresp)

data/lib/openid/consumer.rb

@@ -7,6 +7,7 @@ require "openid/consumer/discovery"
 require "openid/message"
 require "openid/yadis/discovery"
 require "openid/store/nonce"
+require "openid/serializer"
 
 module OpenID
   # OpenID support for Relying Parties (aka Consumers).
@@ -297,11 +298,17 @@ module OpenID
     protected
 
     def session_get(name)
-      @session[session_key(name)]
+      value = @session[session_key(name)]
+
+      if value.is_a?(Array) # new serialized format
+        Serializer.deserialize(*value)
+      else # deprecated object format
+        value
+      end
     end
 
     def session_set(name, val)
-      @session[session_key(name)] = val
+      @session[session_key(name)] = Serializer.serialize(val)
     end
 
     def session_key(suffix)

data/lib/openid/consumer/discovery.rb

@@ -58,7 +58,7 @@ module OpenID
     def display_identifier
       return @display_identifier if @display_identifier
 
-      return @claimed_id if @claimed_id.nil? 
+      return @claimed_id if @claimed_id.nil?
 
       begin
         parsed_identifier = URI.parse(@claimed_id)
@@ -376,7 +376,7 @@ module OpenID
     #
     # @param uri: normalized identity URL
     # @type uri: str
-    # 
+    #
     # @return: (claimed_id, services)
     # @rtype: (str, list(OpenIDServiceEndpoint))
     #

data/lib/openid/consumer/idres.rb

@@ -160,7 +160,7 @@ module OpenID
         query = @message.to_post_args
         return_to_parsed_query.each_pair do |rt_key, rt_val|
           msg_val = query[rt_key]
-          if msg_val.nil?
+          if msg_val.nil? && !rt_val.nil?
             raise ProtocolError, "Message missing return_to argument '#{rt_key}'"
           elsif msg_val != rt_val
             raise ProtocolError, ("Parameter '#{rt_key}' value "\

data/lib/openid/serializer.rb

@@ -0,0 +1,21 @@
+module OpenID
+  class Serializer
+    SERIALIZABLE = {
+      "OpenID::OpenIDServiceEndpoint" => [OpenID::OpenIDServiceEndpoint, 0],
+      "OpenID::Consumer::DiscoveredServices" => [OpenID::Consumer::DiscoveredServices, 3]
+    }
+
+    def self.serialize(instance)
+      klass = instance.class.name
+      raise "unable to serialize #{klass}" unless SERIALIZABLE[klass]
+      [klass, instance.instance_variables.map { |v| [v.to_s, instance.instance_variable_get(v)] }]
+    end
+
+    def self.deserialize(klass, data)
+      klass, arguments = SERIALIZABLE[klass] || raise("unable to deserialize #{klass}")
+      instance = klass.new(*Array.new(arguments))
+      data.each { |k,v| instance.instance_variable_set(k,v) }
+      instance
+    end
+  end
+end

data/lib/openid/store/memcache.rb

@@ -94,7 +94,7 @@ module OpenID
         if result.is_a? String
           return !!(result =~ /^DELETED/)
         else
-          return result == true
+          return !!(result)
         end
       end
 

data/lib/openid/version.rb

@@ -1,3 +1,3 @@
 module OpenID
-  VERSION = "2.3.0"
+  VERSION = "2.4.0"
 end

data/test/test_consumer.rb

@@ -6,14 +6,24 @@ module OpenID
   class Consumer
     module TestConsumer
       class TestLastEndpoint < Test::Unit::TestCase
+        def all_instance_variables(object)
+          object.instance_variables.map { |v| [v.to_s, object.instance_variable_get(v)] }
+        end
+
         def test_set_get
+          stored = OpenID::OpenIDServiceEndpoint.new
+          stored.server_url = "test"
           session = {}
+
           consumer = Consumer.new(session, nil)
-          consumer.send(:last_requested_endpoint=, :endpoint)
+          consumer.send(:last_requested_endpoint=, stored)
+
           ep = consumer.send(:last_requested_endpoint)
-          assert_equal(:endpoint, ep)
+          assert_equal(all_instance_variables(stored), all_instance_variables(ep))
+
           ep = consumer.send(:last_requested_endpoint)
-          assert_equal(:endpoint, ep)
+          assert_equal(all_instance_variables(stored), all_instance_variables(ep))
+
           consumer.send(:cleanup_last_requested_endpoint)
           ep = consumer.send(:last_requested_endpoint)
           assert_equal(nil, ep)
@@ -110,7 +120,7 @@ module OpenID
           result = consumer.begin_without_discovery(@service, @anonymous)
           assert(result.instance_of?(CheckIDRequest))
           assert_equal(@anonymous, result.anonymous)
-          assert_equal(@service, consumer.send(:last_requested_endpoint))
+          assert_equal(@service.claimed_id, consumer.send(:last_requested_endpoint).claimed_id)
           assert_equal(result.instance_variable_get(:@assoc), @assoc)
           return result
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-openid
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - JanRain, Inc
 autorequire: openid
 bindir: bin
 cert_chain: []
-date: 2013-09-14 00:00:00.000000000 Z
+date: 2014-01-27 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: openid@janrain.com
@@ -115,6 +115,7 @@ files:
 - lib/openid/kvpost.rb
 - lib/openid/message.rb
 - lib/openid/protocolerror.rb
+- lib/openid/serializer.rb
 - lib/openid/server.rb
 - lib/openid/store/filesystem.rb
 - lib/openid/store/interface.rb