imperituroard 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a07941a7445bf4aa9aa71e24b29e541ffbc92d4
-  data.tar.gz: 1efa8e5bc158c4450aaadf8928cac6930a673bf9
+  metadata.gz: 6c27b1af6fc8da6333b67a5c283bb1ae02a7a475
+  data.tar.gz: 1191a3d14976315a5d03b4c4efd10208a36e65f9
 SHA512:
-  metadata.gz: 9248cfe42be47e1d1838db5ee49663a345a34d71ba42cb22e212ee8ff22ccf7b1ac14baeb389e242f2bdf43fad35e72304057e00fc6e209cb00de5badc67a55d
-  data.tar.gz: 35a571da88e98b2dd14554a6725006c1c9d02d68d9c7657635b0864a42a02f565306848ca9c70f5f4a96279b18ab8e9f869e316e0746c8b112ef860298c58baa
+  metadata.gz: fe7261a30e0f300ad63eda191ffe88ec4fae8fac984fa5dc460df5db13da1f096df2b1b378220dee2ec9d4abd9541fb22edeec1f0731953540e863fbb7c99955
+  data.tar.gz: 4abebbab6074f3dd1ae35d5bb66cab71eb424950d3aafb640669200f4ff976cdf1f84231c3c77ff96c4c4262b0b037e907232c838cb2c2eb68842d7462801616

data/.idea/runConfigurations/hua_oceanconnect_adapter.xml

@@ -0,0 +1,21 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="hua_oceanconnect_adapter" type="RubyRunConfigurationType" factoryName="Ruby">
+    <module name="imperituroard" />
+    <RUBY_RUN_CONFIG NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
+    <RUBY_RUN_CONFIG NAME="WORK DIR" VALUE="$MODULE_DIR$/lib/imperituroard/projects/iot" />
+    <RUBY_RUN_CONFIG NAME="SHOULD_USE_SDK" VALUE="false" />
+    <RUBY_RUN_CONFIG NAME="ALTERN_SDK_NAME" VALUE="" />
+    <RUBY_RUN_CONFIG NAME="myPassParentEnvs" VALUE="true" />
+    <envs />
+    <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="true" />
+    <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
+    <EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov">
+      <COVERAGE_PATTERN ENABLED="true">
+        <PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
+      </COVERAGE_PATTERN>
+    </EXTENSION>
+    <RUBY_RUN_CONFIG NAME="SCRIPT_PATH" VALUE="$MODULE_DIR$/lib/imperituroard/projects/iot/hua_oceanconnect_adapter.rb" />
+    <RUBY_RUN_CONFIG NAME="SCRIPT_ARGS" VALUE="" />
+    <method />
+  </configuration>
+</component>

data/Gemfile

@@ -12,4 +12,4 @@ gem 'json', '2.3.0'
 gem 'mongo', '2.11.4'
 gem 'nokogiri'
 gem 'rails'
-
+gem 'ipaddr'

data/imperituroard.gemspec

@@ -36,4 +36,5 @@ Gem::Specification.new do |spec|
   #spec.add_development_dependency "uri"
   spec.add_development_dependency "mongo", "2.11.4"
   spec.add_development_dependency "nokogiri"
+  spec.add_development_dependency "ipaddr"
 end

data/lib/imperituroard.rb

@@ -6,10 +6,13 @@ require "imperituroard/phpipamdb"
 require "imperituroard/phpipamcps"
 require "imperituroard/projects/iot/mongoconnector"
 require "imperituroard/projects/iot/hua_oceanconnect_adapter"
+require "imperituroard/projects/iot/add_functions"
 require 'json'
+require 'ipaddr'
 
 module Imperituroard
-  class Error < StandardError; end
+  class Error < StandardError;
+  end
 
   def initialize()
   end
@@ -26,9 +29,20 @@ module Phpipam
   end
 end
 
+class MyJSON
+  def self.valid?(value)
+    result = JSON.parse(value)
+
+    result.is_a?(Hash) || result.is_a?(Array)
+  rescue JSON::ParserError, TypeError
+    false
+  end
+end
+
 class Pipam
 
   attr_accessor :username, :password, :ip, :database_class, :cps_class
+
   def initialize(db_username, db_password, db_ip, cps_wsdl, cps_endpoint, cps_namespace)
     @username = db_username
     @password = db_password
@@ -66,13 +80,25 @@ class Pipam
       "failed"
     end
   end
+
   include Phpipam
 end
 
 class Iot
-  attr_accessor :mongoip, :mongoport, :iotip, :iottoken, :mongo_database, :iotplatform_ip, :iotplatform_port, :cert_path, :key_path, :mongo_client
-
-  def initialize(mongoip, mongoport, iotip, mongo_database, iotplatform_ip, iotplatform_port, cert_path, key_path)
+  attr_accessor :mongoip,
+                :mongoport,
+                :iotip,
+                :iottoken,
+                :mongo_database,
+                :iotplatform_ip,
+                :iotplatform_port,
+                :cert_path,
+                :key_path,
+                :mongo_client,
+                :add_functions_connector
+
+  def initialize(mongoip, mongoport, iotip, mongo_database,
+                 iotplatform_ip, iotplatform_port, cert_path, key_path, telegram_api_url, telegram_chat_id)
     @mongoip = mongoip
     @mongoport = mongoport
     @iotip = iotip
