anycable 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 982192dbe84e0576b13033aadf3ead0238e28bf4c30b6dec2d08228cd2093f3c
-  data.tar.gz: 9af924544238340e0c5b171a738b9bec99ebe25c13cc398d279318f6c9cbef12
+  metadata.gz: 6b624b0695335efdb861cfdb90b16caa0b2ddd67698a0ac813a81e9ae98a52eb
+  data.tar.gz: b70e2b622120da3ae2df10049e6145d958d84d78ab8a080943a8e50aab4cf983
 SHA512:
-  metadata.gz: ba03a684ddce90df929c469deb4b219a494578ab9c203321e9c9f900810f98132eb74d8fc16aa1b79c6042c28bd5b3da2ac83d39bd4e25944127191dc4b2f8b7
-  data.tar.gz: 77a874ad448dff0cca9d8ada4259c8c48ab4fdb87d1df1f3c6bee1dab50f23335f1fc390ee60fb96483a89cc0071700945bdffa73f908745987de2c2e7877c91
+  metadata.gz: 97619fd72a53a84608f47b9a99504b080731a0b8915667007d9cf3240feda2a880b0cdcb67acddefec14c34fbbd169c812a4dc310ef4d0b3757c818471ae019c
+  data.tar.gz: efb598ebbd08e0de7574f0de3690b0c7caf11812f3b2afcde26aee5c8bff8a4607cd3a9b791cc978df458d00c37155d23d520118ffc38af98f1e7c9e66760d88

data/CHANGELOG.md

@@ -2,6 +2,22 @@
 
 ## master
 
+## 0.6.4 (2020-01-24)
+
+- Fix Ruby 2.7 warnings. ([@palkan])
+
+– Add `REMOTE_ADDR` socket env variable using a synthetic header passed from a websocket
+server. ([@sponomarev][])
+
+Recreating a request object in your custom connection factory using `Rack::Request` or
+`ActionDispatch::Request` (already implemented in [anycable-rails](https://github.com/anycable/anycable-rails))
+gives you an access to `request.ip` with the properly set IP address.
+
+- Align socket env to be more compatibile with Rack Spec ([@sponomarev][])
+
+Provide as much env details as possible to be able to reconstruct the full
+request object in a custom connection factory.
+
 ## 0.6.3 (2019-03-26)
 
 - Relax `redis` gem version requirement. ([@palkan][])
@@ -244,3 +260,4 @@ Implement `Disconnect` handler, which invokes `Connection#disconnect` (along wit
 [@sadovnik]: https://github.com/sadovnik
 [@accessd]: https://github.com/accessd
 [@DarthSim]: https://github.com/DarthSim
+[@sponomarev]: https://github.com/sponomarev

data/README.md

@@ -9,7 +9,7 @@
 
 AnyCable allows you to use any WebSocket server (written in any language) as a replacement for your Ruby server (such as Faye, ActionCable, etc).
 
-AnyCable uses ActionCable protocol, so you can use ActionCable [JavaScript client](https://www.npmjs.com/package/actioncable) without any monkey-patching.
+AnyCable uses the same protocol as ActionCable, so you can use its [JavaScript client](https://www.npmjs.com/package/actioncable) without any monkey-patching.
 
 <a href="https://evilmartians.com/">
 <img src="https://evilmartians.com/badges/sponsored-by-evil-martians.svg" alt="Sponsored by Evil Martians" width="236" height="54"></a>
@@ -17,7 +17,7 @@ AnyCable uses ActionCable protocol, so you can use ActionCable [JavaScript clien
 ## Requirements
 
 - Ruby >= 2.4
-- Redis (for brodcasting, [discuss other options](https://github.com/anycable/anycable/issues/2) with us!)
+- Redis (for broadcasting, [discuss other options](https://github.com/anycable/anycable/issues/2) with us!)
 
 ## Usage
 
@@ -71,3 +71,8 @@ Please, provide reproduction script (using [this template](https://github.com/an
 
 ## License
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+
+## Security Contact
+
+To report a security vulnerability, please use the [Tidelift security contact](https://tidelift.com/security). Tidelift will coordinate the fix and disclosure.
+

data/lib/anycable/broadcast_adapters.rb

@@ -26,7 +26,7 @@ module AnyCable
         end
       end
 
-      BroadcastAdapters.const_get(adapter_class_name, false).new(options || {})
+      BroadcastAdapters.const_get(adapter_class_name, false).new(**(options || {}))
     end
     # rubocop: enable Metrics/AbcSize, Metrics/MethodLength
   end

data/lib/anycable/health_server.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "webrick"
-
 module AnyCable
   # Server for HTTP healthchecks.
   #
@@ -53,6 +51,8 @@ module AnyCable
     attr_reader :logger
 
     def build_server
+      require "webrick"
+
       WEBrick::HTTPServer.new(
         Port: port,
         Logger: logger,

data/lib/anycable/rpc_handler.rb

@@ -66,7 +66,9 @@ module AnyCable
     def command(message, _unused_call)
       logger.debug("RPC Command: #{message.inspect}")
 
-      socket = build_socket
+      # We don't have path/headers information here,
+      # but we still want `connection.env` to work
+      socket = build_socket(env: base_rack_env)
 
       connection = factory.call(
         socket,
@@ -97,24 +99,42 @@ module AnyCable
 
     private
 
-    # Build env from path
+    # Build Rack env from request
     def rack_env(request)
       uri = URI.parse(request.path)
-      {
-        "QUERY_STRING" => uri.query,
-        "SCRIPT_NAME" => "",
+
+      env = base_rack_env
+      env.merge!(
         "PATH_INFO" => uri.path,
+        "QUERY_STRING" => uri.query,
+        "SERVER_NAME" => uri.host,
         "SERVER_PORT" => uri.port.to_s,
         "HTTP_HOST" => uri.host,
-        # Hack to avoid Missing rack.input error
-        "rack.request.form_input" => "",
-        "rack.input" => "",
-        "rack.request.form_hash" => {}
-      }.merge(build_headers(request.headers))
+        "REMOTE_ADDR" => request.headers.delete("REMOTE_ADDR"),
+        "rack.url_scheme" => uri.scheme
+      )
+
+      env.merge!(build_headers(request.headers))
+    end
+
+    def base_rack_env
+      # Minimum required variables according to Rack Spec
+      # (not all of them though, just those enough for Action Cable to work)
+      # See https://rubydoc.info/github/rack/rack/master/file/SPEC
+      {
+        "REQUEST_METHOD" => "GET",
+        "SCRIPT_NAME" => "",
+        "PATH_INFO" => "/",
+        "QUERY_STRING" => "",
+        "SERVER_NAME" => "",
+        "SERVER_PORT" => "80",
+        "rack.url_scheme" => "http",
+        "rack.input" => ""
+      }
     end
 
     def build_socket(**options)
-      AnyCable::Socket.new(options)
+      AnyCable::Socket.new(**options)
     end
 
     def build_headers(headers)

data/lib/anycable/server.rb

@@ -117,7 +117,7 @@ module AnyCable
     attr_reader :logger, :start_thread
 
     def build_server(options)
-      GRPC::RpcServer.new(options).tap do |server|
+      GRPC::RpcServer.new(**options).tap do |server|
         server.add_http2_port(host, :this_port_is_insecure)
         server.handle(AnyCable::RPCHandler)
         server.handle(build_health_checker)

data/lib/anycable/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AnyCable
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: anycable
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - palkan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-26 00:00:00.000000000 Z
+date: 2020-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: anyway_config
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.65.0
+        version: 0.68.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.65.0
+        version: 0.68.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -184,7 +184,12 @@ files:
 homepage: http://github.com/anycable/anycable
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: http://github.com/anycable/anycable/issues
+  changelog_uri: https://github.com/anycable/anycable/blob/master/CHANGELOG.md
+  documentation_uri: https://docs.anycable.io/
+  homepage_uri: https://anycable.io/
+  source_code_uri: http://github.com/anycable/anycable
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -200,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: AnyCable is a polyglot replacement for ActionCable-compatible servers