isomorfeus-transport 1.0.0.zeta14 → 1.0.0.zeta15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2da7f01a24198876e721b9eee2365d39d71e849a8a9df0391f2bfde73d8891e7
-  data.tar.gz: 7b50a07f4141181f7626068d549e6b6e404c9f3ac1a135a1d5079ebe7cd40a74
+  metadata.gz: 1b194ed58cc86f8f5fa2b176f57bf9c2f61422fe4ed9ed408d6de080a2439008
+  data.tar.gz: 3a990c000db8b9dbb297d24140fd975386407809c0db025aa1536773f7302d43
 SHA512:
-  metadata.gz: e412f4955497cdca05527b08433f97911d487859bae283f40ad7505521d92777707c316d5d2d1ffc7fd6abd8d46362763eb99335543bc57b80a4b812ab2b99a9
-  data.tar.gz: 0577e8b840f07d4d2dcb627a713f1b02a8f02fcc3963e5e7642326347d51e21bfc79472a141faf88248dd87e1dc685fb5ffe68e840994829dbbc88a4d80fcafa
+  metadata.gz: 253fdb266e2cce4062a3dcb6081ff846455ffc960c2ca2c2cceaf61430ae97044444c942016ad63951dbd77fe72e8512535ba4e0245e2047f1b81b98c601ea49
+  data.tar.gz: fd5a2d29968070c2d98ffda434a54f0c4f03ca56289427de88e1d572ff72444060fd6ae43588c7d35960fbf6f1c9df308ccfeac391fcf4ba1b88ba2c894c778c

data/README.md

@@ -30,77 +30,7 @@ Client and Server:
 Server only:
 - Isomorfeus.middlewares - all the rack middlewares to load
 
-## Authentication
+## Usage
 
