simbiotes 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0b73563d6456052d13077e9ed9127acffed6ed5
-  data.tar.gz: 78c54d38eebf679a8c4e6fee7e01f9d2092d7712
+  metadata.gz: e16db3b4d2fbc5b2c45392f8c784c8947f421648
+  data.tar.gz: 420e5d67aef8834e313bafd585bc6f55096dc60c
 SHA512:
-  metadata.gz: 9656ff68fd8bb7737b78f54320298c6df229522d646d2d0918dc600f1752d661e3ad72f2d559a0ecd71d3999b174b2d28db260dafd9959badbab365ccc4a5806
-  data.tar.gz: f53567489f15567f3b267e2618d1e4082f9397a52ea193c912ba7c29f5800415db5587f162209469d77dec073e20ac0ff63a12c4b05c23d4feb218a83d159112
+  metadata.gz: de03d2823abfe34895d1ed13b46f4e400688400d2d4574554b67a26f03628035c175aaafa4114f43b36e97f5175849e80663b35d3fdaa7b5e51c55a5eeeae746
+  data.tar.gz: 0252fc8f0cc05632037e3d9abdf73b2479b00f81336d2595d1eeb9b4172d24a0463a99c3c1c802af4bb776fabba0b0f08aee80312a2a36d1cb95183982a92465

data/README.md

@@ -130,57 +130,6 @@ $ rake test_comms:stop
 
 Note that you can only communicate with devices if the local communications server is running.
 
-### Creating and uploading scripts.
-
-As mentioned, Workers can have both Drivers and Scripts.  These are quite similar, but have a very important difference.  Drivers are reasonably direct representations of physical interfaces that the device has.  In the case of the Thermostat, it has two Drivers, a Thermometer Driver and a Furnace Driver.  
-
-The Thermometer Driver has one read-only Interface: Temperature.  This Interface corresponds with the actual physical temperature sensor on the device that allows us to know what the ambient temperature is at the device.
-
-The Furnace Driver has one read/write Interface: Heat.  This Interface turns the furnace on or off, and corresponds to the physical interface that the Thermostat has with the physical furnace.
-
-In addition to these low level drivers, what we want is something that lets us interact with them and run some logic on board the device.  This is where the Script comes in.  Like Drivers, Scripts have Interfaces that we can interact with via simple Rails ActiveRecord database operations.  The difference is that Scripts calculate the values that their Interfaces hold based on logic and inputs from Drivers or other Scripts on the Device.
-
-In the Thermostat case, what we want is to be able to set a target temperature (as mentioned above).  If the ambient temperature is below the target temperature, we want to turn on the heat.  If the ambient temperature is above the target temperature, we want to turn the heat off.
-
-We could do this using logic in our Rails application, instantiate the Thermometer and Furnace Drivers, and set the heat on or off as required.  But it would be better to run this logic on the device, and have our Rails application send target temperatures to the device.
-
-When you created the Thermostat::Control model, you also created a stub Script file that can contain the logic that will run on the device.  this file is at lib/scripts/simbiotes/thermostat/control.rb
-
-We edit the stub script file to look like the following:
-
-```ruby
-#######
-# This script will be deployed to your device.
-# The $global variables below represent the values your script will receive/needs to provide to/from its various interfaces and inputs.
-# Your script should change the value of these variables to what they should be, and they will then get passed back.
-# You can also add additional global variables.  If you do, these will be passed back to the script along with the 
-# interface and input variables the next time the script is invoked.  These are useful for keeping state across script 
-# invocations.
-
-  $Temperature
-  $Target_Temperature
-  $Thermometer_Temperature
-  $Furnace_Heat
-  
-  if $Thermometer_Temperature < $Target_Temperature
-    $Furnace_Heat = "on"
-  else
-    $Furnace_Heat = "off"
-  end
-  
-  $Temperature = $Thermometer_Temperature
-```
-
-The $Temperature and $Target_Temperature variables hold the values for the Script's interfaces.  The script also has two inputs (defined on the Simbiotes portal: www.simbiotes.com).  These are the Thermometer Driver's temperature interface and the Furnace Driver's Heat interface.  The $Thermometer_Temperature and $Furnace_Heat variables hold the values of these interfaces, respectively.
-
-The script has the logic to turn the heat on or off depending on the temperature's relationship to the target temperature.  The last line of the script sets the $Temperature variable equal to the $Thermometer_Temperature so that we can access the correct temperature using the temperature interface of the Control script, and not need to access the interface of the Thermometer driver in Rails at all.
-
-Once we have completed our edits to the script, we publish it to the Hive by running the following command:
-
-```bash
-$ rake script:publish[Thermostat:Control]
-```
-
 ### Communicating with Devices
 
 Now that the preliminaries are out of the way, let's communicate with devices.