@@ -82,88 +108,128 @@ class Iot
     @cert_path = cert_path
     @key_path = key_path
     @mongo_client = MongoIot.new(mongoip, mongoport, mongo_database)
+    @add_functions_connector = AdditionalFunc.new(telegram_api_url, telegram_chat_id)
   end
 
   #error list
 
   #:code => 507, :result => "Unknown SDK error"
+  #{:code => 200, :result => "Request completed successfully", :body => result_ps}
 
 
-  #1. Add device to profile
+  #!1. Add device to profile (only for new device)
   #login - login for client identification
   #profile - profile for device
   #imei_list - device identificator
-  #imei_list = {
-  #    imei: imei,
-  #    imsi: imsi,
-  #    msisdn: msisdn,
-  #    description: description,
-  #    note: note,
-  #    profile: profile,
-  #    type: type,
-  #    address: address
-  #}
+  #imei_list = [{"imei" => 131234123412341233, "description" => "dfdsf", "note"=>"second description", "profile"=>0},
+  #{"imei" => 56213126347645784, "description" => "dfdsf", "note"=>"second description", "profile"=>0}]
   #massive commands
-  #+
-  def add_device_to_profile(login, imei_list)
-    input_json = {:login => login, :imei_list =>imei_list}
-
+  #++
+  def add_device_to_profile(login, imei_list, remote_ip)
+    input_json = {:login => login, :imei_list => imei_list}
+    resp_out = {}
     begin
-    imei = []
-    list1 = {}
-    for_insert = []
-    for t in imei_list
-      imei.append(t["imei"])
-      list1[t["imei"]] = t
-    end
-    get_login_info = mongo_client.check_login_profile_permiss(login, "profile")[:code]
-    if get_login_info==200
-      list_exists = mongo_client.check_imei_exists(imei)
-      for_upload = imei - list_exists
-      for h in for_upload
-        for_insert.append(list1[h])
+      thr1 = Thread.new do
+
+      imei = []
+      list1 = {}
+      for_insert = []
+      not_processed_list = []
+      processed_list = []
+
+      for ii in imei_list
+        list1[ii["imei"]] = ii
+        imei.append(ii["imei"])
+      end
+      list_checked = mongo_client.check_imei_exists(imei)
+      for ss in list_checked[:body][:exists]
+        not_processed_list.append({:imei=>ss, :error => "Device exists in database"})
       end
+
+      for jj in list_checked[:body][:not_exists]
+        begin
+        get_login_info = mongo_client.check_login_prof_perm_id_one(login, list1[jj]["profile"])[:code]
+        if get_login_info==200
+          for_insert.append(list1[jj])
+        else
+          not_processed_list.append({:imei=>list1[jj], :error => "Permission denied for this profile"})
+        end
+        rescue
+          not_processed_list.append({:imei=>list1[jj], :error => "Unknown error"})
+          end
+      end
+
+      begin
+        if for_insert!=[]
       mongo_client.imei_insert_list(for_insert)
-    else get_login_info
-    end
+      resp_out = {:code => 200, :result => "Data processed", :body => {:imei_processed => for_insert, :error_list => not_processed_list}}
+        else
+          resp_out = {:code => 202, :result => "Nothing for insertion", :body => {:imei_processed => for_insert, :error_list => not_processed_list}}
+
+        end
+      rescue
+        resp_out = {:code => 505, :result => "Error with database communication"}
+        end
+      end
     rescue
-     return  {:code => 507, :result => "Unknown SDK error"}
+      resp_out = {:code => 507, :result => "Unknown SDK error"}
     end
-    mongo_client.audit_logger("add_device_to_profile", "127.0.0.1", input_json, "resp")
+    thr1.join
+    mongo_client.audit_logger("add_device_to_profile", remote_ip, input_json, resp_out)
+    resp_out
   end
 
 
-  #2 Find device (only mongo datebase. IOT platform not need)
+  #!2 Find device (only mongo datebase. IOT platform not need)
+  # procedure for data selection from mongo database.
+  # for this function IOT platform not need
   # login
   # imei
   # imei_list =[41234,23452345,132412]
-  #+
-  def device_find(login, imei_list)
-    input_json = {:login => login, :imei_list =>imei_list}
-
+  #++
+  def device_find(login, imei_list, remote_ip)
+    input_json = {:login => login, :imei_list => imei_list}
     ime_list_approved = []
     ime_list_notapproved = []
-
+    resp = {}
     begin
-      for t in imei_list
-        prof_name1 = mongo_client.get_profile_name_from_imei(t)
-        p "prof_name1"
-        p prof_name1
-        if prof_name1!=nil
-          permiss1 = mongo_client.check_login_profile_permiss(login, prof_name1["profile"])[:code]
-          if permiss1==200
-            ime_list_approved.append(t)
+      thr2 = Thread.new do
+        for t in imei_list
+          prof_name1 = mongo_client.get_profile_name_from_imei(t)
+          if prof_name1[:code]==200
+            begin
+              permiss1 = mongo_client.check_login_profile_permiss(login, prof_name1[:body]["profile"])[:code]
+              if permiss1==200
+                ime_list_approved.append(t)
+              else
+                ime_list_notapproved.append({:imei => t, :error => permiss1})
+              end
+            rescue
+              ime_list_notapproved.append({:imei => t, :error => {:code => 405, :result => "Unknown error when check_login_profile_permiss imei #{t.to_s}"}})
+            end
+          else
+            ime_list_notapproved.append({:imei => t, :error => prof_name1})
           end
         end
