global_session 3.0.4 → 3.0.5

data/README.rdoc

@@ -9,7 +9,12 @@ In other words: it glues your semi-related Web apps together so they share the
 same bits of session state. This is done by putting the session itself into
 cookies.
 
-Maintained by the RightScale Teal Team
+Maintained by
+ - [Sapphire Team](https://wookiee.rightscale.com/display/rightscale/Meet+the+Sapphire+Team)
+
+Merge to master whitelist
+ - @tony-spataro-rs
+ - @ryanwilliamson
 
 == What Is It Not?
 

data/VERSION

@@ -1 +1 @@
-3.0.4
+3.0.5

data/global_session.gemspec

@@ -2,16 +2,18 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: global_session 3.0.5 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = %q{global_session}
-  s.version = "3.0.4"
+  s.name = "global_session"
+  s.version = "3.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Tony Spataro"]
-  s.date = %q{2014-03-31}
-  s.description = %q{This Rack middleware allows several web apps in an authentication domain to share session state, facilitating single sign-on in a distributed web app. It only provides session sharing and does not concern itself with authentication or replication of the user database.}
-  s.email = %q{support@rightscale.com}
+  s.date = "2014-11-12"
+  s.description = "This Rack middleware allows several web apps in an authentication domain to share session state, facilitating single sign-on in a distributed web app. It only provides session sharing and does not concern itself with authentication or replication of the user database."
+  s.email = "support@rightscale.com"
   s.extra_rdoc_files = [
     "LICENSE",
     "README.rdoc"
@@ -44,20 +46,18 @@ Gem::Specification.new do |s|
     "rails_generators/global_session_authority/USAGE",
     "rails_generators/global_session_authority/global_session_authority_generator.rb"
   ]
-  s.homepage = %q{https://github.com/rightscale/global_session}
+  s.homepage = "https://github.com/rightscale/global_session"
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Secure single-domain session sharing plugin for Rack and Rails.}
+  s.rubygems_version = "2.2.0"
+  s.summary = "Secure single-domain session sharing plugin for Rack and Rails."
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<json>, ["~> 1.4"])
       s.add_runtime_dependency(%q<rack-contrib>, ["~> 1.0"])
-      s.add_runtime_dependency(%q<right_support>, [">= 2.8.2", "< 3.0"])
+      s.add_runtime_dependency(%q<right_support>, ["< 3.0", ">= 2.8.2"])
       s.add_runtime_dependency(%q<simple_uuid>, [">= 0.2.0"])
       s.add_development_dependency(%q<cucumber>, ["~> 1.0"])
       s.add_development_dependency(%q<debugger>, ["~> 1.5"])
@@ -72,7 +72,7 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<json>, ["~> 1.4"])
       s.add_dependency(%q<rack-contrib>, ["~> 1.0"])
-      s.add_dependency(%q<right_support>, [">= 2.8.2", "< 3.0"])
+      s.add_dependency(%q<right_support>, ["< 3.0", ">= 2.8.2"])
       s.add_dependency(%q<simple_uuid>, [">= 0.2.0"])
       s.add_dependency(%q<cucumber>, ["~> 1.0"])
       s.add_dependency(%q<debugger>, ["~> 1.5"])
@@ -88,7 +88,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<json>, ["~> 1.4"])
     s.add_dependency(%q<rack-contrib>, ["~> 1.0"])
-    s.add_dependency(%q<right_support>, [">= 2.8.2", "< 3.0"])
+    s.add_dependency(%q<right_support>, ["< 3.0", ">= 2.8.2"])
     s.add_dependency(%q<simple_uuid>, [">= 0.2.0"])
     s.add_dependency(%q<cucumber>, ["~> 1.0"])
     s.add_dependency(%q<debugger>, ["~> 1.5"])

data/lib/global_session.rb

@@ -54,6 +54,7 @@ module GlobalSession
         super(message)
       else
         super("(data[0..4]: '%s') - %s" % [cookie[0..4], message])
+        @cookie = cookie
       end
     end
   end

data/lib/global_session/session.rb

@@ -25,11 +25,13 @@ require 'global_session/session/v3'
 # by the different versions; it is responsible for detecting the version of
 # a given cookie, then instantiating a suitable session object.
 module GlobalSession::Session
-  # Decode a global session cookie without
+  # Decode a global session cookie without checking signature or expiration. Good for debugging.
   def self.decode_cookie(cookie)
     guess_version(cookie).decode_cookie(cookie)
   end
 
+  # Decode a global session cookie. Use a heuristic to determine the version.
+  # @raise [GlobalSession::MalformedCookie] if the cookie is not a valid serialized global session
   def self.new(directory, cookie=nil, valid_signature_digest=nil)
     guess_version(cookie).new(directory, cookie)
   end

data/lib/global_session/session/v3.rb

@@ -112,14 +112,19 @@ module GlobalSession::Session
     # secure attributes have changed since the session was instantiated, compute
     # a fresh RSA signature.
     #
-    # === Return
-    # cookie(String):: The B64cookie-encoded JSON-serialized global session
+    # @return [String] a B64cookie-encoded JSON-serialized global session
+    # @raise [GlobalSession::UnserializableType] if the attributes hash contains
     def to_s
       if @cookie && !@dirty_insecure && !@dirty_secure
         #use cached cookie if nothing has changed
         return @cookie
       end
 
+      unless serializable?(@signed) && serializable?(@insecure)
+        raise GlobalSession::UnserializableType,
+              "Attributes hash contains non-String keys, cannot be cleanly marshalled"
+      end
+
       hash = {'v' => 3,
               'id' => @id, 'a' => @authority,
               'tc' => @created_at.to_i, 'te' => @expired_at.to_i,
@@ -369,5 +374,23 @@ module GlobalSession::Session
         'dx' => array[6],
       }
     end
+
+    # Determine whether an object can be cleanly round-tripped to JSON
+    # @param [Object] obj
+    # @return [Boolean]
+    def serializable?(obj)
+      case obj
+      when Numeric, String, TrueClass, FalseClass, NilClass, Symbol
+        true
+      when Array
+        obj.each { |e| serializable?(e) }
+      when Hash
+        obj.all? do |k, v|
+          k.is_a?(String) && serializable?(v)
+        end
+      else
+        false
+      end
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: global_session
 version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: false
+  hash: 13
+  prerelease: 
   segments: 
   - 3
   - 0
-  - 4
-  version: 3.0.4
+  - 5
+  version: 3.0.5
 platform: ruby
 authors: 
 - Tony Spataro
@@ -15,10 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-03-31 00:00:00 -07:00
-default_executable: 
+date: 2014-11-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: json
+  type: :runtime
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -29,11 +31,11 @@ dependencies:
         - 1
         - 4
         version: "1.4"
-  name: json
   requirement: *id001
+- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: rack-contrib
   type: :runtime
-- !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -44,14 +46,21 @@ dependencies:
         - 1
         - 0
         version: "1.0"
-  name: rack-contrib
   requirement: *id002
+- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: right_support
   type: :runtime
-- !ruby/object:Gem::Dependency 
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
+    - - <
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
     - - ">="
       - !ruby/object:Gem::Version 
         hash: 43
@@ -60,18 +69,11 @@ dependencies:
         - 8
         - 2
         version: 2.8.2
-    - - <
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
-  name: right_support
   requirement: *id003
+- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: simple_uuid
   type: :runtime
-- !ruby/object:Gem::Dependency 
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -83,11 +85,11 @@ dependencies:
         - 2
         - 0
         version: 0.2.0
-  name: simple_uuid
   requirement: *id004
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: cucumber
+  type: :development
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -98,11 +100,11 @@ dependencies:
         - 1
         - 0
         version: "1.0"
-  name: cucumber
   requirement: *id005
+- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: debugger
   type: :development
-- !ruby/object:Gem::Dependency 
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -113,11 +115,11 @@ dependencies:
         - 1
         - 5
         version: "1.5"
-  name: debugger
   requirement: *id006
+- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: flexmock
   type: :development
-- !ruby/object:Gem::Dependency 
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -128,11 +130,11 @@ dependencies:
         - 0
         - 8
         version: "0.8"
-  name: flexmock
   requirement: *id007
+- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: httpclient
   type: :development
-- !ruby/object:Gem::Dependency 
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -142,11 +144,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: httpclient
   requirement: *id008
+- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: jeweler
   type: :development
-- !ruby/object:Gem::Dependency 
   version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -158,11 +160,11 @@ dependencies:
         - 8
         - 3
         version: 1.8.3
-  name: jeweler
   requirement: *id009
+- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: msgpack
   type: :development
-- !ruby/object:Gem::Dependency 
   version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -173,11 +175,11 @@ dependencies:
         - 0
         - 4
         version: "0.4"
-  name: msgpack
   requirement: *id010
+- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: rake
   type: :development
-- !ruby/object:Gem::Dependency 
   version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -188,11 +190,11 @@ dependencies:
         - 0
         - 8
         version: "0.8"
-  name: rake
   requirement: *id011
+- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: right_develop
   type: :development
-- !ruby/object:Gem::Dependency 
   version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -203,11 +205,11 @@ dependencies:
         - 1
         - 2
         version: "1.2"
-  name: right_develop
   requirement: *id012
+- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: rspec
   type: :development
-- !ruby/object:Gem::Dependency 
   version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -218,11 +220,11 @@ dependencies:
         - 1
         - 3
         version: "1.3"
-  name: rspec
   requirement: *id013
+- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: ruby-debug
   type: :development
-- !ruby/object:Gem::Dependency 
   version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -233,10 +235,7 @@ dependencies:
         - 0
         - 10
         version: "0.10"
-  name: ruby-debug
   requirement: *id014
-  prerelease: false
-  type: :development
 description: This Rack middleware allows several web apps in an authentication domain to share session state, facilitating single sign-on in a distributed web app. It only provides session sharing and does not concern itself with authentication or replication of the user database.
 email: support@rightscale.com
 executables: []
@@ -273,7 +272,6 @@ files:
 - rails_generators/global_session/templates/global_session.yml.erb
 - rails_generators/global_session_authority/USAGE
 - rails_generators/global_session_authority/global_session_authority_generator.rb
-has_rdoc: true
 homepage: https://github.com/rightscale/global_session
 licenses: 
 - MIT
@@ -303,7 +301,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Secure single-domain session sharing plugin for Rack and Rails.