grenache-ruby-base 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e1328d30d0bcdaf82f9284189fad8d3fa421677
-  data.tar.gz: d0ca3f6002e055f723588ee1105d777a10e64b81
+  metadata.gz: d1c96976e6746b09a052fdf4016a9371a9616aa3
+  data.tar.gz: 5c5e291069a1d7556f9025ea3fe952f9ee905bec
 SHA512:
-  metadata.gz: 4a52c4c939d04a236f1180748b60c8cebf2c33754c36ebc9a149c0a16521ffbe6f8289e1434b46b67727ecab577f0e1f3ffd6911a9b89187afc56e8f9f8e719a
-  data.tar.gz: 002d0f740fd56696a5e25d14641c0f27550f897ddbd69b82bbae54ed012f1df0b5ff1ad9e69de17c41c3e9d25a13f369cbf9454f35643632db0b29e93af7226c
+  metadata.gz: f9570db0b3a42fd6704e6b317d5c596ca67700fb8a44d0489f1b098e0d2c79acea73b6d9674b084d0cc4584f8d9ad3df940a7e687099ee2ffd4bc5f7f7660f55
+  data.tar.gz: f9f50b6b02fcc263a15624469eb14768040cb426db551cbb8681cfcd9c548f71873be909ac4804b0899a7bcd910000290f737ee40f6b40213c35cf652a81c403

data/lib/grenache/configurable.rb

@@ -2,14 +2,50 @@ module Grenache
 
   # Encapsulate Configuration parameters
   class Configuration
-    attr_accessor :grape_address, :auto_announce, :timeout, :auto_announce_interval
+    # grape configuration
+    attr_accessor :grape_address, :timeout
+
+    # service configuration parameters
+    attr_accessor :service_timeout, :auto_announce_interval, :auto_announce, :service_host
+
+    # service SSL specific configuration
+    # Cert is supposed to be PKCS12
+    attr_accessor :key, :cert_pem, :ca, :reject_unauthorized, :verify_mode
 
     # Initialize default values
     def initialize(params = {})
-      self.grape_address = params[:grape_address] ? params[:grape_address] : "ws://127.0.0.1:30001"
-      self.auto_announce = params[:auto_announce].nil? ? true : params[:auto_announce]
-      self.auto_announce_interval = params[:auto_announce_interval] ? params[:auto_announce_interval] : 5
-      self.timeout = params[:timeout] ? params[:timeout] : 5
+      set_val :grape_address, params, "ws://127.0.0.1:30001"
+      set_val :timeout, params, 5
+
+      set_val :auto_announce_interval, params, 5
+      set_bool :auto_announce, params, true
+      set_val :service_timeout, params, 5
+      set_val :service_host, params, "0.0.0.0"
+
+      set_val :key, params, nil
+      set_val :cert_pem, params, nil
+      set_val :ca, params, nil
+      set_val :reject_unauthorized, params, nil
+      set_val :verify_mode, params, Grenache::SSL_VERIFY_PEER
+    end
+
+    private
+    def set_bool(name, params, default)
+      method = "#{name}=".to_sym
+      if params[name].nil?
+        send(method, default)
+      else
+        send(method, params[name])
+      end
+    end
+
+    def set_val(name, params, default)
+      method = "#{name}=".to_sym
+      if params[name]
+        send(method, params[name])
+      else
+        send(method, default)
+      end
     end
   end
 
@@ -20,7 +56,7 @@ module Grenache
     end
 
     def config
-      @configuration || self.class.config
+      self.class.config
     end
 
     module ClassMethods

data/lib/grenache/ssl_verify.rb

@@ -0,0 +1,5 @@
+module Grenache
+  SSL_VERIFY_NONE = 0
+  SSL_VERIFY_PEER = 1
+  SSL_VERIFY_FAIL_IF_NO_PEER_CERT = 2
+end

data/lib/grenache/version.rb

@@ -1,3 +1,3 @@
 module Grenache
-  VERSION = '0.2.1'
+  VERSION = '0.2.3'
 end

data/lib/grenache-ruby-base.rb

@@ -4,6 +4,7 @@ require 'faye/websocket'
 require 'httparty'
 require 'securerandom'
 
+require 'grenache/ssl_verify'
 require 'grenache/configurable'
 require 'grenache/cache'
 require 'grenache/base'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grenache-ruby-base
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Bitfinex
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-19 00:00:00.000000000 Z
+date: 2017-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -100,6 +100,7 @@ files:
 - lib/grenache/grape_message.rb
 - lib/grenache/link.rb
 - lib/grenache/service_message.rb
+- lib/grenache/ssl_verify.rb
 - lib/grenache/version.rb
 homepage: https://github.com/bitfinexcom/grenache-ruby-base
 licenses:
@@ -121,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Grenache Base Client implementation.