io_request 2.3.1 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e57d41dbda1d6665dd595e36da99ce52b60fd2d979957583570224e752b6e8ae
-  data.tar.gz: eb50b39358a127a3b6b231d37606a4835b92030b682987bdd6f5a973d3c5b8bd
+  metadata.gz: a560819ec6ad8dc50801411fcea4ca4263b29e88067187cc2035e3cbad133394
+  data.tar.gz: 1d82e187a4044f25e3ee061a7f382423e1013644dff7663467e694e4139fc8f2
 SHA512:
-  metadata.gz: d9680f420318ec5d177ada3d79cccd5bab722e1993f541e802d877603bfa9011fb22cd0df5b9f01602a7a4ba54131203d1f2a7645950cdc4ef0adc151fb85c15
-  data.tar.gz: 92ea531ada90eda834b847d86009c4ede9594185540acbe7f76a65d0f579b62ff739b9a5ef01acc3d3b08657b97a7ab3a8e36c0dacc90024bd60c53c53b85866
+  metadata.gz: ff19727550d073a8cccc146a2c1de65a6f67458a276b003e122e471ef73d584a52741bdaf07da51e0ed2513f33d0cf8a139eb4e5f0c342e2f6a77cc929f2982a
+  data.tar.gz: 0eaf1f54fcac605a4dc62a8ff7b7bcc41a7d68ee3e75c2020971e9bfb432cc08f22799506ae6e80409f4892b2e5e12cee2e5da28f4657f13a059dfad900402e2

data/lib/io_request/client.rb

@@ -45,15 +45,17 @@ module IORequest
     # @param r [IO] object to read from.
     # @param w [IO] object to write to.
     # @param rw [IO] read-write object (replaces `r` and `w` arguments).
+    # @return [Object] data from {Authorizer}
     def open(read: nil, write: nil, read_write: nil)
       @io_r = read_write || read
       @io_w = read_write || write
 
       IORequest.logger.debug(prog_name) { 'Starting connection' }
 
-      authorization
+      auth_data = authorization
       @open = true
       @data_transition_thread = in_thread(name: 'connection') { data_transition_loop }
+      auth_data
     end
 
     def open?
@@ -124,15 +126,19 @@ module IORequest
     end
 
     def authorization
-      auth_successful = @mutex_r.synchronize do
+      auth_successful = false
+      data = nil
+      @mutex_r.synchronize do
         @mutex_w.synchronize do
           IORequest.logger.debug(prog_name) { 'Authorizing new client' }
-          @authorizer.authorize(@io_r, @io_w)
+          auth_successful = @authorizer.authorize(@io_r, @io_w)
+          data = @authorizer.data
         end
       end
       raise AuthorizationFailureError unless auth_successful
 
-      IORequest.logger.debug(prog_name) { "New client authorized with data #{@authorizer.data}" }
+      IORequest.logger.debug(prog_name) { "New client authorized with data #{data}" }
+      data
     end
 
     def data_transition_loop

data/lib/io_request/connection/ssl_sockets.rb

@@ -32,11 +32,20 @@ module IORequest
       end
 
       # @return [Array<IORequest::Client>]
-      attr_reader :clients
+      def clients
+        @clients_data.keys
+      end
+
+      # @param client [IORequest::Client]
+      # @return [Hash, nil] you are free to store anything you want in hash.
+      #   Only field you will find in it is `auth` with authenticator data.
+      def data(client)
+        @clients_data[client]
+      end
 
       # Start server.
       def start
-        @clients = []
+        @clients_data = {}
 
         @server = TCPServer.new(@port)
 
@@ -45,8 +54,8 @@ module IORequest
 
       # Fully stop server.
       def stop
-        @clients.each(&:close)
-        @clients = []
+        clients.each(&:close)
+        @clients_data.clear
 
         @server.close
         @server = nil
@@ -68,7 +77,7 @@ module IORequest
         while (socket = @server.accept)
           handle_socket(socket)
         end
-      rescue
+      rescue StandardError
         stop
       end
 
@@ -76,21 +85,22 @@ module IORequest
         ssl_socket = OpenSSL::SSL::SSLSocket.new(socket, @ctx)
         ssl_socket.accept
 
-        client = IORequest::Client.new authorizer: @authorizer
-        begin
-          client.open read_write: ssl_socket
-          client.on_request { |data| @requests_handler.call(data, client) }
-          @clients << client
-          client.on_close do
-            @clients.select!(&:open?)
-          end
-        rescue StandardError => e
-          IORequest.logger.debug "Failed to open client: #{e}"
-          ssl_socket.close
-        end
+        handle_client(ssl_socket, IORequest::Client.new(authorizer: @authorizer))
       rescue StandardError => e
         IORequest.logger.warn "Unknown error while handling sockets: #{e}"
       end
+
+      def handle_client(ssl_socket, client)
+        auth_data = client.open read_write: ssl_socket
+        client.on_request { |data| @requests_handler.call(data, client) }
+        @clients_data[client] = { auth: auth_data }
+        client.on_close do
+          @clients_data.select! { |c, _d| c.open? }
+        end
+      rescue StandardError => e
+        IORequest.logger.debug "Failed to open client: #{e}"
+        ssl_socket.close
+      end
     end
 
     # SSL socket client.

data/lib/io_request/version.rb

@@ -2,5 +2,5 @@
 
 module IORequest
   # Gem version.
-  VERSION = '2.3.1'
+  VERSION = '2.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: io_request
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.4.0
 platform: ruby
 authors:
 - Fizvlad
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-19 00:00:00.000000000 Z
+date: 2020-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler