global_session 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b314fdf883f6db5a94056c8f4425b645ce26ce26
-  data.tar.gz: f2598c6bc89cf364070919a0d7d4704660721664
+  metadata.gz: 4076acba8dcf282c7dad88a0d0970849c24be12d
+  data.tar.gz: 2868c88a7927c381c23c4015da1dc31794f41238
 SHA512:
-  metadata.gz: cce6b5236c84c60d94df3342a78c2f63bb5289c9d8c31c089983d1e3eb7905b83f5aa5e50f444061d3bd320745411a564db932153c71d04f7a40e2afecad3032
-  data.tar.gz: d2e8e7feb7641b439ff2e44f3e145c6f7f1f131ece9044c5edcc662c3a73a49ba590b7de1a623c751808c35dad02ffe18d06a251e7a5c18520e0d0b3fb849056
+  metadata.gz: 62a9e4d919ecee5c1f182f78b2e28ae55baf5430a1538ae5b7df6bf03323c4b61a0df003583a096cf29c6776409c4076ea19d6cdac9ddae3e5b86971fd5908f0
+  data.tar.gz: eca8e7350d16946e5417168f6b4ebdb3a52c4322714b1682f0df993b85f78c8887c747a9716db0bce10a7b94107231c3c8424c3ca620b61966a4c649d9dd0c95

data/README.rdoc

@@ -68,7 +68,7 @@ Install the GlobalSession middleware into your Rack stack; pass a config and a d
 object to its initializer. For instance, in config.ru:
 
     configuration = GlobalSession::Configuration.new('path/to/config.yml', RACK_ENV)
-    directory = GlobalSession::Directory.new(configuration, 'path/to/keystore')
+    directory = GlobalSession::Directory.new(configuration)
     use ::GlobalSession::Rack::Middleware, configuration, directory
 
 = Global Session Contents
@@ -81,7 +81,7 @@ operation). If your app uses the cookie, GlobalSession will take care of
 updating the cookie whenever session values change.
 
 Data-wise, the session is a JSON dictionary containing the following stuff:
-* session metadata (UUID, created-at, expires-at, signing-authority)
+* session metadata (UUID, created at, expires at, signing authority)
 * signed session attributes (e.g. the authenticated user ID)
 * insecure session attributes (e.g. the last-visited URL)
 * a cryptographic signature of the metadata and signed attributes

data/VERSION

@@ -1 +1 @@
-3.1.0
+3.1.1

data/global_session.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: global_session 3.1.0 ruby lib
+# stub: global_session 3.1.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "global_session"
-  s.version = "3.1.0"
+  s.version = "3.1.1"
 
   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 = "2014-12-31"
+  s.date = "2015-05-22"
   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 = [

data/lib/global_session/rack.rb

@@ -43,7 +43,7 @@ module GlobalSession
       # is the ticket.
       #
       # @param [Configuration] configuration
-      # @param optional [String,Directory] directory the directory class name (DEPRECATED) or an actual instance of Directory
+      # @param optional [String,Directory] directory the disk-directory in which keys live (DEPRECATED), or an actual instance of Directory
       #
       # @yield if a block is provided, yields to the block to fetch session data from request state
       # @yieldparam [Hash] env Rack request environment is passed as a yield parameter
@@ -84,15 +84,16 @@ module GlobalSession
                 "Invalid/unknown directory class name: #{klass_name.inspect}"
         end
 
-        # Initialize the directory
-        # @deprecated require Directory object in v4
-        if klass.is_a?(Class)
-          @directory = klass.new(@configuration, directory)
-        elsif klass.is_a?(Directory)
+        # Initialize the directory object
+        if directory.is_a?(Directory)
+          # In v4-style initialization, the directory is always passed in
           @directory = directory
+        elsif klass.is_a?(Class)
+          # @deprecated v3-style initialization where the config file names the directory class
+          @directory = klass.new(@configuration, directory)
         else
           raise GlobalSession::ConfigurationError,
-                "Unsupported value for 'directory': expected Class or Directory, got #{klass.inspect}"
+                "Cannot determine directory class/instance; method parameter is a #{directory.class.name} and configuration parameter is #{klass.class.name}"
         end
 
         # Initialize the keystore
@@ -215,7 +216,7 @@ module GlobalSession
       # @return [true] always returns true
       # @param [Hash] env Rack request environment
       def update_cookie(env)
-        return true unless @configuration['authority']
+        return true unless @directory.keystore.private_key_name
         return true if env['global_session.req.update'] == false
 
         session = env['global_session']
@@ -232,10 +233,13 @@ module GlobalSession
           expires = @configuration['ephemeral'] ? nil : session.expired_at
           unless env['rack.cookies'][@cookie_name] == value
             env['rack.cookies'][@cookie_name] =
-              {:value    => value,
-               :domain   => cookie_domain(env),
-               :expires  => expires,
-               :httponly => true}
+              {
+                :value    => value,
+                :domain   => cookie_domain(env),
+                :expires  => expires,
+                :httponly => true,
+                :secure   => (env['rack.url_scheme'] == 'https'),
+              }
           end
         else
           # write an empty cookie
@@ -253,7 +257,7 @@ module GlobalSession
       # @return [true] always returns true
       # @param [Hash] env Rack request environment
       def wipe_cookie(env)
-        return unless @configuration['authority']
+        return unless @directory.keystore.private_key_name
         return if env['global_session.req.update'] == false
 
         env['rack.cookies'][@cookie_name] = {:value   => nil,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: global_session
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Tony Spataro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-24 00:00:00.000000000 Z
+date: 2015-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json