isomorfeus-transport 2.2.11 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7945a9b6793fff8882642b3ce49f9bb5c6159722c8f801863bcbd8ba1c536db9
-  data.tar.gz: a6dba7db0da2a33cca0f115a3e46dcb795a86c51cabdc1271a86e7c5d9bc0bdc
+  metadata.gz: 17d091f9644e919161c0c8cbe7c373e5087d16d34a8978ebe704904da0a060ca
+  data.tar.gz: 7aa732e7e24caebd2945caf32ecada3ecfc56b5f01a00ea498fc025f31a6838e
 SHA512:
-  metadata.gz: 51198a0ad3edfb66437c681f194af4584e8d332f859dff8bcad2d2f9dc32974c5b42504bcb1752beb059b45cbb251fcc758280fe154620fda855310dacb30874
-  data.tar.gz: 8bd03eed04de9ae3245165f196dd7cdcffc8647a9ca0f1b906e5b164d78c9fbb063a5e4d47ece15458d550cd7e6bdea3d346d9c336fd1a3a810c6a5384a4e96b
+  metadata.gz: 5ac6e0d72a4c8a955ba5f5d85ce83be579d1c753752c8f420f0859907fd8d112d2ae5b630e72756f740936a9469990a5cd84048157143304506aef2e9348bb7e
+  data.tar.gz: 55d3d7e6d303bde3df2e573f2e0001536a740e5644fa5a0b8ebeb14c88fffb78cee84b1a446fb38bf6f54f7f467c1e581c90800232ee91990942ade758a20832

data/README.md

@@ -23,5 +23,4 @@ Server only:
 
 ## Usage
 
-- [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

@@ -43,28 +43,6 @@ module Isomorfeus
       def add_transport_init_class_name(init_class_name)
         transport_init_class_names << init_class_name
       end
-
-      def current_user
-        @current_user ||= init_current_user
-      end
-
-      def init_current_user
-        if Isomorfeus.current_user_sid
-          Isomorfeus.instance_from_sid(Isomorfeus.current_user_sid)
-        else
-          Anonymous.new
-        end
-      end
-
-      def set_current_user(user)
-        if user
-          @current_user = user
-          Isomorfeus.current_user_sid = user.sid
-        else
-          @current_user = Anonymous.new
-          Isomorfeus.current_user_sid = nil
-        end
-      end
     end
   else
     class << self
@@ -73,7 +51,6 @@ module Isomorfeus
       attr_accessor :api_websocket_path
       attr_accessor :api_logout_path
       attr_accessor :cookie_eater_path
-      attr_reader :session_store
 
       def valid_channel_class_name?(class_name)
         valid_channel_class_names.include?(class_name)
@@ -131,48 +108,9 @@ module Isomorfeus
         cached_handler_classes[class_name] = "::#{class_name}".constantize
       end
 
-      def valid_user_class_names
-        @valid_user_class_names ||= Set.new
-      end
-
-      def valid_user_class_name?(class_name)
-        valid_user_class_names.include?(class_name)
-      end
-
-      def add_valid_user_class(klass)
-        valid_user_class_names << raw_class_name(klass)
-      end
-
-      def cached_user_classes
-        @cached_user_classes ||= {}
-      end
-
-      def cached_user_class(class_name)
-        return "::#{class_name}".constantize if Isomorfeus.development?
-        return cached_user_classes[class_name] if cached_user_classes.key?(class_name)
-        cached_user_classes[class_name] = "::#{class_name}".constantize
-      end
-
-      def current_user
-        Thread.current[:isomorfeus_user] ||= Anonymous.new
-      end
-
       def pub_sub_client
         Thread.current[:isomorfeus_pub_sub_client]
       end
-
-      def session_store
-        @session_store ||= @session_store_init.call
-      end
-
-      def session_store_init(&block)
-        @session_store_init = block
-      end
-    end
-
-    self.session_store_init do
-      store_path = File.expand_path(File.join(Isomorfeus.root, 'storage', Isomorfeus.env, 'session_store'))
-      Isomorfeus::Transport::HamsterSessionStore.new(store_path)
     end
   end
 

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

@@ -34,14 +34,14 @@ module Isomorfeus
                   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_authentication_tries, nil)
-                  Isomorfeus.session_store.add(session_id: session_id, cookie: session_cookie, user: user, accessor: session_cookie_accessor)
+                  Isomorfeus.session_class.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_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)
+              user = Isomorfeus.session_class.get_user(session_id: session_id)
               if user
                 Isomorfeus.pub_sub_client.instance_variable_set(:@isomorfeus_authentication_tries, nil)
                 response_agent.agent_result = { success: 'ok', data: user.to_transport }

data/lib/isomorfeus/transport/rack_middleware.rb

@@ -16,23 +16,26 @@ module Isomorfeus
           cookie = cookies.detect { |c| c.start_with?('session=') }
           if cookie
             session_id = cookie[8..-1]
-            return [Anonymous.new, nil] if session_id.nil? || session_id.empty?
-            user = Isomorfeus.session_store.get_user(session_id: session_id)
-            [user, session_id]
+            if !session_id.nil? && !session_id.empty?
+              user = Isomorfeus.session_class&.get_user(session_id: session_id)
+              return [user, session_id] unless user.nil?
+            end
           end
         end
+        [Anonymous.new, nil]
       end
 
       def call(env)
-        if env['PATH_INFO'] == Isomorfeus.api_websocket_path
+        case env['PATH_INFO']
+        when Isomorfeus.api_websocket_path
           if env['rack.upgrade?'] == :websocket
-            user, _session_id = user_from_env(env)
-            env['rack.upgrade'] = Isomorfeus::Transport::ServerSocketProcessor.new(user)
+            user, session_id = user_from_env(env)
+            env['rack.upgrade'] = Isomorfeus::Transport::ServerSocketProcessor.new(user, session_id)
           end
           WS_RESPONSE
-        elsif env['PATH_INFO'] == Isomorfeus.cookie_eater_path
+        when Isomorfeus.cookie_eater_path
           cookie_accessor, new_path = env['QUERY_STRING'].split('=')
-          cookie = Isomorfeus.session_store.take_cookie(accessor: cookie_accessor)
+          cookie = Isomorfeus.session_class&.take_cookie(accessor: cookie_accessor)
           if new_path.start_with?('/')
             if cookie
               [302, { 'Location' => new_path, 'Set-Cookie' => cookie }, ["Cookie eaten!"]]
@@ -42,11 +45,11 @@ module Isomorfeus
           else
             [404, {}, ["Must specify relative path!"]]
           end
-        elsif env['PATH_INFO'] == Isomorfeus.api_logout_path
+        when Isomorfeus.api_logout_path
           user, session_id = user_from_env(env)
           if user
             begin
-              Isomorfeus.session_store.remove(session_id: session_id)
+              Isomorfeus.session_class&.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

data/lib/isomorfeus/transport/server_socket_processor.rb

@@ -3,8 +3,10 @@ module Isomorfeus
     class ServerSocketProcessor
       include Isomorfeus::Transport::ServerProcessor
 
-      def initialize(user)
+      def initialize(user, session_id)
         @user = user
+        @session_id = session_id
+        @atime = Time.now
       end
 
       def on_message(client, data)
@@ -19,19 +21,21 @@ module Isomorfeus
           Isomorfeus.zeitwerk_lock.acquire_read_lock
         end
         request_hash = Oj.load(data, mode: :strict)
-        handler_instance_cache = {}
-        response_agent_array = []
-        Thread.current[:isomorfeus_user] = user(client)
-        Thread.current[:isomorfeus_pub_sub_client] = client
-        process_request(request_hash, handler_instance_cache, response_agent_array)
-        handler_instance_cache.each_value do |handler|
-          handler.resolve if handler.resolving?
-        end
-        result = {}
-        response_agent_array.each do |response_agent|
-          result.deep_merge!(response_agent.result)
+        Thread.current[:isomorfeus_user] = user
+        unless request_hash.key?(:iso_ping)
+          handler_instance_cache = {}
+          response_agent_array = []
+          Thread.current[:isomorfeus_pub_sub_client] = client
+          process_request(request_hash, handler_instance_cache, response_agent_array)
+          handler_instance_cache.each_value do |handler|
+            handler.resolve if handler.resolving?
+          end
+          result = {}
+          response_agent_array.each do |response_agent|
+            result.deep_merge!(response_agent.result)
+          end
+          client.write Oj.dump(result, mode: :strict) unless result.empty?
         end
-        client.write Oj.dump(result, mode: :strict) unless result.empty?
       ensure
         Thread.current[:isomorfeus_user] = nil
         Thread.current[:isomorfeus_pub_sub_client] = nil
@@ -50,8 +54,13 @@ module Isomorfeus
         # nothing for now
       end
 
-      def user(client)
-        @user ||= Anonymous.new
+      def user
+        t = Time.now
+        if @session_id && (t - @atime) > 600
+          Isomorfeus.session_class&.touch(session_id: @session_id)
+          @atime = t
+        end
+        @user
       end
     end
   end

data/lib/isomorfeus/transport/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Transport
-    VERSION = '2.2.11'
+    VERSION = '2.3.0'
   end
 end

data/lib/isomorfeus/transport.rb

@@ -2,6 +2,8 @@ module Isomorfeus
   module Transport
     class << self
       if RUBY_ENGINE == 'opal'
+        PING = `JSON.stringify({iso_ping: true})`
+
         attr_accessor :socket
 
         def init
@@ -57,10 +59,18 @@ module Isomorfeus
               open_promise.then { promise_send_request(request) } if agent && !agent.sent
             end
             open_promise.then { promise.resolve(true) }
+            keep_session_alive if on_browser?
           end
           promise
         end
 
+        def keep_session_alive
+          after 480000 do
+            @socket.send(PING)
+            keep_session_alive
+          end
+        end
+
         def disconnect
           @socket.close if @socket
           @socket = nil

data/lib/isomorfeus-transport.rb

@@ -1,5 +1,4 @@
 require 'isomorfeus-policy'
-require 'lucid_authentication/mixin'
 if RUBY_ENGINE == 'opal'
   require 'json'
   require 'isomorfeus/transport/version'
@@ -33,7 +32,6 @@ else
   require 'active_support'
   require 'isomorfeus-asset-manager'
   require 'isomorfeus-hamster'
-  require 'isomorfeus/transport/hamster_session_store'
   opal_path = Gem::Specification.find_by_name('opal').full_gem_path
   promise_path = File.join(opal_path, 'stdlib', 'promise.rb')
   require promise_path

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-transport
 version: !ruby/object:Gem::Version
-  version: 2.2.11
+  version: 2.3.0
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-03 00:00:00.000000000 Z
+date: 2022-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -100,56 +100,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.17
+        version: 0.14.21
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.17
-- !ruby/object:Gem::Dependency
-  name: isomorfeus-hamster
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.6
+        version: 0.14.21
 - !ruby/object:Gem::Dependency
   name: isomorfeus-preact
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.6.56
+        version: 10.6.60
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.6.56
+        version: 10.6.60
 - !ruby/object:Gem::Dependency
   name: isomorfeus-policy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.11
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.11
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: isomorfeus-redux
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.5.3
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -226,14 +212,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.11
+        version: 2.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.11
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -275,7 +261,6 @@ files:
 - lib/isomorfeus/transport/client_processor.rb
 - lib/isomorfeus/transport/compressor_rack.rb
 - lib/isomorfeus/transport/config.rb
-- lib/isomorfeus/transport/hamster_session_store.rb
 - lib/isomorfeus/transport/handler/authentication_handler.rb
 - lib/isomorfeus/transport/imports.rb
 - lib/isomorfeus/transport/middlewares.rb
@@ -287,7 +272,6 @@ files:
 - lib/isomorfeus/transport/ssr_login.rb
 - lib/isomorfeus/transport/version.rb
 - lib/isomorfeus/transport/websocket_client.rb
-- lib/lucid_authentication/mixin.rb
 - lib/lucid_channel/base.rb
 - lib/lucid_channel/mixin.rb
 - lib/lucid_handler/base.rb

data/lib/isomorfeus/transport/hamster_session_store.rb

@@ -1,96 +0,0 @@
-module Isomorfeus
-  module Transport
-    class HamsterSessionStore
-      class << self
-        def environment
-          @environment
-        end
-
-        def environment=(env)
-          @environment = env
-        end
-
-        def ref
-          @ref ||= 0
-        end
-
-        def ref=(val)
-          @ref = val
-        end
-
-        def refa
-          self.ref += 1
-        end
-
-        def refs
-          self.ref -= 1 if self.ref > 0
-        end
-
-        def finalize(cls)
-          proc do
-            cls.refs
-            if cls.ref == 0
-              cls.environment.close rescue nil
-            end
-          end
-        end
-      end
-
-      def initialize(cookie_hamster_path)
-        @cookie_hamster_path = cookie_hamster_path
-        open_environment
-        @db = self.class.environment.database('cookies', create: true)
-        ObjectSpace.define_finalizer(self, self.class.finalize(self.class))
-      end
-
-      def add(session_id:, cookie:, user:, accessor:)
-        @db.env.transaction do
-          @db.put(session_id, Oj.dump([user.class.to_s, user.key], mode: :strict))
-          @db.put(accessor, cookie)
-        end
-      end
-
-      def take_cookie(accessor:)
-        @db.env.transaction do
-          cookie = @db.get(accessor)
-          if cookie
-            session_info = cookie.split('; ').first
-            session_id = session_info.split('=').last.strip
-            @db.put("eaten_#{accessor}", session_id)
-            @db.delete(accessor)
-          else
-            # asked for the same cookie a second time
-            # can probably only be due to session hijacking
-            # so delete all sessions associated with that accessor
-            session_id = @db.get("eaten_#{accessor}")
-            @db.delete(session_id) if session_id
-          end
-          cookie
-        end
-      end
-
-      def get_user(session_id:)
-        json = @db.get(session_id)
-        if json
-          user_info = Oj.load(json, mode: :strict)
-          user_info[0].constantize.load(key: user_info[1]) if user_info
-        end
-      end
-
-      def remove(session_id:)
-        @db.env.transaction do
-          @db.delete(session_id)
-        end
-      end
-
-      private
-
-      def open_environment
-        return self.class.refa if self.class.environment
-        FileUtils.mkdir_p(@cookie_hamster_path) unless Dir.exist?(@cookie_hamster_path)
-        self.class.environment = Isomorfeus::Hamster.new(@cookie_hamster_path)
-        self.class.refa
-      end
-    end
-  end
-end

