isomorfeus-transport 2.0.0.rc9 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8201ea5030ef2db3bb57a590ab9a76b37305634b8a21b9aab6b5dc2397739f8
-  data.tar.gz: a0d350ad0f97a085a257727b3897848611dba3093fb5554ff150af6deb15322f
+  metadata.gz: '014479eeaec2d02e863f3e71fad9dd13baa99b99103cd46a922929aba1a7311c'
+  data.tar.gz: 4b88a670a325f1c834bc35259ace1f396cdc9611442f2f3f10cc3c00227616f5
 SHA512:
-  metadata.gz: 96ee8d0f258ce35e106310d11924bc87be91b6ed77c121425c1f90b2b3393825ae0973665d27c1b668b98681a31d80e4bc6d3f78394e6f5f088875257a2f5a1f
-  data.tar.gz: e6918a388257422d7dcc9799bc3217d138ee221febb26241318a1dffdbf8dd74178a75c1b74f2f7637932145fc95686ef7d15a57d47f7f744a4cb40d794d837e
+  metadata.gz: 6187c2351668a657d6ddf6e14e881b1dd509b13d0d216174e0f483c611550f3c1f1b933b7b9881bf1ffec2d65a8247848062dd4d2769f220f234d6a97697196f
+  data.tar.gz: d7a94c2543aaf0e56fad460f8d52142b669b8d44530368da9cfbd11a63f40244c70b0ad1d281d3e444ff9ba9739668d1e5454ccecd70167298839b84e5608bde

data/README.md

@@ -3,7 +3,7 @@
 Transport and PubSub for Isomorfeus.
 
 ### Community and Support
-At the [Isomorfeus Framework Project](http://isomorfeus.com) 
+At the [Isomorfeus Framework Project](http://isomorfeus.com)
 
 ## Installation
 isomorfeus-transport is usually installed with the installer.
@@ -23,5 +23,5 @@ Server only:
 
 ## Usage
 
-- [Authentication and Current User](https://github.com/isomorfeus/isomorfeus-project/blob/master/ruby/isomorfeus-transport/docs/authentication.md)
-- [Channels (PubSub)](https://github.com/isomorfeus/isomorfeus-project/blob/master/ruby/isomorfeus-transport/docs/channels.md)
+- [Authentication and Current User](https://github.com/isomorfeus/isomorfeus-project/blob/master/isomorfeus-transport/docs/authentication.md)
+- [Channels (PubSub)](https://github.com/isomorfeus/isomorfeus-project/blob/master/isomorfeus-transport/docs/channels.md)

data/lib/isomorfeus/transport/config.rb

@@ -30,6 +30,7 @@ module Isomorfeus
     add_client_option(:api_websocket_host)
     add_client_option(:api_websocket_port)
     add_client_option(:api_websocket_path)
+    add_client_option(:api_logout_path)
     add_client_option(:cookie_eater_path)
     add_client_option(:transport_init_class_names, [])
 
@@ -69,6 +70,7 @@ module Isomorfeus
       attr_accessor :api_websocket_host
       attr_accessor :api_websocket_port
       attr_accessor :api_websocket_path
+      attr_accessor :api_logout_path
       attr_accessor :cookie_eater_path
       attr_reader :session_store
 
@@ -168,8 +170,8 @@ module Isomorfeus
     end
 
     self.session_store_init do
-      store_path = File.expand_path(File.join(Isomorfeus.root, 'data', Isomorfeus.env), 'session_store')
-      Isomorfeus::Transport::HamsterSessionStore.new(store_path) # dont use this one, but we keep it here to have at least something
+      store_path = File.expand_path(File.join(Isomorfeus.root, 'data', Isomorfeus.env, 'session_store'))
+      Isomorfeus::Transport::HamsterSessionStore.new(store_path)
     end
   end
 
@@ -177,6 +179,6 @@ module Isomorfeus
   self.api_websocket_host = 'localhost'
   self.api_websocket_port = '3000'
   self.api_websocket_path = '/isomorfeus/api/websocket'
-
-  self.cookie_eater_path = '/isomorfeus/cookie/eat'
+  self.api_logout_path    = '/isomorfeus/api/logout'
+  self.cookie_eater_path  = '/isomorfeus/cookie/eat'
 end

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

@@ -6,8 +6,8 @@ module Isomorfeus
 
         on_request do |response_agent|
           # promise_send_path('Isomorfeus::Transport::Handler::AuthenticationHandler', 'login', user_class_name, user_identifier, user_password)
-          response_agent.request.each_key do |login_or_logout|
-            if login_or_logout == 'login'
+          response_agent.request.each_key do |login_or_ssr_login|
+            if login_or_ssr_login == 'login'
               response_agent.agent_result = { error: 'Authentication failed' }
               tries = pub_sub_client.instance_variable_get(:@isomorfeus_authentication_tries)
               tries = 0 unless tries
@@ -33,34 +33,19 @@ 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
               end
-            elsif login_or_logout == 'ssr_login'
+            elsif login_or_ssr_login == 'ssr_login'
               response_agent.agent_result = { error: 'Authentication failed' }
               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
-            elsif login_or_logout == 'logout'
-              begin
-                # bogus
-                session_cookie = nil
-              ensure
-                Isomorfeus.pub_sub_client.instance_variable_set(:@isomorfeus_user, nil)
-                Isomorfeus.pub_sub_client.instance_variable_set(:@isomorfeus_authentication_tries, nil)
-                Isomorfeus.pub_sub_client.instance_variable_set(:@isomorfeus_session_cookie, nil)
-                Isomorfeus.session_store.remove(cookie: session_cookie)
-                response_agent.agent_result = { success: 'ok' }
-              end
             end
           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
@@ -27,20 +41,25 @@ module Isomorfeus
           else
             [404, {}, ["Must specify relative path!"]]
           end
-        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
+        elsif env['PATH_INFO'] == Isomorfeus.api_logout_path
+          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
+          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)
           ensure

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.0.rc9'
+    VERSION = '2.0.2'
   end
 end

data/lib/lucid_authentication/mixin.rb

@@ -60,12 +60,13 @@ module LucidAuthentication
       end
 
       def promise_deauthentication_with_isomorfeus
-        Isomorfeus::Transport.promise_send_path('Isomorfeus::Transport::Handler::AuthenticationHandler', 'logout', 'logout').then do |agent|
-          `document.cookie = "session="`
-          Isomorfeus.set_current_user(nil)
-          Isomorfeus.force_init_store!
-          agent.processed = true
-          agent.response.key?(:success) ? true : raise('Logout failed!')
+        cookie = `document.cookie`
+        p = Promise.new
+        begin
+          logout_query = Isomorfeus.api_logout_path
+          `window.location = logout_query`
+        rescue
+          p.reject
         end
       end
     else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-transport
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc9
+  version: 2.0.2
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-01 00:00:00.000000000 Z
+date: 2022-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 7.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 7.0.1
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement
@@ -58,42 +58,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.13.10
+        version: 3.13.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.13.10
+        version: 3.13.11
 - !ruby/object:Gem::Dependency
   name: opal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: isomorfeus-asset-manager
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.3
+        version: 0.14.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.3
+        version: 0.14.5
 - !ruby/object:Gem::Dependency
   name: isomorfeus-hamster
   requirement: !ruby/object:Gem::Requirement
@@ -114,28 +114,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.6.5
+        version: 10.6.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.6.5
+        version: 10.6.11
 - !ruby/object:Gem::Dependency
   name: isomorfeus-policy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc9
+        version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc9
+        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.0.rc9
+        version: 2.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc9
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -272,9 +272,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.3.3
 signing_key: