ruby-openid 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d186800e0c39656fbed4cbd52caa3e3f0bb9fc5
-  data.tar.gz: 8a971700503c5c287aa46f5c4c1804300f52a921
+  metadata.gz: bd3bd50f7d5012fb0ca2dbac47882264537e2d0c
+  data.tar.gz: 71049966e5a9e4994a8876ad89486d15c4afa495
 SHA512:
-  metadata.gz: aee76e05216b0b0954496c11d70b5df2c4a3cfe7c9f55aad74f1f1563f18891a6f7526859b695ace038556bb77ce33e152671547592a78591a8b4b1ff50d9fb2
-  data.tar.gz: 4eefe5dcdcbe9fcce8f3846c06e3e1841bd7b703bee34c2d46193eb6d32d17ef87bfe47fda605fa73090401317e5c7390de21f7206c09a288373c4ebf8f5948f
+  metadata.gz: dc63fe46a5f925792ba2c4f94c701363743cb590d3cf74f63eaa204f01bb364f5baf2a44e140eae7c26bf50175cbfb2a39848f49f9c8054658107b15315c4404
+  data.tar.gz: 70fccef825665d1046c4f338ed735ff1b5fe841edadffdea955414381e1859a7bc74516a4938ef4cf60d64dff9a679f6301d11c76fe36059adf0d89296be7488

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 2.6.0
+
+* More safely build filenames - 1c4a90630b183e7572b8ab5f2e3a3e0c0fecd2c7
+  See https://github.com/openid/ruby-openid/pull/80
+* The session serializer of Rails4.1 is json - b44a1eb511dec3be25a07930121bc80cacec0f1c
+* Handle boolean value to fix signature issue - d65076269b77754da7db6e4b189edeeb9201600d
+  See https://github.com/openid/ruby-openid/pull/76
+
 ## 2.5.0
 
 * Revert json serialization - 8dc60e553369df2300ebb4b83a29618aff643c2c

data/lib/openid/consumer.rb

@@ -2,6 +2,7 @@ require "openid/consumer/idres.rb"
 require "openid/consumer/checkid_request.rb"
 require "openid/consumer/associationmanager.rb"
 require "openid/consumer/responses.rb"
+require "openid/consumer/session"
 require "openid/consumer/discovery_manager"
 require "openid/consumer/discovery"
 require "openid/message"
@@ -189,7 +190,8 @@ module OpenID
     #
     # store: an object that implements the interface in Store.
     def initialize(session, store)
-      @session = session
+      @origin_session = session
+      @session = Session.new(session, OpenID::OpenIDServiceEndpoint)
       @store = store
       @session_key_prefix = 'OpenID::Consumer::'
     end
@@ -321,7 +323,7 @@ module OpenID
     end
 
     def discovery_manager(openid_identifier)
-      DiscoveryManager.new(@session, openid_identifier, @session_key_prefix)
+      DiscoveryManager.new(@origin_session, openid_identifier, @session_key_prefix)
     end
 
     def cleanup_session

data/lib/openid/consumer/discovery.rb

@@ -136,6 +136,24 @@ module OpenID
       end
     end
 
+    def to_session_value
+      Hash[*(instance_variables.map{|name| [name, instance_variable_get(name)] }.flatten(1))]
+    end
+
+    def ==(other)
+      to_session_value == other.to_session_value
+    end
+
+    def self.from_session_value(value)
+      return value unless value.is_a?(Hash)
+
+      self.new.tap do |endpoint|
+        value.each do |name, val|
+          endpoint.instance_variable_set(name, val)
+        end
+      end
+    end
+
     def self.from_basic_service_endpoint(endpoint)
       # Create a new instance of this class from the endpoint object
       # passed in.

data/lib/openid/consumer/discovery_manager.rb

@@ -28,6 +28,33 @@ module OpenID
       def empty?
         @services.empty?
       end
+
+      def to_session_value
+        services = @services.map{|s| s.respond_to?(:to_session_value) ? s.to_session_value : s }
+        current_val = @current.respond_to?(:to_session_value) ? @current.to_session_value : @current
+
+        {
+          'starting_url' => @starting_url,
+          'yadis_url' => @yadis_url,
+          'services' => services,
+          'current' => current_val
+        }
+      end
+
+      def ==(other)
+        to_session_value == other.to_session_value
+      end
+
+      def self.from_session_value(value)
+        return value unless value.is_a?(Hash)
+
+        services = value['services'].map{|s| OpenID::OpenIDServiceEndpoint.from_session_value(s) }
+        current = OpenID::OpenIDServiceEndpoint.from_session_value(value['current'])
+
+        obj = self.new(value['starting_url'], value['yadis_url'], services)
+        obj.instance_variable_set("@current", current)
+        obj
+      end
     end
 
     # Manages calling discovery and tracking which endpoints have
@@ -36,7 +63,7 @@ module OpenID
       def initialize(session, url, session_key_suffix=nil)
         @url = url
 
-        @session = session
+        @session = OpenID::Consumer::Session.new(session, DiscoveredServices)
         @session_key_suffix = session_key_suffix || 'auth'
       end
 

data/lib/openid/consumer/session.rb

@@ -0,0 +1,36 @@
+module OpenID
+  class Consumer
+    class Session
+      def initialize(session, decode_klass = nil)
+        @session = session
+        @decode_klass = decode_klass
+      end
+
+      def [](key)
+        val = @session[key]
+        @decode_klass ? @decode_klass.from_session_value(val) : val
+      end
+
+      def []=(key, val)
+        @session[key] = to_session_value(val)
+      end
+
+      def keys
+        @session.keys
+      end
+
+      private
+
+      def to_session_value(val)
+        case val
+        when Array
+          val.map{|ele| to_session_value(ele) }
+        when Hash
+          Hash[*(val.map{|k,v| [k, to_session_value(v)] }.flatten(1))]
+        else
+          val.respond_to?(:to_session_value) ? val.to_session_value : val
+        end
+      end
+    end
+  end
+end

data/lib/openid/store/filesystem.rb

@@ -230,15 +230,11 @@ module OpenID
       # create a safe filename from a url
       def filename_escape(s)
         s = '' if s.nil?
-        filename_chunks = []
-        s.split('').each do |c|
-          if @@FILENAME_ALLOWED.index(c)
-            filename_chunks << c
-          else
-            filename_chunks << sprintf("_%02X", c.bytes.first)
-          end
-        end
-        filename_chunks.join("")
+        filename_chunks = s.each_char.flat_map {|c|
+          @@FILENAME_ALLOWED.include?(c) ? c : c.bytes.map {|b|
+            "_%02X" % b
+          }
+        }.join
       end
 
       def safe64(s)

data/lib/openid/util.rb

@@ -47,7 +47,14 @@ module OpenID
     def Util.urlencode(args)
       a = []
       args.each do |key, val|
-        val = '' unless val
+        if val.nil?
+          val = '' 
+        elsif !!val == val
+          #it's boolean let's convert it to string representation
+          # or else CGI::escape won't like it
+          val = val.to_s
+        end  
+
         a << (CGI::escape(key) + "=" + CGI::escape(val))
       end
       a.join("&")

data/lib/openid/version.rb

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

data/test/test_discovery_manager.rb

@@ -66,11 +66,12 @@ module OpenID
 
   class TestDiscoveryManager < Test::Unit::TestCase
     def setup
-      @session = {}
+      session = {}
+      @session = OpenID::Consumer::Session.new(session, OpenID::Consumer::DiscoveredServices)
       @url = "http://unittest.com/"
       @key_suffix = "testing"
       @yadis_url = "http://unittest.com/xrds"
-      @manager = PassthroughDiscoveryManager.new(@session, @url, @key_suffix)
+      @manager = PassthroughDiscoveryManager.new(session, @url, @key_suffix)
       @key = @manager.session_key
     end
 
@@ -100,7 +101,8 @@ module OpenID
       # services in @disco.
       assert_equal(@manager.get_next_service, "two")
       assert_equal(@manager.get_next_service, "three")
-      assert_equal(@session[@key], disco)
+      disco = @session[@key]
+      assert_equal(disco.current, "three")
 
       # The manager is exhausted and should be deleted and a new one
       # should be created.
@@ -136,8 +138,8 @@ module OpenID
       assert_equal(@manager.cleanup, nil)
       assert_equal(@session[@key], nil)
 
-      @session[@key] = disco
       disco.next
+      @session[@key] = disco
       assert_equal(@manager.cleanup, "one")
       assert_equal(@session[@key], nil)
 
@@ -188,10 +190,11 @@ module OpenID
       returned_disco = @manager.create_manager(@yadis_url, services)
 
       stored_disco = @session[@key]
+      assert_equal(stored_disco, returned_disco)
+
       assert(stored_disco.for_url?(@yadis_url))
       assert_equal(stored_disco.next, "created")
 
-      assert_equal(stored_disco, returned_disco)
 
       # Calling create_manager with a preexisting manager should
       # result in StandardError.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-openid
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - JanRain, Inc
 autorequire: openid
 bindir: bin
 cert_chain: []
-date: 2014-01-29 00:00:00.000000000 Z
+date: 2014-10-27 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: openid@janrain.com
@@ -20,16 +20,27 @@ extra_rdoc_files:
 - LICENSE
 - UPGRADE.md
 files:
+- CHANGELOG.md
+- INSTALL.md
+- LICENSE
+- NOTICE
+- README.md
+- UPGRADE.md
+- examples/README
+- examples/active_record_openid_store/README
+- examples/active_record_openid_store/XXX_add_open_id_store_to_db.rb
+- examples/active_record_openid_store/XXX_upgrade_open_id_store.rb
 - examples/active_record_openid_store/init.rb
 - examples/active_record_openid_store/lib/association.rb
 - examples/active_record_openid_store/lib/nonce.rb
 - examples/active_record_openid_store/lib/open_id_setting.rb
 - examples/active_record_openid_store/lib/openid_ar_store.rb
-- examples/active_record_openid_store/README
 - examples/active_record_openid_store/test/store_test.rb
-- examples/active_record_openid_store/XXX_add_open_id_store_to_db.rb
-- examples/active_record_openid_store/XXX_upgrade_open_id_store.rb
 - examples/discover
+- examples/rails_openid/Gemfile
+- examples/rails_openid/README
+- examples/rails_openid/README.rdoc
+- examples/rails_openid/Rakefile
 - examples/rails_openid/app/assets/images/rails.png
 - examples/rails_openid/app/assets/javascripts/application.js
 - examples/rails_openid/app/assets/stylesheets/application.css
@@ -44,6 +55,7 @@ files:
 - examples/rails_openid/app/views/layouts/server.html.erb
 - examples/rails_openid/app/views/login/index.html.erb
 - examples/rails_openid/app/views/server/decide.html.erb
+- examples/rails_openid/config.ru
 - examples/rails_openid/config/application.rb
 - examples/rails_openid/config/boot.rb
 - examples/rails_openid/config/database.yml
@@ -60,11 +72,9 @@ files:
 - examples/rails_openid/config/initializers/wrap_parameters.rb
 - examples/rails_openid/config/locales/en.yml
 - examples/rails_openid/config/routes.rb
-- examples/rails_openid/config.ru
 - examples/rails_openid/db/development.sqlite3
 - examples/rails_openid/db/seeds.rb
 - examples/rails_openid/doc/README_FOR_APP
-- examples/rails_openid/Gemfile
 - examples/rails_openid/log/development.log
 - examples/rails_openid/public/404.html
 - examples/rails_openid/public/422.html
