simbiotes 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f028c07d80e2884bd21c62df4e7fd57ab430acb
-  data.tar.gz: 27bf53c35b2c5c2610c370611eadd437d1717cec
+  metadata.gz: e232c7fdf51c37df9dfb0d07f144eaabf521032b
+  data.tar.gz: 96c89e62feb57de8aa9bc3352a57bfe64ff2203e
 SHA512:
-  metadata.gz: 06a5a118bb788f37653af8cc1ac5a9c631e63812f486ff67ccc897f27b31d70e8891a04da4b59b764532a8b49c63f926caa884a83bda61aee9854178242465f7
-  data.tar.gz: 8b4e1746a2f89eb828e3735d7c4b7c5189ccb577df5cbdf7a413ee09e207ead666652735b0ee4bc953be3742bda77541e3ca85b8d6e0567d2bdae7f207813f98
+  metadata.gz: 76530d0667b5547448545667d811abc508bcda776e16eee2b7e1e68cd1c72f6035ff9300c18837c5984058875c6226efccaf4950c88a47dae6379ab6a2820d8c
+  data.tar.gz: 4108aed32cd6d41a9513b2ac5d2d7a2b4da1263a5ac25ade88ee0ad975c3ab6993015475a24c60f2a2b504592b8ad897d9a711ca2300b2a19496f6ab7f1827c7

data/lib/simbiotes/server.rb

@@ -15,12 +15,12 @@ module Simbiotes
         if rgs == nil
           server_details = Server.lookup
           if server_details["status"] == "ok"
-            rgs = server_details["rgs"]
+            rgs = server_details["IP"]
             c = SimbiotesSetting.new
             c.key = "server"
             c.value = rgs
             c.save
-            rgs_port = server_details["rgs_port"]
+            rgs_port = server_details["port"]
             c = SimbiotesSetting.new
             c.key = "port"
             c.value = rgs_port
@@ -35,12 +35,18 @@ module Simbiotes
         context.key = Server.key
         context.cert = Server.cert
         if Simbiotes.configuration.verify_peer == true
-          context.ca_file = Server.ca_cert
+          ca_tempfile = Tempfile.new
+          ca_tempfile.write Server.ca_cert.to_pem
+          ca_tempfile.rewind
+          context.ca_file = ca_tempfile.path
           context.verify_mode = OpenSSL::SSL::VERIFY_PEER
         end
         server = OpenSSL::SSL::SSLSocket.new socket, context
         server.sync_close = true
         server.connect
+        if Simbiotes.configuration.verify_peer == true
+          ca_tempfile.close(true)
+        end
       else
         server = TCPSocket.open(rgs, rgs_port)
       end
@@ -114,7 +120,10 @@ module Simbiotes
         context.key = Server.key
         context.cert = Server.cert
         if Simbiotes.configuration.verify_peer == true
-          context.ca_file = Server.ca_cert.to_s
+          ca_tempfile = Tempfile.new
+          ca_tempfile.write Server.ca_cert.to_pem
+          ca_tempfile.rewind
+          context.ca_file = ca_tempfile.path
           context.verify_mode = OpenSSL::SSL::VERIFY_PEER
         end
         server = OpenSSL::SSL::SSLSocket.new socket, context
@@ -127,6 +136,9 @@ module Simbiotes
       msg = server.gets
       hash = JSON.parse(msg)
       server.close
+      if Simbiotes.configuration.verify_peer == true
+        ca_tempfile.close(true)
+      end
       return hash
     end
     
@@ -145,11 +157,8 @@ module Simbiotes
     def self.cert
       cert = SimbiotesSetting.find_by(key: "cert")
       if cert == nil
-        key = SimbiotesSetting.find_by(key: "key").value
-        pass_phrase = SimbiotesSetting.find_by(key: "key_pass_phrase").value
-        key = OpenSSL::PKey::RSA.new key, pass_phrase
-        public_key = SimbiotesSetting.find_by(key: "public_key").value
-        public_key = OpenSSL::PKey::RSA.new public_key
+        key = Server.key
+        public_key = key.public_key
         cert = Server.generate_cert(key, public_key)
         c = SimbiotesSetting.new
         c.key = "cert"

data/lib/simbiotes/version.rb

@@ -1,3 +1,3 @@
 module Simbiotes
-  VERSION = '0.1.13'
+  VERSION = '0.1.14'
 end

metadata

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