data/lib/lucid_authentication/mixin.rb

@@ -1,123 +0,0 @@
-module LucidAuthentication
-  module Mixin
-    def anonymous?
-      self.class == Anonymous
-    end
-
-    if RUBY_ENGINE == 'opal'
-      def self.included(base)
-        base.instance_exec do
-          def execute_login(&block)
-          end
-
-          def promise_login(user: nil, pass: nil, scheme: :isomorfeus, &block)
-            send("promise_authentication_with_#{scheme}", user: user, pass: pass, &block)
-          end
-
-          def promise_authentication_with_isomorfeus(user: nil, pass: nil, &block)
-            if Isomorfeus.production?
-              Isomorfeus.raise_error(message: "Connection not secure, can't login!") unless Isomorfeus::Transport.socket.url.start_with?('wss:')
-            else
-              `console.warn("Connection not secure, ensure a secure connection in production, otherwise login will fail!")` unless Isomorfeus::Transport.socket.url.start_with?('wss:')
-            end
-            Isomorfeus::Transport.promise_send_path('Isomorfeus::Transport::Handler::AuthenticationHandler', 'login', self.name, user, pass).then do |agent|
-              if agent.processed
-                agent.result
-              else
-                agent.processed = true
-                if agent.response.key?(:success)
-                  Isomorfeus.store.dispatch(type: 'DATA_LOAD', data: agent.response[:data])
-                  class_name = agent.response[:data].keys.first
-                  key = agent.response[:data][class_name].keys.first
-                  logged_in_user = Isomorfeus.cached_data_class(class_name).new(key: key)
-                  cookie_accessor = agent.response[:session_cookie_accessor]
-                  begin
-                    target = if block_given?
-                               block.call(logged_in_user)
-                             else
-                               `window.location.pathname`
-                             end
-                    unless target.class == String && target.start_with?('/')
-                      Isomorfeus.raise_error(message: "A path must be returned as string starting with '/', returned was #{target}!")
-                    end
-                  rescue
-                    target = `window.location.pathname`
-                  end
-                  cookie_query = "#{Isomorfeus.cookie_eater_path}?#{cookie_accessor}=#{target}"
-                  `window.location = cookie_query` # doing page load and redirect
-                  nil
-                else
-                  Isomorfeus.raise_error(message: "Login failed with '#{agent.response[:error]}'!") # triggers .fail
-                end
-              end
-            end
-          end
-        end
-      end
-
-      def promise_logout(scheme: :isomorfeus)
-        send("promise_deauthentication_with_#{scheme}")
-      end
-
-      def promise_deauthentication_with_isomorfeus
-        cookie = `document.cookie`
-        p = Promise.new
-        begin
-          logout_query = Isomorfeus.api_logout_path
-          `window.location = logout_query`
-        rescue
-          p.reject
-        end
-      end
-    else
-      def self.included(base)
-        Isomorfeus.add_valid_user_class(base)
-
-        base.instance_exec do
-          def execute_login(&block)
-            @execute_login_block = block
-          end
-
-          def promise_login(user: nil, pass: nil, scheme: :isomorfeus, &block)
-            send("promise_authentication_with_#{scheme}", user: user, pass: pass, &block)
-          end
-
-          def promise_authentication_with_isomorfeus(user: nil, pass: nil, &block)
-            promise_or_user = @execute_login_block.call(user: user, pass: pass)
-            if promise_or_user.class == Promise
-              if block_given?
-                promise_or_user.then do |user|
-                  block.call(user)
-                  user
-                end
-              else
-                promise_or_user
-              end
-            else
-              block.call(user) if block_given?
-              Promise.new.resolve(promise_or_user)
-            end
-          end
-        end
-      end
-
-      def encrypt_password(password, password_confirmation)
-        raise "Password and confirmation don't match!" unless password == password_confirmation
-        BCrypt::Password.create(password).to_s
-      end
-
-      def passwords_match?(encrypted_password, given_password)
-        bcrypt_pass = BCrypt::Password.new(encrypted_password)
-        bcrypt_pass == given_password
-      end
-
-      def promise_logout(scheme: :isomorfeus)
-        send("promise_deauthentication_with_#{scheme}")
-      end
-
-      def promise_deauthentication_with_isomorfeus
-        Promise.new.resolve(true)
-      end
-    end
-  end
-end