try to ensure we always have some kind of object

tenderlove · tenderlove · commit 83d4bd12c7e8 · 2019-12-17T09:52:57.000-08:00
diff --git a/lib/rack/session/abstract/id.rb b/lib/rack/session/abstract/id.rb
@@ -11,6 +11,10 @@ module Rack
 
   module Session
 
+    class NullSessionId
+      def empty?; true; end
+    end
+
     module Abstract
       # SessionHash is responsible to lazily load the session from store.
 
@@ -39,8 +43,11 @@ def initialize(store, req)
         end
 
         def id
-          return @id if @loaded or instance_variable_defined?(:@id)
-          @id = @store.send(:extract_session_id, @req)
+          if @loaded or instance_variable_defined?(:@id)
+          else
+            @id = @store.send(:extract_session_id, @req)
+          end
+          @id || NullSessionId.new
         end
 
         def options
diff --git a/lib/rack/session/cookie.rb b/lib/rack/session/cookie.rb
@@ -125,11 +125,11 @@ def initialize(app, options={})
       def find_session(req, sid)
         data = unpacked_cookie_data(req)
         data = persistent_session_id!(data)
-        [data["session_id"], data]
+        [data["session_id"] || raise, data]
       end
 
       def extract_session_id(request)
-        unpacked_cookie_data(request)["session_id"]
+        unpacked_cookie_data(request)["session_id"] || NullSessionId.new
       end
 
       def unpacked_cookie_data(request)