+        begin
+          if ime_list_approved != []
+            data = mongo_client.get_imei_info_from_db(ime_list_approved)
+
+            resp = {:code => 200, :result => "Request completed successfully", :data => {:approved_list => data, :unapproved_list => ime_list_notapproved}}
+
+          else
+            resp = {:code => 404, :result => "Invalidate data", :data => {:approved_list => [], :unapproved_list => ime_list_notapproved}}
+          end
+        rescue
+          resp = {:code => 504, :result => "Unsuccessfully data transfer"}
+        end
       end
-      data = mongo_client.get_imei_info_from_db(ime_list_approved)
-      {:code => 507, :result => "Unknown SDK error", :data => data}
     rescue
-      {:code => 507, :result => "Unknown SDK error"}
+      resp = {:code => 507, :result => "Unknown SDK error"}
     end
-
-    mongo_client.audit_logger("add_device_to_profile", "127.0.0.1", input_json, "resp")
-
+    thr2.join
+    mongo_client.audit_logger("device_find", remote_ip, input_json, resp)
+    resp
   end
 
   #3 device modify, change imei
@@ -174,17 +240,17 @@ class Iot
   #im_list = [{:imei_old=>7967843245667, :imei_new=>7967843245665}]
   #+
   def imei_replace(login, im_list)
-    input_json = {:login => login, :imei_list =>im_list}
+    input_json = {:login => login, :imei_list => im_list}
     begin
-    for a in im_list
-      p a
-      prof_name1 = mongo_client.get_profile_name_from_imei(a[:imei_old])
-      p prof_name1
-      permiss1 = mongo_client.check_login_profile_permiss(login, prof_name1["profile"])[:code]
-      if permiss1==200
-        mongo_client.device_modify_any_attr_mongo(a[:imei_old],{:imei=>a[:imei_new]})
+      for a in im_list
+        p a
+        prof_name1 = mongo_client.get_profile_name_from_imei(a[:imei_old])
+        p prof_name1
+        permiss1 = mongo_client.check_login_profile_permiss(login, prof_name1["profile"])[:code]
+        if permiss1==200
+          mongo_client.device_modify_any_attr_mongo(a[:imei_old], {:imei => a[:imei_new]})
+        end
       end
-    end
     rescue
       {:code => 507, :result => "Unknown SDK error"}
     end
@@ -203,16 +269,16 @@ class Iot
   #+
   def device_remove(login, imei)
 
-    input_json = {:login => login, :imei_list =>imei}
+    input_json = {:login => login, :imei_list => imei}
     resp = {}
 
     begin
 
-    prof_name = mongo_client.get_profile_name_from_imei(imei)
-    permiss = mongo_client.check_login_profile_permiss(login, prof_name["profile"])[:code]
-    if permiss==200
-      resp = mongo_client.device_remove_single_mongo(imei)
-    end
+      prof_name = mongo_client.get_profile_name_from_imei(imei)
+      permiss = mongo_client.check_login_profile_permiss(login, prof_name["profile"])[:code]
+      if permiss==200
+        resp = mongo_client.device_remove_single_mongo(imei)
+      end
     rescue
       {:code => 507, :result => "Unknown SDK error"}
     end
@@ -228,19 +294,24 @@ class Iot
   #newdevice_list=[{:imei=>7967843245665, :address=>"Golubeva51"}]
   #+
   def device_add_address(login, newdevice_list)
+    add_functions_connector.telegram_message(newdevice_list.to_s)
+    p newdevice_list
+    p "gas"
+    p MyJSON.valid?(newdevice_list[0].to_s)
+    p "sdfsdfgs"
     input_json = {:login => login, :devices => newdevice_list}
     begin
-    resp = {}
-    for p in newdevice_list
-      prof_name = mongo_client.get_profile_name_from_imei(p[:imei])
-
-      p "prof_name"
-      p prof_name
-      permiss = mongo_client.check_login_profile_permiss(login, prof_name["profile"])[:code]
-      if permiss==200
-        resp = mongo_client.device_modify_attr_mongo(p[:imei],p[:address])
+      resp = {}
+      for p in newdevice_list
+        prof_name = mongo_client.get_profile_name_from_imei(p[:imei])
+
+        p "prof_name"
+        p prof_name
+        permiss = mongo_client.check_login_profile_permiss(login, prof_name["profile"])[:code]
+        if permiss==200
+          resp = mongo_client.device_modify_attr_mongo(p[:imei], p[:address])
+        end
       end
-    end
       return resp
     rescue
       {:code => 507, :result => "Unknown SDK error"}
@@ -256,34 +327,36 @@ class Iot
   #newdevice_list=[{:imei=>7967843245665, :attributes=>{:address=>"Golubeva51", :profile=>"wqeqcqeqwev", :msisdn=>375298766719, :imsi=>25702858586756875}}]
   #+
   def add_service(login, device_list)
-    input_json = {:login => login, :devices => device_list}
 
-    begin
 
-    for g in device_list
-      prof_name1 = mongo_client.get_profile_name_from_imei(g[:imei])
-      p prof_name1
-      permiss1 = mongo_client.check_login_profile_permiss(login, prof_name1["profile"])[:code]
-      p permiss1
-      permiss2 = mongo_client.check_login_profile_permiss(login, g[:attributes][:profile])[:code]
-      if permiss1==200 && permiss2==200
+    input_json = {:login => login, :devices => device_list}
 
-        attr = g[:attributes]
-        #mod_attr = {}
+    begin
 
-        if attr.key?(:profile)
-          if attr[:profile].is_a? Integer
-           p "Ok"
-          else
-            p new = mongo_client.get_profile_id_by_name(attr[:profile])
-            attr[:profile] = new["profile_id"]
+      for g in device_list
+        prof_name1 = mongo_client.get_profile_name_from_imei(g[:imei])
+        p prof_name1
+        permiss1 = mongo_client.check_login_profile_permiss(login, prof_name1["profile"])[:code]
+        p permiss1
+        permiss2 = mongo_client.check_login_profile_permiss(login, g[:attributes][:profile])[:code]
+        if permiss1==200 && permiss2==200
+
+          attr = g[:attributes]
+          #mod_attr = {}
+
+          if attr.key?(:profile)
+            if attr[:profile].is_a? Integer
+              p "Ok"
+            else
+              p new = mongo_client.get_profile_id_by_name(attr[:profile])
+              attr[:profile] = new["profile_id"]
+            end
           end
-        end
-        p attr
+          p attr
 
-        mongo_client.device_modify_any_attr_mongo(g[:imei],attr)
+          mongo_client.device_modify_any_attr_mongo(g[:imei], attr)
+        end
       end
-    end
     rescue
       {:code => 507, :result => "Unknown SDK error"}
     end
@@ -293,10 +366,8 @@ class Iot
   end
 
 
-
-
   def test()
-    ddd = MongoIot.new(mongoip, mongoport,  mongo_database)
+    ddd = MongoIot.new(mongoip, mongoport, mongo_database)
     #ddd.get_profiles_by_login("test")
 
     ff = [131234123412341233, 131234123127341233]
@@ -306,7 +377,6 @@ class Iot
   end
 
 
-
   def testhua()
     cert_file = cert_path
     key_file = key_path
@@ -327,10 +397,11 @@ class Iot
     tt = "{\"deviceId\":\"fad0a417-b6a3-4b0b-abfc-fa2b0af9691a\",\"verifyCode\":\"6cb6dcca\",\"timeout\":180,\"psk\":\"1d16b55d577bc1f2e5e75d416ce6b8a2\"}"
     #tt = tt.gsub("\\","")
     #p tt
-    ff =  tt.to_s
+    ff = tt.to_s
     p ff
     gg = JSON.parse(ff)
     p gg
   end
 
 end
+

data/lib/imperituroard/projects/iot/add_functions.rb

@@ -0,0 +1,34 @@
+require 'net/http'
+require 'net/https'
+require 'json'
+
+
+class AdditionalFunc
+
+  attr_accessor :telegram_api_url, :telegram_chat_id
+
+  def initialize(telegram_api_url, telegram_chat_id)
+    @telegram_api_url = telegram_api_url
+    @telegram_chat_id = telegram_chat_id
+  end
+
+  #procedure for send log to telegram chat
+  def telegram_message(message)
+    begin
+      uri = URI.parse(telegram_api_url)
+      https_connector = Net::HTTP.new(uri.host, uri.port)
+      https_connector.use_ssl = true
+      data = {chat_id: telegram_chat_id, text: message}
+      request_mess = Net::HTTP::Post.new(uri.request_uri, {'Content-Type' => 'application/json'})
+      request_mess.body = data.to_json
+      response_mess = https_connector.request(request_mess)
+      body = response_mess.body
+      return {:code => 200,
+              :result => "Request completed successfully",
+              :body => {:telegram_resp => JSON.parse(body.to_s),
+                        :description => "Telegram message to telegram_chat_id: #{telegram_chat_id.to_s}"}}
+    rescue
+      return {:code => 507, :result => "Unknown SDK error"}
+    end
+  end
+end

data/lib/imperituroard/projects/iot/hua_oceanconnect_adapter.rb

@@ -24,27 +24,27 @@ class HuaIot
 
   def parse_token(str)
     begin
-    dd = str.split(",")
-    acc_token = ""
-    refr_token = ""
-    exp_in = ""
-
-    access_token = /\"accessToken\":\"(\S+)\"/
-    refresh_token = /\"refreshToken\":\"(.+)\"/
-    expires_in = /\"expiresIn\":(\d+)/
-
-    for i in dd
-      if i.to_s.include?("accessToken")
-        acc_token = access_token.match(i)
-      elsif i.to_s.include?("refreshToken")
-        refr_token = refresh_token.match(i)
-      elsif i.to_s.include?("expiresIn")
-        exp_in = expires_in.match(i)
+      dd = str.split(",")
+      acc_token = ""
+      refr_token = ""
+      exp_in = ""
+
+      access_token = /\"accessToken\":\"(\S+)\"/
+      refresh_token = /\"refreshToken\":\"(.+)\"/
+      expires_in = /\"expiresIn\":(\d+)/
+
+      for i in dd
+        if i.to_s.include?("accessToken")
+          acc_token = access_token.match(i)
+        elsif i.to_s.include?("refreshToken")
+          refr_token = refresh_token.match(i)
+        elsif i.to_s.include?("expiresIn")
+          exp_in = expires_in.match(i)
+        end
       end