@@ -80,19 +90,17 @@ files:
 - examples/rails_openid/public/javascripts/effects.js
 - examples/rails_openid/public/javascripts/prototype.js
 - examples/rails_openid/public/robots.txt
-- examples/rails_openid/Rakefile
-- examples/rails_openid/README
-- examples/rails_openid/README.rdoc
 - examples/rails_openid/script/rails
 - examples/rails_openid/test/functional/login_controller_test.rb
 - examples/rails_openid/test/functional/server_controller_test.rb
 - examples/rails_openid/test/performance/browsing_test.rb
 - examples/rails_openid/test/test_helper.rb
-- examples/README
 - lib/hmac/hmac.rb
 - lib/hmac/sha1.rb
 - lib/hmac/sha2.rb
+- lib/openid.rb
 - lib/openid/association.rb
+- lib/openid/consumer.rb
 - lib/openid/consumer/associationmanager.rb
 - lib/openid/consumer/checkid_request.rb
 - lib/openid/consumer/discovery.rb
@@ -100,7 +108,7 @@ files:
 - lib/openid/consumer/html_parse.rb
 - lib/openid/consumer/idres.rb
 - lib/openid/consumer/responses.rb
-- lib/openid/consumer.rb
+- lib/openid/consumer/session.rb
 - lib/openid/cryptutil.rb
 - lib/openid/dh.rb
 - lib/openid/extension.rb
@@ -135,7 +143,6 @@ files:
 - lib/openid/yadis/xrds.rb
 - lib/openid/yadis/xri.rb
 - lib/openid/yadis/xrires.rb
-- lib/openid.rb
 - test/data/accept.txt
 - test/data/dh.txt
 - test/data/example-xrds.xml
@@ -163,13 +170,13 @@ files:
 - test/data/test_discover/yadis_idp_delegate.xml
 - test/data/test_discover/yadis_no_delegate.xml
 - test/data/test_xrds/=j3h.2007.11.14.xrds
+- test/data/test_xrds/README
 - test/data/test_xrds/delegated-20060809-r1.xrds
 - test/data/test_xrds/delegated-20060809-r2.xrds
 - test/data/test_xrds/delegated-20060809.xrds
 - test/data/test_xrds/no-xrd.xml
 - test/data/test_xrds/not-xrds.xml
 - test/data/test_xrds/prefixsometimes.xrds
-- test/data/test_xrds/README
 - test/data/test_xrds/ref.xrds
 - test/data/test_xrds/sometimesprefix.xrds
 - test/data/test_xrds/spoof1.xrds
@@ -219,12 +226,6 @@ files:
 - test/test_yadis_discovery.rb
 - test/testutil.rb
 - test/util.rb
-- NOTICE
-- CHANGELOG.md
-- README.md
-- INSTALL.md
-- LICENSE
-- UPGRADE.md
 homepage: https://github.com/openid/ruby-openid
 licenses:
 - Ruby
@@ -232,23 +233,23 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A library for consuming and serving OpenID identities.
@@ -280,13 +281,13 @@ test_files:
 - test/data/test_discover/yadis_idp_delegate.xml
 - test/data/test_discover/yadis_no_delegate.xml
 - test/data/test_xrds/=j3h.2007.11.14.xrds
+- test/data/test_xrds/README
 - test/data/test_xrds/delegated-20060809-r1.xrds
 - test/data/test_xrds/delegated-20060809-r2.xrds
 - test/data/test_xrds/delegated-20060809.xrds
 - test/data/test_xrds/no-xrd.xml
 - test/data/test_xrds/not-xrds.xml
 - test/data/test_xrds/prefixsometimes.xrds
-- test/data/test_xrds/README
 - test/data/test_xrds/ref.xrds
 - test/data/test_xrds/sometimesprefix.xrds
 - test/data/test_xrds/spoof1.xrds