isomorfeus-transport 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa0acbcbd591284295e444b772feb04cfd666a9ffc760f9883d6ca4e1ab92cf8
-  data.tar.gz: a71a263b02d3652bc2a934c2369c8e432baa8b11f4bca1c3b44202a819f4d650
+  metadata.gz: '014479eeaec2d02e863f3e71fad9dd13baa99b99103cd46a922929aba1a7311c'
+  data.tar.gz: 4b88a670a325f1c834bc35259ace1f396cdc9611442f2f3f10cc3c00227616f5
 SHA512:
-  metadata.gz: 1069e0e06fd752d82ef00f059c9afddb095e13b0891d14e4d3e5d2f4d27498ea2971142f8c6535566864d41aad49a804af538f6fc53cb9a65230a6555305c193
-  data.tar.gz: 57f34ceceea085bb19891bd4c30420aa506f8c69d6305f04eb1a8662fb9dff8089785b043bd9703caa0be3e5fd42c9d33cb02ef6b9abc7c62673393dabb13157
+  metadata.gz: 6187c2351668a657d6ddf6e14e881b1dd509b13d0d216174e0f483c611550f3c1f1b933b7b9881bf1ffec2d65a8247848062dd4d2769f220f234d6a97697196f
+  data.tar.gz: d7a94c2543aaf0e56fad460f8d52142b669b8d44530368da9cfbd11a63f40244c70b0ad1d281d3e444ff9ba9739668d1e5454ccecd70167298839b84e5608bde

data/lib/isomorfeus/transport/handler/authentication_handler.rb

@@ -33,9 +33,7 @@ module Isomorfeus
                   session_id = SecureRandom.uuid
                   session_cookie = "session=#{session_id}; SameSite=Strict; HttpOnly; Path=/; Max-Age=2592000#{'; Secure' if Isomorfeus.production?}"
                   session_cookie_accessor = SecureRandom.uuid
-                  Isomorfeus.pub_sub_client.instance_variable_set(:@isomorfeus_user, user)
                   Isomorfeus.pub_sub_client.instance_variable_set(:@isomorfeus_authentication_tries, nil)
-                  Isomorfeus.pub_sub_client.instance_variable_set(:@isomorfeus_session_cookie, session_cookie)
                   Isomorfeus.session_store.add(session_id: session_id, cookie: session_cookie, user: user, accessor: session_cookie_accessor)
                   response_agent.agent_result = { success: 'ok', data: user.to_transport, session_cookie_accessor: session_cookie_accessor }
                 end
@@ -45,9 +43,7 @@ module Isomorfeus
               session_id = response_agent.request['ssr_login']
               user = Isomorfeus.session_store.get_user(session_id: session_id)
               if user
-                Isomorfeus.pub_sub_client.instance_variable_set(:@isomorfeus_user, user)
                 Isomorfeus.pub_sub_client.instance_variable_set(:@isomorfeus_authentication_tries, nil)
-                Isomorfeus.pub_sub_client.instance_variable_set(:@isomorfeus_session_cookie, nil)
                 response_agent.agent_result = { success: 'ok', data: user.to_transport }
               end
             end

data/lib/isomorfeus/transport/rack_middleware.rb

@@ -9,10 +9,24 @@ module Isomorfeus
         @app = app
       end
 
+      def user_from_env(env)
+        cookies = env['HTTP_COOKIE']
+        if cookies
+          cookies = cookies.split('; ')
+          cookie = cookies.detect { |c| c.start_with?('session=') }
+          if cookie
+            session_id = cookie[8..-1]
+            user = Isomorfeus.session_store.get_user(session_id: session_id)
+            [user, session_id]
+          end
+        end
+      end
+
       def call(env)
         if env['PATH_INFO'] == Isomorfeus.api_websocket_path
           if env['rack.upgrade?'] == :websocket
-            env['rack.upgrade'] = Isomorfeus::Transport::ServerSocketProcessor.new
+            user, _session_id = user_from_env(env)
+            env['rack.upgrade'] = Isomorfeus::Transport::ServerSocketProcessor.new(user)
           end
           WS_RESPONSE
         elsif env['PATH_INFO'] == Isomorfeus.cookie_eater_path
@@ -28,39 +42,23 @@ module Isomorfeus
             [404, {}, ["Must specify relative path!"]]
           end
         elsif env['PATH_INFO'] == Isomorfeus.api_logout_path
-          cookies = env['HTTP_COOKIE']
-          if cookies
-            cookies = cookies.split('; ')
-            cookie = cookies.detect { |c| c.start_with?('session=') }
-            if cookie
-              session_id = cookie[8..-1]
-              user = Isomorfeus.session_store.get_user(session_id: session_id)
-              if user
-                begin
-                  Isomorfeus.session_store.remove(session_id: session_id)
-                  cookie = "session=#{session_id}; SameSite=Strict; HttpOnly; Path=/; expires=Thu, 01 Jan 1970 00:00:00 UTC#{'; Secure' if Isomorfeus.production?}"
-                  return [302, { 'Location' => '/', 'Set-Cookie' => cookie }, ["Logged out!"]]
-                ensure
-                  Thread.current[:isomorfeus_user] = nil
-                  Thread.current[:isomorfeus_session_id] = nil
-                end
-              end
+          user, session_id = user_from_env(env)
+          if user
+            begin
+              Isomorfeus.session_store.remove(session_id: session_id)
+              cookie = "session=#{session_id}; SameSite=Strict; HttpOnly; Path=/; expires=Thu, 01 Jan 1970 00:00:00 UTC#{'; Secure' if Isomorfeus.production?}"
+              return [302, { 'Location' => '/', 'Set-Cookie' => cookie }, ["Logged out!"]]
+            ensure
+              Thread.current[:isomorfeus_user] = nil
+              Thread.current[:isomorfeus_session_id] = nil
             end
           end
           return [302, { 'Location' => '/', 'Set-Cookie' => cookie }, ["Tried to log out!"]]
         else
-          cookies = env['HTTP_COOKIE']
-          if cookies
-            cookies = cookies.split('; ')
-            cookie = cookies.detect { |c| c.start_with?('session=') }
-            if cookie
-              session_id = cookie[8..-1]
-              user = Isomorfeus.session_store.get_user(session_id: session_id)
-              if user
-                Thread.current[:isomorfeus_user] = user
-                Thread.current[:isomorfeus_session_id] = session_id
-              end
-            end
+          user, session_id = user_from_env(env)
+          if user
+            Thread.current[:isomorfeus_user] = user
+            Thread.current[:isomorfeus_session_id] = session_id
           end
           begin
             result = @app.call(env)

data/lib/isomorfeus/transport/server_socket_processor.rb

@@ -3,6 +3,10 @@ module Isomorfeus
     class ServerSocketProcessor
       include Isomorfeus::Transport::ServerProcessor
 
+      def initialize(user)
+        @user = user
+      end
+
       def on_message(client, data)
         if Isomorfeus.development?
           write_lock = Isomorfeus.zeitwerk_lock.try_write_lock
@@ -45,9 +49,7 @@ module Isomorfeus
       end
 
       def user(client)
-        current_user = client.instance_variable_get(:@isomorfeus_user)
-        return current_user if current_user
-        Anonymous.new
+        @user ||= Anonymous.new
       end
     end
   end

data/lib/isomorfeus/transport/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Transport
-    VERSION = '2.0.1'
+    VERSION = '2.0.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-transport
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Jan Biedermann
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: isomorfeus-redux
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement