grenache-ruby-http 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29cd62931c38dd06f17544c50e0eabd147db5402
-  data.tar.gz: 8e81cd549494766f2590aa9142ad4092b249bfb0
+  metadata.gz: 15a1cf8dee8aa1f8916d109f769bd1e41af5995e
+  data.tar.gz: b0d81fe6ed1d46a42ae162aa63dfa48b57e117fc
 SHA512:
-  metadata.gz: 4a4a2f80c55ceb0381215d83063f5c743be25bd11c3596cd29a4e13c6f9b7c058fb7da29d4d62c8533f91036b9959f3b7eeb2840b27e44d5770af06757f64a82
-  data.tar.gz: 1787f9ef3dfdcdf81d68272503defee582599eca47922b7e5401059750ffeff0b53703d39d15da5db8094019b99262860c942fe8625dfde8f0bf74ca94fbea38
+  metadata.gz: baf12653020538a93f54d3a905b537f1ad9696df04f260846d8b6feac55b71aba0feaabd16d1099801bad7a2bb6f31c0ae6f2990812905c833fe057fecac0ca1
+  data.tar.gz: ba8c325edac6783ca4cace5b74fc4b6460eb468f4a7391abd5a69cb7c0cff0a5362f14e7734d365bb5d319f2ff53774355cc8ab174888fb2896956fbd6ba16cc

data/examples/ssl/server-chain.pem

@@ -0,0 +1,64 @@
+-----BEGIN CERTIFICATE-----
+MIIFjDCCA3SgAwIBAgIJAMAvyAh8DsiYMA0GCSqGSIb3DQEBBQUAMIGBMQswCQYD
+VQQGEwJVUzELMAkGA1UECAwCTUExDzANBgNVBAcMBkJvc3RvbjETMBEGA1UECgwK
+RXhhbXBsZSBDbzEQMA4GA1UECwwHdGVjaG9wczELMAkGA1UEAwwCY2ExIDAeBgkq
+hkiG9w0BCQEWEWNlcnRzQGV4YW1wbGUuY29tMB4XDTE3MDUyMjEzNDQ1OFoXDTIw
+MDIxNTEzNDQ1OFowgYgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNQTEPMA0GA1UE
+BwwGQm9zdG9uMRMwEQYDVQQKDApFeGFtcGxlIENvMRAwDgYDVQQLDAd0ZWNob3Bz
+MRIwEAYDVQQDDAlsb2NhbGhvc3QxIDAeBgkqhkiG9w0BCQEWEWNlcnRzQGV4YW1w
+bGUuY29tMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAwDkNDEXb7Afb
+nj661GQSGtGRi8WsXzFvxQ1zAJZ2LDARUGf8zW8Njo4kJ1njHIebRF67LnLI1K+F
+B6a6gpcw/Yc13NnKf8rNydYsyq0sAFhjBJc4lA5ZrcSsgN0J+UlOpwY7vbGKASiY
+cIQ0MuBVxfzYfi/KgCc78U3ZztGpbBCo/1pbkIjaGxCReFT7LGknaPNRo4xIEDZ1
++8BfSYnbd1c2TYyLa3KlS2GU/UyDNEpEGwFzaEbJRMzc70HxHhHh3MGpIvi/IqbJ
+pzbTgH9/PBYA8DY+NT7dtwR/234Sv2nI9nmOQiud2I1XuUoR/pIv9EqtOj/DCqbI
+eKrFSiyvj0ZHzh6KpvbDAX+MPewrwx5QzSglzEyc3WPQFEZ8+ImEaYQWJmaO+yt0
+HXFcqje+Alu9DOFRvh0tuvkzoVCP+eBwp1taNLAoGg2xXkcog6ZvA6622EKX5YzL
+hV/om0IThUu1H0G2ebCYcU5roo/wzTjnnR1VZURjjdEnwaG+MPZnwdQg13/NM83K
+pDgcEHMrnCwSTdJYyScyu7eSjyXf/xnDQ4lmCk2YUe/py1EM7t0lvp+c1eBkz6Ju
+8eMAAXIygIYHpdtZAzzkQ0il6e6qlAsqYakXRF7vpd6kOQmNdV+b0oFBaGgBYs3o
+qdrYY9WGYc5aCmpyFdCuuIwnGZ4zBBcCAwEAATANBgkqhkiG9w0BAQUFAAOCAgEA
+DD99IiKknHmMGbqE+yntFOLCV8llalQfrZCFncW0/eVIxg4L+TMWuJTH6QrvgLVX
+kyX0y7sXicj0aQyHjVuBvr4CVctk1IO/oE1BzOd0NzqBmLkku6paUnIo3pQL6Uu4
+gOZUNG5pIa74DUdlTuXifchVco6GK7X211B6CrAjS4WQ+bqwdk3OwU0OoRWioXTK
+0v/uy4D9AxZyeaPLnv75Mse+lc0jWHacDnuNbadivdWGR2PUHO2ezW7aooVX1uV9
+2UxNPJ9yKIOr+mvyrDvdkKWXZU31ZAkna6K7mA1QGoVjS5uXvsgAjZzsqiRzv7jA
+San0l+YDWUdWrucF5B5/KVamQeNVn0D5T/R/IZg8Ens4QGD+JkRiQ7JWbJTg6mr7
+et2iES3UC0HHwt5FkgPRnT0Ru7iMafs1oHBHWD9deHyNq468et95lK9ayu1B1k8C
+sAT6r++Mskt4lxJewFrPPKT5z8lE8hXZx54hDN7yXUeZq2F2cQWeJRfo/1Qg9hsM
+iRGet7Ea5g716YKQj2CfDHaljMOXRxTPaFZGrWUoE2vd5/x09idarlVXQgoZojlc
+V1cvTzsUy9hFqKbhYqZPjs7IJQNOF2G2HhR1hA3yw91nfM7pFvkEBPWoJRqmX2JQ
+jyeL9oEmCzCQ0ZengbE+bBXNq06p6x2dOj4J+OHVzvU=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFgDCCA2gCCQDvmZA10HvRHTANBgkqhkiG9w0BAQUFADCBgTELMAkGA1UEBhMC
+VVMxCzAJBgNVBAgMAk1BMQ8wDQYDVQQHDAZCb3N0b24xEzARBgNVBAoMCkV4YW1w
+bGUgQ28xEDAOBgNVBAsMB3RlY2hvcHMxCzAJBgNVBAMMAmNhMSAwHgYJKoZIhvcN
+AQkBFhFjZXJ0c0BleGFtcGxlLmNvbTAeFw0xNzA1MjIxMzQ0NDNaFw00NDEwMDYx
+MzQ0NDNaMIGBMQswCQYDVQQGEwJVUzELMAkGA1UECAwCTUExDzANBgNVBAcMBkJv
+c3RvbjETMBEGA1UECgwKRXhhbXBsZSBDbzEQMA4GA1UECwwHdGVjaG9wczELMAkG
+A1UEAwwCY2ExIDAeBgkqhkiG9w0BCQEWEWNlcnRzQGV4YW1wbGUuY29tMIICIjAN
+BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA0SrOAQlmrQTqnXqSiKpvhb/nd79r
+59V8TY81yPiOaVXeIaCrIiDA66JzadzHHHHMt8sEsTI92BULNvQYsauRm8NmBPWJ
+YKYpUj0FguG7NzDLruCsBUq1faZyLLOA2Dr33gTzJFaVtvD0Z9ig2UjTSbqEnCcY
+fF6WkCcYWBE3xkyRZkuVZAaCu3PTKVvAkwxHkg4wS8feW/Z/VGLTmcd/lWvVgC1V
+Kl7wwubE/8MXwjJlQBzkU5WotFHgXJMnepQTuqu5ZlDpOZehLPQ16LUjUIu0xnIt
+8k+YJ3JXdvP5+ifx+0YK9NpoU717spKgsME4z1Q6foDiaGgwWJ5bZYXi2OVD64yj
+FqKN4gdpe037OwgTxCJ2FS23Ijndzi/K+AULYXbjXUo/D+CXuJ/MfOXo8DHfI1ld
+ZgiHw1co2f1KQmL+AJ/YAEoC3228JG31mvX2sXL2p65QU9DmTaOrAYCX/F5T1frs
+jsO560Zpvs6C7Di8eQjrx3UhMz8zYSLT35/0HPPoLA9dkJOEDpg3NtLMuN1MigNZ
+VxRyadXrka4q7s/mTS1+0NbJHv4JYwzYKa1pdFeX102I9GVS9VZXpmRqriki1Sh1
+rb7YOuK+I92HIzIVpSeI/OB7xguH8rh+/vibB72SY18FJWyfGcr8ewwkPSVocZeu
+9rCXIDLUY0Sojq8CAwEAATANBgkqhkiG9w0BAQUFAAOCAgEAbIPMMkzHlybXIr8z
+4Dp/3czyPWLwjFfgeL4wM5Hm/JMxaFnsWgmkUdrvjlYofzaF+2U29FsDgcrkcCzD
+gTCOOHG0Pw1i8R57Dt68ycP4/e0iPpMmuTpNSqB9DilGscKARhE85o0FivAUzvUY
+RngIOtbf02OoaRbkAsmKdC4+PBNJbiS3U5V55r2HCv0zqXMFj4dXqfyWKkcZt3JR
+8SkzUIhIVnwhTf8ZttXcsWmPMy3nqckcy6k3zLr7Gf63JJZAYecWwhydAtv4wRrm
+f3FwIvRxPLKTc/2YXF77I9YvHgnLOvE2qlLNnajQgOcIYGvxizDVCqnMS+8oBHWb
+uL6mZP4hOCL6ifynkAHltg59heM3WJ2MEwLjiSvMYY4otT4X9KxsRdsg0Gx96bVe
+P4RBlW3ebxcOnFuoMC3WT22/1ETqpQbrWOD5mJkFa6Q8aE6yWLLcdJznxF2M0Mf8
+PTh62cFJMC4E0gN9KRU+E/qBJsqTamHHAHjcaUYDBXsvtFDOlo1dbAzJylpwRUEg
+F115KpRH6DLLexS5YB9bASIsXBK+Afwm0FOjqGiEd527qAk5UiamyomKXxQ+DIbc
+6QdO7XGpM3molI7Zzf79O4QdlRNzNgqPeCRUJWe2L6G7KECNvNjWepN3+0xAq9BO
+t53fDsW6Y1yw2xErpMGUHBQ05y4=
+-----END CERTIFICATE-----

data/examples/worker_ssl.rb

@@ -3,9 +3,7 @@ require_relative '../lib/grenache-ruby-http.rb'
 Grenache::Http.configure do |conf|
    conf.grape_address = "http://127.0.0.1:40002/"
    conf.key = File.expand_path('.') + "/ssl/server-key.pem"
-   conf.cert_pem = File.expand_path('.') + "/ssl/server-crt.pem"
-   conf.ca = File.expand_path('.') + "/ssl/ca-crt.pem"
-   conf.verify_mode = Grenache::SSL_VERIFY_PEER
+   conf.cert_pem = File.expand_path('.') + "/ssl/server-chain.pem"
    conf.service_host = "localhost"
 end
 

data/grenache-ruby-http.gemspec

@@ -22,6 +22,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "httparty", "~> 0.14.0"
   spec.add_runtime_dependency "oj", "~> 2.18"
   spec.add_runtime_dependency "thin", "~> 1.7"
-  spec.add_runtime_dependency "puma", "~> 3.9.1"
 
 end

data/lib/grenache/http/version.rb

@@ -1,5 +1,5 @@
 module Grenache
   module HTTP
-    VERSION = "0.2.3"
+    VERSION = "0.2.4"
   end
 end

data/lib/grenache/http.rb

@@ -1,7 +1,4 @@
-require "puma/events"
-
 module Grenache
-
   class Http < Grenache::Base
 
     def listen(key, port,  opts={}, &block)
@@ -12,36 +9,29 @@ module Grenache
       end
     end
 
-   def start_http_service(port, &block)
-      app = -> (env) {
-        req = ServiceMessage.parse(env['rack.input'].read)
-        fingerprint = extract_fingerprint(env['puma.peercert'])
-        e, payload = block.call(req, fingerprint)
-        err = e.kind_of?(Exception) ? e.message : e
-        [200,[], [ServiceMessage.new(payload, err, req.rid).to_json]]
+    def start_http_service(port, &block)
+      EM.defer {
+        app = -> (env) {
+          req = ServiceMessage.parse(env['rack.input'].read)
+          fingerprint = extract_fingerprint(env['rack.peer_cert'])
+          e, payload = block.call(req, fingerprint)
+          err = e.kind_of?(Exception) ? e.message : e
+          [200,nil, ServiceMessage.new(payload, err, req.rid).to_json]
+        }
+        server = Thin::Server.new config.service_host, port, {signals: false}, app
+        if tls?
+          server.ssl = true
+          server.ssl_options = {
+            private_key_file: config.key,
+            cert_chain_file: config.cert_pem,
+            verify_peer: true
+          }
+        end
+        server.start
       }
-
-      event = Puma::Events.new $stdout, $stderr
-      server = Puma::Server.new app, event
-      host = config.service_host
-
-      if tls?
-        ctx = Puma::MiniSSL::Context.new
-        ctx.key = config.key
-        ctx.cert = config.cert_pem
-        ctx.ca = config.ca
-        ctx.verify_mode = config.verify_mode
-
-        server.add_ssl_listener host, port, ctx
-      else
-        server.add_tcp_listener host, port
-      end
-
-      puts "starting server on port #{port}"
-      server.run
     end
 
-    def request(key, payload, params = {})
+    def request(key, payload, params={})
       services = lookup(key)
       if services.size > 0
         json = ServiceMessage.new(payload,key).to_json
@@ -58,14 +48,18 @@ module Grenache
 
     private
 
+    def tls?
+      !! config.cert_pem
+    end
+
     def extract_fingerprint cert
       return "" unless cert
       cert = OpenSSL::X509::Certificate.new cert
       OpenSSL::Digest::SHA1.new(cert.to_der).to_s
     end
 
-    def tls?
-      !! config.cert_pem
+    def http_client
+      @http_client ||= HttpClient.new(config)
     end
 
     def get_random_service services
@@ -78,9 +72,5 @@ module Grenache
       end
       service
     end
-
-    def http_client
-      @http_client ||= HttpClient.new(config)
-    end
   end
 end

data/lib/grenache-ruby-http.rb

@@ -2,7 +2,7 @@ require 'oj'
 require 'faye/websocket'
 require 'httparty'
 require 'grenache-ruby-base'
-require 'puma'
+require 'thin'
 
 require 'grenache/http'
 require 'grenache/http/version'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grenache-ruby-http
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Bitfinex <info@bitfinex.com>
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-08 00:00:00.000000000 Z
+date: 2017-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -94,20 +94,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
-- !ruby/object:Gem::Dependency
-  name: puma
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.9.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.9.1
 description: 
 email:
 - info@bitfinex.com
@@ -133,6 +119,7 @@ files:
 - examples/ssl/client2-csr.pem
 - examples/ssl/client2-key.pem
 - examples/ssl/client2.cnf
+- examples/ssl/server-chain.pem
 - examples/ssl/server-crt.pem
 - examples/ssl/server-csr.pem
 - examples/ssl/server-key.pem