simbiotes 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f56f30c2db7193cbb471c192c8c70a128e5a64e
-  data.tar.gz: 306aec5651911a1b2a3ec9570a389d0079aa911d
+  metadata.gz: ea86cc934275ad9bee68dff9df9394f5a3c206b8
+  data.tar.gz: 7a70964b49e63fe9c4f4d828967c36b0fa223719
 SHA512:
-  metadata.gz: 8e2a92d1d3b173de9f26d09262b1d07075d11533435fe3cbde07c99f210e787f28d0a1f547490633ffa1f986231854960cd3a5eb788bc2a215feb46eb3b8b213
-  data.tar.gz: 93422e1c25470b966ddf12c96a944fedf62e0b2a9ab4ce15ba0f29f0ce8bfcbfff12de56e1edb0b57cefff68831ee6e0fb0a4db93db3cd3e428f5c66f9427d65
+  metadata.gz: 961f8ba083b6d2fa0b78051ccb2c71c96dccf26b51c462bfd6ad2087d4603acd6b03adc883c6a875689ddf13b1b0d85f484ac76f82a6e5683948f30601db03d2
+  data.tar.gz: aa0c4a2f70947fd66b06a37e071a7084c508af9f9bdc04e163595a55904a768af4cd3fa6c96b8dad57b3fb0d41197588f171c9325c5a6734c7c7f05286ab6e84

data/lib/generators/simbiotes/initializer/templates/simbiotes.rb.erb

@@ -4,5 +4,6 @@ Simbiotes.configure do |config|
   config.local_port = 8001
   config.server_port = 8000
   config.tls = true
+  config.verify_peer = true
   config.local_logging = true
 end

data/lib/simbiotes/configuration.rb

@@ -1,7 +1,7 @@
 module Simbiotes
   class Configuration
   
-    attr_accessor :public_key, :private_key, :local_logging, :targets, :local_port, :server, :server_port, :portal, :push, :tls
+    attr_accessor :public_key, :private_key, :local_logging, :targets, :local_port, :server, :server_port, :portal, :push, :tls, :verify_peer
   
     def initialize
       @public_key = nil
@@ -14,6 +14,7 @@ module Simbiotes
       @portal = "http://www.simbiotes.com/"
       @push = false
       @tls = true
+      @verify_peer = true
     end
   
   end

data/lib/simbiotes/portal.rb

@@ -146,5 +146,11 @@ module Simbiotes
       return instance_hash["certificate"]
     end
     
+    def self.ca_certificate
+      response = HTTParty.post("#{Simbiotes.configuration.portal}api/ca_certificate", :query => {:public_key => Simbiotes.configuration.public_key, :private_key => Simbiotes.configuration.private_key}).body
+      hash = JSON.parse(response)
+      return hash["ca_certificate"]
+    end
+    
   end
 end

data/lib/simbiotes/server.rb

@@ -12,8 +12,10 @@ module Simbiotes
         context = OpenSSL::SSL::SSLContext.new
         context.key = Server.key
         context.cert = Server.cert
-        context.ca_cert = Server.ca_cert
-        context.verify_mode = OpenSSL::SSL::VERIFY_PEER
+        if Simbiotes.configuration.verify_peer == true
+          context.ca_file = Server.ca_cert
+          context.verify_mode = OpenSSL::SSL::VERIFY_PEER
+        end
         server = OpenSSL::SSL::SSLSocket.new socket, context
         server.sync_close = true
         server.connect
@@ -143,7 +145,7 @@ module Simbiotes
     def self.ca_cert
       ca_cert = SimbiotesSetting.find_by(key: "ca_cert")
       if ca_cert == nil
-        ca_cert = Simbiotes::Portal.generate_certificate(csr)
+        ca_cert = Simbiotes::Portal.ca_certificate
         c = SimbiotesSetting.new
         c.key = "ca_cert"
         c.value = ca_cert

data/lib/simbiotes/version.rb

@@ -1,3 +1,3 @@
 module Simbiotes
-  VERSION = '0.1.10'
+  VERSION = '0.1.11'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simbiotes
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - MicroArx Corporation