simbiotes 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea86cc934275ad9bee68dff9df9394f5a3c206b8
-  data.tar.gz: 7a70964b49e63fe9c4f4d828967c36b0fa223719
+  metadata.gz: 532728097e0c8c242d1dae95337412e9aedda7d4
+  data.tar.gz: e177f5bc2ea49371ef4e4b5dfa7ae0cc26d5337d
 SHA512:
-  metadata.gz: 961f8ba083b6d2fa0b78051ccb2c71c96dccf26b51c462bfd6ad2087d4603acd6b03adc883c6a875689ddf13b1b0d85f484ac76f82a6e5683948f30601db03d2
-  data.tar.gz: aa0c4a2f70947fd66b06a37e071a7084c508af9f9bdc04e163595a55904a768af4cd3fa6c96b8dad57b3fb0d41197588f171c9325c5a6734c7c7f05286ab6e84
+  metadata.gz: ad87349174e6de3a2b9d0dbe611b1a63e2f7800052d710bfef2ad2d9e3c9fdb3106ce8808e6dd5815cc28fc3349f21c8900e62aa06c4eeb2407beb107755540a
+  data.tar.gz: ccc33a58e6146f1497a5967c5d74e4cb079ae8c5d5db62e9862e323820362179f4b1b8143be6abccb0a58b63d34966ddf14a5e046102e560987c80f70f61aea7

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

@@ -5,5 +5,6 @@ Simbiotes.configure do |config|
   config.server_port = 8000
   config.tls = true
   config.verify_peer = true
+  config.handshake = 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, :verify_peer
+    attr_accessor :public_key, :private_key, :local_logging, :targets, :local_port, :server, :server_port, :portal, :push, :tls, :verify_peer, :handshake
   
     def initialize
       @public_key = nil
@@ -15,6 +15,7 @@ module Simbiotes
       @push = false
       @tls = true
       @verify_peer = true
+      @handshake = true
     end
   
   end

data/lib/simbiotes/server.rb

@@ -4,11 +4,33 @@
 
 require "socket"
 require 'openssl'
+require 'json'
+
 module Simbiotes
   class Server
     def initialize
+        @error_msg = nil
+        rgs = SimbiotesSetting.find_by(key: "server")
+        rgs_port = SimbiotesSetting.find_by(key: "port")
+        if rgs == nil
+          server_details = Server.lookup
+          if server_details["status"] == "ok"
+            rgs = server_details["rgs"]
+            c = SimbiotesSetting.new
+            c.key = "server"
+            c.value = rgs
+            c.save
+            rgs_port = server_details["rgs_port"]
+            c = SimbiotesSetting.new
+            c.key = "port"
+            c.value = rgs_port
+            c.save
+          else
+            @error_msg = server_details["status_msg"]
+          end
+        end
       if Simbiotes.configuration.tls == true
-        socket = TCPSocket.new(Simbiotes.configuration.server, Simbiotes.configuration.server_port)
+        socket = TCPSocket.new(rgs, rgs_port)
         context = OpenSSL::SSL::SSLContext.new
         context.key = Server.key
         context.cert = Server.cert
@@ -20,7 +42,11 @@ module Simbiotes
         server.sync_close = true
         server.connect
       else
-        server = TCPSocket.open(Simbiotes.configuration.server, Simbiotes.configuration.server_port)
+        server = TCPSocket.open(rgs, rgs_port)
+      end
+      if Simbiotes.configuration.handshake == true
+        server.puts('{"action":"connect"}')
+        response = server.gets
       end
       @server = server
       @localport = Simbiotes.configuration.local_port
@@ -67,6 +93,10 @@ module Simbiotes
         loop do
         	Thread.fork(server.accept) do |client| 
         		s = client.gets
+        		if @error_msg != nil
+        		  string = '{"error":"' + error_msg + '"}'
+        		  client.puts(string)
+        		end
         		#puts s
         		self.send(s)
         	end
@@ -77,6 +107,29 @@ module Simbiotes
       end
     end
     
+    def self.lookup
+      if Simbiotes.configuration.tls == true
+        socket = TCPSocket.new(Simbiotes.configuration.server, Simbiotes.configuration.server_port)
+        context = OpenSSL::SSL::SSLContext.new
+        context.key = Server.key
+        context.cert = Server.cert
+        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
+      else
+        server = TCPSocket.open(Simbiotes.configuration.server, Simbiotes.configuration.server_port)
+      end
+      server.puts('{"action":lookup}')
+      msg = server.gets
+      hash = JSON.parse(msg)
+      server.close
+      return hash
+    end
+    
     def self.key
       key = SimbiotesSetting.find_by(key: "key")
       if key == nil
@@ -135,7 +188,7 @@ module Simbiotes
     def self.generate_cert(key, public_key)
       csr = OpenSSL::X509::Request.new
       csr.version = 0
-      csr.subject = OpenSSL::X509::Name.parse 'CN=simbiotes.com'
+      csr.subject = OpenSSL::X509::Name.parse "CN=#{Simbiotes.configuration.public_key}:#{Simbiotes.configuration.private_key}"
       csr.public_key = key.public_key
       csr.sign key, OpenSSL::Digest::SHA1.new
       cert = Simbiotes::Portal.generate_certificate(csr)
@@ -157,5 +210,14 @@ module Simbiotes
       return ca_cert
     end
     
+    at_exit do
+      if Simbiotes.configuration.handshake == true
+        string = '{"action":"disconnect"}'
+        if @server != nil
+          @server.puts(string)
+        end
+      end
+    end
+    
   end
 end

data/lib/simbiotes/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simbiotes
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - MicroArx Corporation
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-02 00:00:00.000000000 Z
+date: 2017-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -230,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: The easy way to integrate the IoT in your web app.