-    end
-    {:status=> 200, :result=>"OK", :accessToken=>acc_token[1], :refreshToken=>refr_token[1], :expiresIn => exp_in[1] }
+      {:status => 200, :result => "OK", :accessToken => acc_token[1], :refreshToken => refr_token[1], :expiresIn => exp_in[1]}
     rescue
-      {:status=> 500, :result=>"failed"}
+      {:status => 500, :result => "failed"}
     end
   end
 
@@ -54,10 +54,10 @@ class HuaIot
     uri = URI.parse url_string
     https = Net::HTTP.new(uri.host, uri.port)
     https.use_ssl = true
-    https.cert = OpenSSL::X509::Certificate.new( File.read(cert_file) )
-    https.key = OpenSSL::PKey::RSA.new( File.read(key_file) )
+    https.cert = OpenSSL::X509::Certificate.new(File.read(cert_file))
+    https.key = OpenSSL::PKey::RSA.new(File.read(key_file))
     https.verify_mode = OpenSSL::SSL::VERIFY_NONE
-    request = Net::HTTP::Post.new( uri.path)
+    request = Net::HTTP::Post.new(uri.path)
     data = {
         :appId => app_id,
         :secret => secret
@@ -76,10 +76,10 @@ class HuaIot
     uri = URI.parse url_string
     https = Net::HTTP.new(uri.host, uri.port)
     https.use_ssl = true
-    https.cert = OpenSSL::X509::Certificate.new( File.read(cert_file) )
-    https.key = OpenSSL::PKey::RSA.new( File.read(key_file) )
+    https.cert = OpenSSL::X509::Certificate.new(File.read(cert_file))
+    https.key = OpenSSL::PKey::RSA.new(File.read(key_file))
     https.verify_mode = OpenSSL::SSL::VERIFY_NONE
-    request = Net::HTTP::Post.new( uri.path)
+    request = Net::HTTP::Post.new(uri.path)
     request.content_type = 'application/json'
     request['Authorization'] = 'Bearer ' + token
     request['app_key'] = app_id
@@ -92,15 +92,15 @@ class HuaIot
 
   def dev_delete(app_id, secret, node_id)
     token = get_token(app_id, secret)[:body]["accessToken"]
-    path = "/iocm/app/dm/v1.1.0/devices/" + node_id +  "?app_Id=" + app_id + "&cascade=true"
+    path = "/iocm/app/dm/v1.1.0/devices/" + node_id + "?app_Id=" + app_id + "&cascade=true"
     url_string = "https://" + platformip + ":" + platformport + path
     uri = URI.parse url_string
     https = Net::HTTP.new(uri.host, uri.port)
     https.use_ssl = true
-    https.cert = OpenSSL::X509::Certificate.new( File.read(cert_file) )
-    https.key = OpenSSL::PKey::RSA.new( File.read(key_file))
+    https.cert = OpenSSL::X509::Certificate.new(File.read(cert_file))
+    https.key = OpenSSL::PKey::RSA.new(File.read(key_file))
     https.verify_mode = OpenSSL::SSL::VERIFY_NONE
-    request = Net::HTTP::Delete.new( uri.path)
+    request = Net::HTTP::Delete.new(uri.path)
     request.content_type = 'application/json'
     request['Authorization'] = 'Bearer ' + token
     request['app_key'] = app_id
@@ -120,10 +120,10 @@ class HuaIot
     uri = URI.parse url_string
     https = Net::HTTP.new(uri.host, uri.port)
     https.use_ssl = true
-    https.cert = OpenSSL::X509::Certificate.new( File.read(cert_file) )
-    https.key = OpenSSL::PKey::RSA.new( File.read(key_file))
+    https.cert = OpenSSL::X509::Certificate.new(File.read(cert_file))
+    https.key = OpenSSL::PKey::RSA.new(File.read(key_file))
     https.verify_mode = OpenSSL::SSL::VERIFY_NONE
-    request = Net::HTTP::Get.new( uri.path)
+    request = Net::HTTP::Get.new(uri.path)
     request.content_type = 'application/json'
     request['Authorization'] = 'Bearer ' + token
     request['app_key'] = app_id
@@ -136,15 +136,15 @@ class HuaIot
   #2.2.14 Querying Device Activation Status
   def querying_device_activ_status(app_id, secret, device_id)
     token = get_token(app_id, secret)[:body]["accessToken"]
-    path = "/iocm/app/reg/v1.1.0/devices/" + device_id +  "?app_Id=" + app_id
+    path = "/iocm/app/reg/v1.1.0/devices/" + device_id + "?app_Id=" + app_id
     url_string = "https://" + platformip + ":" + platformport + path
     uri = URI.parse url_string
     https = Net::HTTP.new(uri.host, uri.port)
     https.use_ssl = true
-    https.cert = OpenSSL::X509::Certificate.new( File.read(cert_file) )
-    https.key = OpenSSL::PKey::RSA.new( File.read(key_file))
+    https.cert = OpenSSL::X509::Certificate.new(File.read(cert_file))
+    https.key = OpenSSL::PKey::RSA.new(File.read(key_file))
     https.verify_mode = OpenSSL::SSL::VERIFY_NONE
-    request = Net::HTTP::Get.new( uri.path)
+    request = Net::HTTP::Get.new(uri.path)
     request.content_type = 'application/json'
     request['Authorization'] = 'Bearer ' + token
     request['app_key'] = app_id
@@ -156,15 +156,15 @@ class HuaIot
   #2.9.1 Querying Information About a Device
   def querying_device_info(app_id, secret, device_id)
     token = get_token(app_id, secret)[:body]["accessToken"]
-    path = "/iocm/app/dm/v1.1.0/devices/" + device_id +  "?app_Id=" + app_id
+    path = "/iocm/app/dm/v1.1.0/devices/" + device_id + "?app_Id=" + app_id
     url_string = "https://" + platformip + ":" + platformport + path
     uri = URI.parse url_string
     https = Net::HTTP.new(uri.host, uri.port)
     https.use_ssl = true
-    https.cert = OpenSSL::X509::Certificate.new( File.read(cert_file) )
-    https.key = OpenSSL::PKey::RSA.new( File.read(key_file))
+    https.cert = OpenSSL::X509::Certificate.new(File.read(cert_file))
+    https.key = OpenSSL::PKey::RSA.new(File.read(key_file))
     https.verify_mode = OpenSSL::SSL::VERIFY_NONE
-    request = Net::HTTP::Get.new( uri.path)
+    request = Net::HTTP::Get.new(uri.path)
     request.content_type = 'application/json'
     request['Authorization'] = 'Bearer ' + token
     request['app_key'] = app_id
@@ -180,10 +180,10 @@ class HuaIot
     uri = URI.parse url_string
     https = Net::HTTP.new(uri.host, uri.port)
     https.use_ssl = true
-    https.cert = OpenSSL::X509::Certificate.new( File.read(cert_file) )
-    https.key = OpenSSL::PKey::RSA.new( File.read(key_file))
+    https.cert = OpenSSL::X509::Certificate.new(File.read(cert_file))
+    https.key = OpenSSL::PKey::RSA.new(File.read(key_file))
     https.verify_mode = OpenSSL::SSL::VERIFY_NONE
-    request = Net::HTTP::Post.new( uri.path)
+    request = Net::HTTP::Post.new(uri.path)
     request.content_type = 'application/json'
     request['Authorization'] = 'Bearer ' + token
     request['app_key'] = app_id
@@ -201,10 +201,10 @@ class HuaIot
     uri = URI.parse url_string
     https = Net::HTTP.new(uri.host, uri.port)
     https.use_ssl = true
-    https.cert = OpenSSL::X509::Certificate.new( File.read(cert_file) )
-    https.key = OpenSSL::PKey::RSA.new( File.read(key_file))
+    https.cert = OpenSSL::X509::Certificate.new(File.read(cert_file))
+    https.key = OpenSSL::PKey::RSA.new(File.read(key_file))
     https.verify_mode = OpenSSL::SSL::VERIFY_NONE
-    request = Net::HTTP::Get.new( uri.path)
+    request = Net::HTTP::Get.new(uri.path)
     request.content_type = 'application/json'
     request['Authorization'] = 'Bearer ' + token
     request['app_key'] = app_id
@@ -216,12 +216,12 @@ class HuaIot
 
     url_string = "https://134.17.93.4:8743/iocm/app/sec/v1.1.0/login"
     headers = {
-        'Authorization'=>'Bearer ppeMsOq6zdb2fSUH4GoRooS_FgEa',
-        'Content-Type' =>'application/json',
-        'Accept'=>'application/json'
+        'Authorization' => 'Bearer ppeMsOq6zdb2fSUH4GoRooS_FgEa',
+        'Content-Type' => 'application/json',
+        'Accept' => 'application/json'
     }
 
-    req = {"dstAppId": "bCRahH5zSi9SNmyfqv3BkJABAq8a" }
+    req = {"dstAppId": "bCRahH5zSi9SNmyfqv3BkJABAq8a"}
     post_data = URI.encode_www_form(req)
 
     uri = URI.parse url_string
@@ -234,13 +234,13 @@ class HuaIot
     cert_file = "/Users/imperituroard/Desktop/cert.crt"
     key_file = "/Users/imperituroard/Desktop/key.pem"
 
-    p  https = Net::HTTP.new(uri.host, uri.port)
+    p https = Net::HTTP.new(uri.host, uri.port)
     https.use_ssl = true
-    https.cert = OpenSSL::X509::Certificate.new( File.read(cert_file) )
-    https.key = OpenSSL::PKey::RSA.new( File.read(key_file) )
+    https.cert = OpenSSL::X509::Certificate.new(File.read(cert_file))
+    https.key = OpenSSL::PKey::RSA.new(File.read(key_file))
     https.verify_mode = OpenSSL::SSL::VERIFY_NONE
 
-    request = Net::HTTP::Post.new( uri.path)
+    request = Net::HTTP::Post.new(uri.path)
 
     data = {
         :appId => "bCRahH5zSi9SNmyfqv3BkJABAq8a",
@@ -261,9 +261,8 @@ class HuaIot
 
   end
 
- # App ID
- # password  O2k2aMStOweZOeSoVDYjI3c6uaMa
-
+  # App ID
+  # password  O2k2aMStOweZOeSoVDYjI3c6uaMa
 
 
 end

data/lib/imperituroard/projects/iot/mongoconnector.rb

@@ -19,19 +19,26 @@ class MongoIot
   end
 
   def audit_logger(proc_name, src_ip, input_json, output_json)
-    collection = client[:audit]
-    doc = {
-        :proc_name => proc_name,
-        :sender => {:src_ip => src_ip},
-        :input_params => input_json,
-        :output_params => output_json
-    }
-    p doc
-    result = collection.insert_one(doc)
-    p result
-
+    begin
+      d = DateTime.now
+      current = d.strftime("%d/%m/%Y %H:%M:%S")
+      collection = client[:audit]
+      doc = {
+          :proc_name => proc_name,
+          :date => current,
+          :sender => {:src_ip => src_ip},
+          :input_params => input_json,
+          :output_params => output_json
+      }
+      result = collection.insert_one(doc)
+      return {:code => 200, :result => "Request completed successfully", :body => result}
+    rescue
+      return {:code => 507, :result => "Unknown SDK error"}
+    end
   end
 
+  #:code => 507, :result => "Unknown SDK error"
+  #{:code => 200, :result => "Request completed successfully", :body => result_ps}
   def get_profiles_by_login(login)
     begin
       login_profiles = []
@@ -39,18 +46,18 @@ class MongoIot
       result_ps = []
       collection = client[:users]
       collection2 = client[:device_profiles]
-      collection.find({:login => login}).each { |row|
+      collection.find({:login => login}).each {|row|
         login_profiles = row["permit_profiles"]
       }
       for i in login_profiles
         req2.append({:profile_id => i})
       end
-      collection2.find({:$or => req2}, {:_id => 0}).each { |row|
+      collection2.find({:$or => req2}, {:_id => 0}).each {|row|
         result_ps.append(row)
       }
-      result_ps
+      return {:code => 200, :result => "Request completed successfully", :body => result_ps}
     rescue
-      []
+      return {:code => 507, :result => "Unknown SDK error"}
     end
   end
 
@@ -62,13 +69,12 @@ class MongoIot
       for i in imeilist
         req2.append({:imei => i})
       end
-      p req2
-      collection.find({:$or => req2}, {:_id => 0}).each { |row|
+      collection.find({:$or => req2}, {:_id => 0}).each {|row|
         result_ps.append(row)
       }
-      result_ps
+      return {:code => 200, :result => "Request completed successfully", :body => result_ps}
     rescue
-      []
+      return {:code => 507, :result => "Unknown SDK error"}
     end
   end
 
@@ -76,7 +82,7 @@ class MongoIot
     begin
       result_ps = []
       collection = client[:device_profiles]
-      collection.find({"profile" => profile_name}).each { |row|
+      collection.find({"profile" => profile_name}).each {|row|
         result_ps.append(row)
       }
       result_ps[0]
@@ -89,7 +95,7 @@ class MongoIot
     begin
       result_ps = []
       collection = client[:device_profiles]
-      collection.find({"profile_id" => profile_id}).each { |row|
+      collection.find({"profile_id" => profile_id}).each {|row|
         result_ps.append(row)
       }
       result_ps[0]
@@ -106,11 +112,12 @@ class MongoIot
     p get_login_info
     dst_profile = get_profile_id_by_name(profile)
     p "dst_profile"
-     p dst_profile
+    p dst_profile
     access=1
-    if get_login_info!=[]
+    if get_login_info[:body]!=[]
       if dst_profile!=[]
-        for j in get_login_info
+        p "sgsgsd"
+        for j in get_login_info[:body]
           p j
           if j["profile_id"]==dst_profile["profile_id"]
             access=0
@@ -118,22 +125,61 @@ class MongoIot
           if access==0
             return {:code => 200, :result => "Permission granted"}
           else
-            return {:code => 400,:result => "Access denied. This incident will be reported."}
+            return {:code => 400, :result => "Access denied. This incident will be reported."}
           end
         end
-      else return {:code => 501,:result => "Profile not found"}
+      else
+        return {:code => 501, :result => "Profile not found"}
       end
-    else {:code => 500,:result => "Login not found"}
+    else
+      {:code => 500, :result => "Login not found"}
+    end
+  end
+
+
+  def check_login_prof_perm_id_one(login, profile_id)
+    p "profile"
+    p profile_id
+    get_login_info = get_profiles_by_login(login)
+    p "get_login_info"
+    p get_login_info
+    access=1
+    if get_login_info[:body]!=[]
+        p "sgsgsd"
+        for j in get_login_info[:body]
+          p j
+          if j["profile_id"]==profile_id
+            access=0
+          end
+          if access==0
+            return {:code => 200, :result => "Permission granted"}
+          else
+            return {:code => 400, :result => "Access denied. This incident will be reported."}
+          end
+        end
+    else
+      {:code => 500, :result => "Login not found"}
     end
   end
 
   def check_imei_exists(imei_list)
-    res = []
-    imei_list = get_imei_info_from_db(imei_list)
-    for k in imei_list
-      res.append(k["imei"])
+    res_exists = []
+    imei_list_res = get_imei_info_from_db(imei_list)
+    p imei_list_res
+    p "imei_list"
+    for k in imei_list_res[:body]
+      p k
+      res_exists.append(k["imei"])
     end
-    res
+    p "aaaa"
+    p imei_list
+    p res_exists
+    not_ex = imei_list - res_exists
+    p "not_ex"
+    p not_ex
+    p res_exists
+    {:code => 200, :result => "check_imei_exists: Request completed successfully",
+            :body => {:exists => res_exists, :not_exists => not_ex}}
   end
 
 
@@ -161,31 +207,62 @@ class MongoIot
   end
 
   def get_profile_name_from_imei(imei)
-    info = get_imei_info_from_db([imei])
-    p "123"
-    p info
-    id = info[0]["profile"]
-    get_profile_name_by_id(id)
+    begin
+      begin
+        info = get_imei_info_from_db([imei])
+        if info[:body]==[]
+          return {:code => 505, :result => "get_profile_name_from_imei: get_imei_info_from_db returned empty list from database. IMEIS not found"}
+        else
+          p "fshhsdf"
+          p info
+          id = info[:body][0]["profile"]
+        end
+      rescue
+        return {:code => 506, :result => "get_profile_name_from_imei: Function get_imei_info_from_db not processed correctly and returned: #{info.to_s}"}
+      end
+      begin
+        res = get_profile_name_by_id(id)
+        if res.key?("profile")
+          res=res
+        else
+          return {:code => 505, :result => "get_profile_name_from_imei: Function get_profile_name_by_id not returned profile. Invalid data in database and returned: #{res.to_s}"}
+        end
+
+      rescue
+        return {:code => 506, :result => "get_profile_name_from_imei: Function get_profile_name_by_id not processed correctly and returned: #{res.to_s}"}
+
+      end
+      begin
+        if res["profile"]!=nil
+          return {:code => 200, :result => "get_profile_name_from_imei: Request completed successfully", :body => res}
+        end
+      rescue
+        return {:code => 506, :result => "get_profile_name_from_imei: Function get_profile_name_by_id not processed correctly and returned: #{res.to_s}"}
+      end
+    rescue
+      return {:code => 507, :result => "get_profile_name_from_imei: Unknown SDK error"}
+    end
+
   end
 
 
   def device_remove_single_mongo(imei)
 
-      collection = client[:device_imei]
-      doc = {
-          "imei" => imei
-      }
-      result = collection.delete_many(doc)
-      p result
+    collection = client[:device_imei]
+    doc = {
+        "imei" => imei
+    }
+    result = collection.delete_many(doc)
+    p result
   end
 
-  def device_modify_attr_mongo(imei,address)
+  def device_modify_attr_mongo(imei, address)
     begin
       collection = client[:device_imei]
       doc = {
           "imei" => imei
       }
-      sett = {'$set' => { address: address}}
+      sett = {'$set' => {address: address}}
       result = collection.update_one(doc, sett)
       p result
     rescue
@@ -193,7 +270,7 @@ class MongoIot
     end
   end
 
-  def device_modify_any_attr_mongo(imei,attr_list)
+  def device_modify_any_attr_mongo(imei, attr_list)
     begin
       collection = client[:device_imei]
       doc = {
@@ -208,8 +285,6 @@ class MongoIot
   end
 
 
-
-
   def ttt
     p "111111"
     begin
@@ -220,7 +295,7 @@ class MongoIot
       collection = client[:audit]
       doc = {
           name: 'Steve',
-          hobbies: [ 'hiking', 'tennis', 'fly fishing' ],
+          hobbies: ['hiking', 'tennis', 'fly fishing'],
           siblings: {
               brothers: 0,
               sisters: 1
@@ -235,6 +310,5 @@ class MongoIot
     end
 
 
-
   end
 end

data/lib/imperituroard/version.rb

@@ -1,3 +1,3 @@
 module Imperituroard
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imperituroard
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Dzmitry Buynovskiy
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ipaddr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Gem from imperituroard for different actions
 email:
 - imperituro.ard@gmail.com
@@ -130,6 +144,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".idea/runConfigurations/hua_oceanconnect_adapter.xml"
 - ".ruby-gemset"
 - ".ruby-version"
 - ".travis.yml"
@@ -145,6 +160,7 @@ files:
 - lib/imperituroard.rb
 - lib/imperituroard/phpipamcps.rb
 - lib/imperituroard/phpipamdb.rb
+- lib/imperituroard/projects/iot/add_functions.rb
 - lib/imperituroard/projects/iot/hua_oceanconnect_adapter.rb
 - lib/imperituroard/projects/iot/mongoconnector.rb
 - lib/imperituroard/projects/wttx/updatepostcps.rb