data/lib/generators/simbiotes/create_model/templates/simbiotes_model.rb.erb

@@ -1,6 +1,6 @@
 module <%= module_name %>
   class <%= class_name %> < ApplicationRecord
-    <% unless @c == nil %># The methods that correspond to device interfaces are <% @c[:attributes].each do |k,v| %><%=k.downcase.gsub(" ", "_")%> <% end %><% end %>
+    <% unless @c == nil %># The method(s) that correspond to device interfaces are: <% @c[:attributes].each do |k,v| %><%=k.downcase.gsub(" ", "_")%> <% end %><% end %>
     <%unless @c == nil %><% unless Simbiotes.configuration.local_logging == false %><% @c[:attributes].each do |k,v| %>
     has_many :<%= class_name.underscore.downcase.gsub(" ", "_") + "_#{k.underscore.downcase.gsub(" ", "_")}_logs"%>, dependent: :destroy
     <% end %><% end %><% end %>

data/lib/generators/simbiotes/initializer/initializer_generator.rb

@@ -9,10 +9,17 @@ module Simbiotes
         template "simbiotes_targets.rb.erb", "config/initializers/simbiotes_targets.rb"
       else
         template "simbiotes.rb.erb", "config/initializers/simbiotes.rb"
+        template "simbiotes_settings.rb.erb", "db/migrate/#{date_string}_create_simbiotes_settings.rb"    
       end
     end
+
+
     
-    
+    private
+
+    def date_string
+      date_string = DateTime.now.strftime("%Y%m%d%H%M%S")
+    end    
     
   end
 end

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

@@ -3,5 +3,6 @@ Simbiotes.configure do |config|
   config.private_key = nil #set this to an Environment variable
   config.local_port = 8001
   config.server_port = 8000
+  config.tls = true
   config.local_logging = true
 end

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

@@ -0,0 +1,9 @@
+class CreateSimbiotesSettings < ActiveRecord::Migration[5.1]
+  def change
+    create_table :simbiotes_settings do |t|
+      t.string :key
+      t.text :value
+      t.timestamps
+    end
+  end
+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
+    attr_accessor :public_key, :private_key, :local_logging, :targets, :local_port, :server, :server_port, :portal, :push, :tls
   
     def initialize
       @public_key = nil
@@ -13,6 +13,7 @@ module Simbiotes
       @server_port = 8000
       @portal = "http://www.simbiotes.com/"
       @push = false
+      @tls = true
     end
   
   end

data/lib/simbiotes/portal.rb

@@ -130,5 +130,11 @@ module Simbiotes
       }
       r = RestClient.post("#{Simbiotes.configuration.portal}api/upload_script", payload)
     end
+    
+    def self.generate_certificate(csr)
+      instance_hash = JSON.parse(HTTParty.post("#{Simbiotes.configuration.portal}api/generate_certificate", :query => {:public_key => Simbiotes.configuration.public_key, :private_key => Simbiotes.configuration.private_key, :csr => csr}).body)
+      return instance_hash["certificate"]
+    end
+    
   end
 end

data/lib/simbiotes/server.rb

@@ -3,9 +3,23 @@
 # to the remote server.  Messages received from the remote server are forwarded to the appropriate logic.
 
 require "socket"