-For authentication in isomorfeus there is a class `Anonymous`, so whenever no user is logged in, the anonymous user is passed on to operations
-or data loads. In my opinion it is more true than no user (nil), because in fact there probably is a user, just the user is unknown.
-The Anonymous user has a default policy that allows everything, the user will respond to .authorized?(whatever) always with true by default.
-Of  course, the developer can add a Policy easily, to deny certain operations or data loads, or whatever or deny everything:
-```ruby
-class AnonymousPolicy < LucidPolicy::Base
- deny all
-end
-```
-For more information about policy see [the policy docs](https://github.com/isomorfeus/isomorfeus-project/blob/master/ruby/isomorfeus-policy/README.md).
-
-A class representing a user should be a LucidNode and include LucidAuthentication::Mixin:
-```ruby
-class User < LucidGenericDocument::Base
-  include LucidAuthentication::Mixin
-  authentication do |user:, pass:|
-    # should return either a User instance or a Promise which reselves to a User instance
-  end
-end
-```
-With that its possible to do on the client (or server):
-```ruby
-User.promise_login(user: user_identifier, pass: user_password_or_token).then do |user|
-   # do something with user
-end
-```
-or later on:
-```ruby
-user.promise_logout
-```
-The authentication in isomorfeus is prepared for external or alternate authentication schemes, example:
-```ruby
-User.promise_login(user: user_identifier, pass: token, :facebook).then do |user|
-   # do something with user
-end
-```
-will call:
-```ruby
-User.promise_authentication_with_facebook(user: user_identifier, pass: token)
-```
-which would have to be implemented.
-
-## LucidChannel
-
-Isomorfeus-transport provides the LucidChannel::Mixin and LucidChannel::Base class.
-These can be used for subscriptions and publishing messages.
-
-### Subscriptions
-```ruby
-class MyChannel < LucidChannel::Base
-end
-
-# subscribe to channel
-MyChannel.subscribe
-
-# unsubscribe
-MyChannel.unsubscribe
-```
-
-### Processing messages
-```ruby
-class MyChannel < LucidChannel::Base
-  on_message do |message|
-    puts "received: " + message
-  end
-end
-```
-
-### Sending messages
-```ruby
-MyChannel.send_message('uiuiui')
-```
+- [Authentication and Current User](https://github.com/isomorfeus/isomorfeus-project/blob/master/ruby/isomorfeus-policy/docs/authentication.md)
+- [Channels (PubSub)](https://github.com/isomorfeus/isomorfeus-project/blob/master/ruby/isomorfeus-policy/docs/channels.md)

data/lib/isomorfeus-transport.rb

@@ -23,6 +23,7 @@ else
   require 'websocket/driver'
   require 'active_support'
   require 'iodine'
+  require 'isomorfeus/transport/thread_session_store'
   require 'isomorfeus/config'
   require 'isomorfeus/promise'
   require 'isomorfeus/transport/version'

data/lib/isomorfeus/transport/config.rb

@@ -19,6 +19,7 @@ module Isomorfeus
   else
     class << self
       attr_accessor :api_websocket_path
+      attr_accessor :session_store
 
       def add_middleware(middleware)
         Isomorfeus.middlewares << middleware
@@ -130,6 +131,8 @@ module Isomorfeus
         Thread.current[:isomorfeus_pub_sub_client]
       end
     end
+
+    self.session_store = Isomorfeus::Transport::ThreadSessionStore.new # dont use this one, but we keep it here to have at least something
   end
 
   # defaults

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

@@ -5,10 +5,10 @@ module Isomorfeus
         TIMEOUT = 30
 
         on_request do |response_agent|
-          result = { error: 'Authentication failed' }
           # 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.agent_result = { error: 'Authentication failed' }
               tries = pub_sub_client.instance_variable_get(:@isomorfeus_authentication_tries)
               tries = 0 unless tries
               tries += 1
@@ -32,26 +32,23 @@ module Isomorfeus
                   end
                 end
                 if user
+                  session_cookie = "session=#{SecureRandom.uuid};max-age=2592000"
                   Isomorfeus.pub_sub_client.instance_variable_set(:@isomorfeus_user, user)
                   Isomorfeus.pub_sub_client.instance_variable_set(:@isomorfeus_authentication_tries, nil)
-                  # TODO store session in db and supply session cookie: session_cookie: uuid or so
-                  response_agent.agent_result = { success: 'ok', data: user.to_transport }
+                  Isomorfeus.pub_sub_client.instance_variable_set(:@isomorfeus_session_cookie, session_cookie)
+                  Isomorfeus.session_store.add(cookie: session_cookie, user: user)
+                  response_agent.agent_result = { success: 'ok', data: user.to_transport, session_cookie: session_cookie }
                 end
               end
             elsif login_or_logout == 'logout'
               begin
-                promise = Isomorfeus.current_user.promise_logout
-                # TODO remove session from db
-                # response_agent.agent_result = { success: 'ok', data: user.to_transport }
-                unless promise.realized?
-                  start = Time.now
-                  until promise.realized?
-                    break if (Time.now - start) > TIMEOUT
-                    sleep 0.01
-                  end
-                end
+                # 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

data/lib/isomorfeus/transport/middlewares.rb

@@ -2,7 +2,9 @@ module Isomorfeus
   module Transport
     module Middlewares
       def use_isomorfeus_middlewares
+        STDOUT.puts "Isomorfeus is using the following middlewares:"
         Isomorfeus.middlewares.each do |isomorfeus_middleware|
+          STDOUT.puts "#{isomorfeus_middleware}"
           use isomorfeus_middleware
         end
       end

data/lib/isomorfeus/transport/thread_session_store.rb

@@ -0,0 +1,20 @@
+module Isomorfeus
+  module Transport
+    class ThreadSessionStore
+
+      def add(cookie:, user:)
+        store[cookie] = user
+      end
+
+      def remove(cookie:)
+        store.delete(cookie)
+      end
+
+      private
+
+      def store
+        Thread.current[:isomorfeus_session_store] ||= {}
+      end
+    end
+  end
+end

data/lib/isomorfeus/transport/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Transport
-    VERSION = '1.0.0.zeta14'
+    VERSION = '1.0.0.zeta15'
   end
 end

data/lib/lucid_authentication/mixin.rb

@@ -1,10 +1,13 @@
 module LucidAuthentication
   module Mixin
+    def anonymous?
+      self.class == Anonymous
+    end
+
     if RUBY_ENGINE == 'opal'
       def self.included(base)
-
         base.instance_exec do
-          def authentication(&block)
+          def execute_login(&block)
           end
 
           def promise_login(user: nil, pass: nil, scheme: :isomorfeus)
@@ -61,8 +64,8 @@ module LucidAuthentication
         Isomorfeus.add_valid_user_class(base)
 
         base.instance_exec do
-          def authentication(&block)
-            @authentication_block = block
+          def execute_login(&block)
+            @execute_login_block = block
           end
 
           def promise_login(user: nil, pass: nil, scheme: :isomorfeus)
@@ -70,7 +73,7 @@ module LucidAuthentication
           end
 
           def promise_authentication_with_isomorfeus(user: nil, pass: nil)
-            promise_or_user = @authentication_block.call(user: user, pass: pass)
+            promise_or_user = @execute_login_block.call(user: user, pass: pass)
             if promise_or_user.class == Promise
               promise_or_user
             else
@@ -80,6 +83,16 @@ module LucidAuthentication
         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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-transport
 version: !ruby/object:Gem::Version
-  version: 1.0.0.zeta14
+  version: 1.0.0.zeta15
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-28 00:00:00.000000000 Z
+date: 2020-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: bcrypt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.13
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.13
 - !ruby/object:Gem::Dependency
   name: iodine
   requirement: !ruby/object:Gem::Requirement
@@ -86,28 +100,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 16.12.14
+        version: 16.12.17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 16.12.14
+        version: 16.12.17
 - !ruby/object:Gem::Dependency
   name: isomorfeus-policy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.zeta14
+        version: 1.0.0.zeta15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.zeta14
+        version: 1.0.0.zeta15
 - !ruby/object:Gem::Dependency
   name: websocket-driver
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +142,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.zeta14
+        version: 1.0.0.zeta15
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.zeta14
+        version: 1.0.0.zeta15
 - !ruby/object:Gem::Dependency
   name: opal-webpack-loader
   requirement: !ruby/object:Gem::Requirement
@@ -197,6 +211,7 @@ files:
 - lib/isomorfeus/transport/response_agent.rb
 - lib/isomorfeus/transport/server_processor.rb
 - lib/isomorfeus/transport/server_socket_processor.rb
+- lib/isomorfeus/transport/thread_session_store.rb
 - lib/isomorfeus/transport/version.rb
 - lib/isomorfeus/transport/websocket.rb
 - lib/lucid_authentication/mixin.rb