+require 'openssl'
 module Simbiotes
   class Server
-    def initialize( server = TCPSocket.open( Simbiotes.configuration.server, Simbiotes.configuration.server_port ) )
+    def initialize
+      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
+        context.ca_cert = Server.ca_cert
+        context.verify_mode = OpenSSL::SSL::VERIFY_PEER
+        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 = server
       @localport = Simbiotes.configuration.local_port
       listen_remote
@@ -61,6 +75,84 @@ module Simbiotes
       end
     end
     
+    def self.key
+      key = SimbiotesSetting.find_by(key: "key")
+      if key == nil
+        key = Server.generate_key
+      else
+        key = key.value
+      end
+      pass_phrase = Setting.find_by(key: "key_pass_phrase").value
+      key = OpenSSL::PKey::RSA.new key, pass_phrase
+      return key
+    end
+    
+    def self.cert
+      cert = Setting.find_by(key: "cert")
+      if cert == nil
+        key = SimbiotesSetting.find_by(key: "key").value
+        key = OpenSSL::PKey::RSA.new key
+        public_key = SimbiotesSetting.find_by(key: "public_key").value
+        public_key = OpenSSL::PKey::RSA.new public_key
+        cert = Server.generate_cert(key, public_key)
+        c = SimbiotesSetting.new
+        c.key = "cert"
+        c.value = cert
+        c.save
+      else
+        cert = cert.value
+      end
+      cert = OpenSSL::X509::Certificate.new cert
+      return cert
+    end
+    
+    def self.generate_key
+      key = OpenSSL::PKey::RSA.new 2048
+      pass_phrase = 'simbiotes'
+      cipher = OpenSSL::Cipher.new 'AES-128-CBC'
+      s = SimbiotesSetting.new
+      s.key = "key_cipher"
+      s.value = "OpenSSL::Cipher.new 'AES-128-CBC'"
+      s.save
+      s = SimbiotesSetting.new
+      s.key = "key_pass_phrase"
+      s.value = 'simbiotes'
+      s.save
+      s = SimbiotesSetting.new
+      s.key = "public_key"
+      s.value = key.public_key.to_pem
+      s.save
+      s = SimbiotesSetting.new
+      s.key = "key"
+      s.value = key.export(cipher, pass_phrase)
+      s.save
+      return s.value
+    end
+    
+    def self.generate_cert(key, public_key)
+      csr = OpenSSL::X509::Request.new
+      csr.version = 0
+      csr.subject = Setting.cert_name
+      csr.public_key = key.public_key
+      csr.sign key, OpenSSL::Digest::SHA1.new
+      cert = Simbiotes::Portal.generate_certificate(csr)
+      return cert
+    end
+    
+    def self.ca_cert
+      ca_cert = Setting.find_by(key: "ca_cert")
+      if ca_cert == nil
+        ca_cert = Simbiotes::Portal.generate_certificate(csr)
+        c = SimbiotesSetting.new
+        c.key = "ca_cert"
+        c.value = ca_cert
+        c.save
+      else
+        ca_cert = ca_cert.value
+      end
+      ca_cert = OpenSSL::X509::Certificate.new ca_cert
+      return ca_cert
+    end
+    
   end
-
 end

data/lib/simbiotes/version.rb

@@ -1,3 +1,3 @@
 module Simbiotes
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simbiotes
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - MicroArx Corporation
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-19 00:00:00.000000000 Z
+date: 2017-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -167,6 +167,7 @@ files:
 - lib/generators/simbiotes/initializer/USAGE
 - lib/generators/simbiotes/initializer/initializer_generator.rb
 - lib/generators/simbiotes/initializer/templates/simbiotes.rb.erb
+- lib/generators/simbiotes/initializer/templates/simbiotes_settings.rb.erb
 - lib/generators/simbiotes/initializer/templates/simbiotes_targets.rb.erb
 - lib/generators/simbiotes/install/USAGE
 - lib/generators/simbiotes/install/install_generator.rb
@@ -227,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: The easy way to integrate the IoT in your web app.