imperituroard 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c0fda89d8d4dce075e1e6c585c059da9afe3782
-  data.tar.gz: 64255d9787029c2dda3740d9d8ad981128827ee7
+  metadata.gz: 162e6e937083e7f1307a970dde31e6f1e32361cc
+  data.tar.gz: 2cbd8b609bc29adee176e4f655c32884b470bb06
 SHA512:
-  metadata.gz: a837fc1af4aded8b465c40178af7ec517c391bbbd4d4b33a133307fdf232c35b24787769d601651f718bf7f67630538279a3a4fc85d5e60b7fb5973e9c655a8b
-  data.tar.gz: 7d8a3702b72ca270dc791b4d4c1c176a1dd950e705bf06aca1c5fe0f2c11e20eda63fbaa3cdfc7e9f93608d8d308c3c8a1a8bc2a498a3a74da99a484598db241
+  metadata.gz: 67208ee0587648aca3539642c80cff0bc3588a3dae78e9ee6cc4f58d6f2228e2c9044f1b45e89263f6090becc65f860fab664eda5862e650ea5634577994b9ed
+  data.tar.gz: 833d138815a513d483ad4a154d13a168fe17f1e993f87fdf6a5b2d0278c024c2cbe6972f8504e538855c48cab12b46a882e5a318cda181d7ea2ba928dc481dad

data/imperituroard.gemspec

@@ -28,13 +28,13 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "2.1.4"
-  spec.add_development_dependency "rake", ">= 12.3.3"
+  spec.add_development_dependency "rake", "13.0.1"
   spec.add_development_dependency "net-ssh", '4.0.1'
   spec.add_development_dependency "mysql2", "0.4.10"
   spec.add_development_dependency "savon", "2.12.0"
   spec.add_development_dependency "json", "2.3.0"
   #spec.add_development_dependency "uri"
   spec.add_development_dependency "mongo", "2.11.4"
-  spec.add_development_dependency "nokogiri"
-  spec.add_development_dependency "ipaddr"
+  spec.add_development_dependency "nokogiri", "1.10.9"
+  spec.add_development_dependency "ipaddr", "1.2.2"
 end

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

@@ -31,4 +31,86 @@ class AdditionalFunc
       return {:code => 507, :result => "Unknown SDK error"}
     end
   end
+
+
+  def answ_dev_query_format_process(dev_list)
+    dataaa_ok = []
+    dataaa_failed = []
+    final_answ = {}
+
+    begin
+      if dev_list[:approved_list]!=[]
+        for i in dev_list[:approved_list][:body]
+          begin
+            imei =0
+            imsi =0
+            msisdn =0
+            description ="nil"
+            note ="nil"
+            type ="nil"
+            profile ="nil"
+            address ="nil"
+
+            if i.key?("imei")
+              imei=i["imei"]
+            end
+            if i.key?("imsi")
+              imsi=i["imsi"]
+            end
+            if i.key?("msisdn")
+              msisdn=i["msisdn"]
+            end
+            if i.key?("description")
+              if i["description"] == nil
+                description="nil"
+              else
+                description=i["description"]
+              end
+            end
+            if i.key?("note")
+              if i["note"] == nil
+                note="nil"
+              else
+                note=i["note"]
+              end
+            end
+            if i.key?("type")
+              type=i["type"]
+            end
+            if i.key?("profile")
+              profile=i["profile"]
+            end
+            if i.key?("address")
+              address=i["address"]
+            end
+            dataaa_ok.append({:imei => imei,
+                              :imsi => imsi,
+                              :msisdn => msisdn,
+                              :description => description,
+                              :note => note,
+                              :type => type,
+                              :profile => profile,
+                              :address => address})
+          rescue
+            dataaa_failed.append(i[:imei])
+          end
+        end
+      end
+
+
+      begin
+        for i in dev_list[:unapproved_list]
+          dataaa_failed.append(i[:imei])
+        end
+      rescue
+        nil
+      end
+
+      final_answ = {:ok => dataaa_ok, :failed => dataaa_failed}
+      {:code => 200, :result => "Request completed successfully", :body => final_answ}
+    rescue
+      {:code => 507, :result => "Unknown SDK error", :body => {}}
+    end
+
+  end
 end

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

@@ -212,6 +212,29 @@ class HuaIot
     {:code => res.code, :message => res.message, :body => JSON.parse(res.body.to_s)}
   end
 
+
+  #2.9.6 Querying Directly Connected Devices and Their Mounted Devices in Batches
+  def quer_dev_direct_conn_batches(app_id, secret, dev_list)
+    token = get_token(app_id, secret)[:body]["accessToken"]
+    path = "/iocm/app/dm/v1.1.0/queryDevicesByIds"
+    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.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    request = Net::HTTP::Post.new(uri.path)
+    request.content_type = 'application/json'
+    request['Authorization'] = 'Bearer ' + token
+    request['app_key'] = app_id
+    request.body = {deviceIds: dev_list}.to_json
+    res = https.request(request)
+    {:code => res.code, :message => res.message, :body => JSON.parse(res.body.to_s)}
+  end
+
+
+
   def test()
 
     url_string = "https://134.17.93.4:8743/iocm/app/sec/v1.1.0/login"

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

@@ -41,6 +41,7 @@ class MongoIot
   #{:code => 200, :result => "Request completed successfully", :body => result_ps}
   def get_profiles_by_login(login)
     begin
+      p "get_profiles_by_login get_profiles_by_login"
       login_profiles = []
       req2 = []
       result_ps = []
@@ -49,13 +50,19 @@ class MongoIot
       collection.find({:login => login}).each {|row|
         login_profiles = row["permit_profiles"]
       }
-      for i in login_profiles
-        req2.append({:profile_id => i})
+      p login_profiles
+      if login_profiles !=[]
+        for i in login_profiles
+          req2.append({:profile_id => i})
+        end
+        collection2.find({:$or => req2}, {:_id => 0}).each {|row|
+          result_ps.append(row)
+        }
+        return {:code => 200, :result => "Request completed successfully", :body => result_ps}
+      else
+        return {:code => 404, :result => "Access denied. Incorrect login"}
       end
-      collection2.find({:$or => req2}, {:_id => 0}).each {|row|
-        result_ps.append(row)
-      }
-      return {:code => 200, :result => "Request completed successfully", :body => result_ps}
+
     rescue
       return {:code => 507, :result => "Unknown SDK error"}
     end
@@ -112,6 +119,11 @@ class MongoIot
     get_login_info = get_profiles_by_login(login)
     p "get_login_info"
     p get_login_info
+
+    if get_login_info[:code]==200
+
+
+
     dst_profile = get_profile_id_by_name(profile)
     p "dst_profile"
     p dst_profile
@@ -134,7 +146,10 @@ class MongoIot
         return {:code => 501, :result => "Profile not found"}
       end
     else
-      {:code => 500, :result => "Login not found"}
+      return {:code => 500, :result => "Access denied. Login not found"}
+    end
+    else
+      {:code => 500, :result => "Access denied. Login not found"}
     end
   end
 

data/lib/imperituroard/version.rb

@@ -1,3 +1,3 @@
 module Imperituroard
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/lib/imperituroard.rb

@@ -204,7 +204,9 @@ class Iot
           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]
+              permiss1 = mongo_client.check_login_profile_permiss(login, prof_name1[:body]["profile"])
+              p "permiss1"
+              p permiss1
               if permiss1==200
                 ime_list_approved.append(t)
               else
@@ -447,13 +449,10 @@ class Iot
   #newdevice_list=[{:imei=>7967843245665, :attributes=>{:address=>"Golubeva51", :profile=>"wqeqcqeqwev", :msisdn=>375298766719, :imsi=>25702858586756875}}]
   #+
   def add_service(login, device_list, remote_ip)
-
     resp_out = {}
-
     not_processed = []
     processed = []
 
-
     input_json = {:login => login, :devices => device_list}
 
     begin
@@ -525,6 +524,16 @@ class Iot
   end
 
 
+  def answ_dev_query_format_process(dev_list)
+    add_functions_connector.answ_dev_query_format_process(dev_list)
+  end
+
+
+  def logger_to_audit_database(proc_name, src_ip, input_json, output_json)
+    mongo_client.audit_logger(proc_name, src_ip, input_json, output_json)
+  end
+
+
   def test()
     ddd = MongoIot.new(mongoip, mongoport, mongo_database)
     #ddd.get_profiles_by_login("test")
@@ -547,7 +556,13 @@ class Iot
     list = ["41c0ba82-d771-4669-b766-fcbfbedc17f4", "7521234165452", "feb9c4d1-4944-4b04-a717-df87dfde30f7", "9868e121-c309-4f4f-8ab3-0aa69072caff", "b3b82f35-0723-4a83-90af-d4ea40017194"]
     #p ddd1.querying_device_direct_conn("Cd1v0k2gTBCbpQlMVlW1FVqOSqga", "kbfo5JlBxTIhjVwtjHleWS5Iw5wa", list)
     #p ddd1.querying_device_type_list("Cd1v0k2gTBCbpQlMVlW1FVqOSqga", "kbfo5JlBxTIhjVwtjHleWS5Iw5wa")
-    p ddd1.querying_device_id("Cd1v0k2gTBCbpQlMVlW1FVqOSqga", "kbfo5JlBxTIhjVwtjHleWS5Iw5wa", "7521234165452")
+    #p ddd1.querying_device_id("Cd1v0k2gTBCbpQlMVlW1FVqOSqga", "kbfo5JlBxTIhjVwtjHleWS5Iw5wa", "7521234165452")
+    #p ddd1.dev_register_verif_code_mode("Cd1v0k2gTBCbpQlMVlW1FVqOSqga", "kbfo5JlBxTIhjVwtjHleWS5Iw5wa", "12321234545345")
+
+    p ddd1.quer_dev_direct_conn_batches("Cd1v0k2gTBCbpQlMVlW1FVqOSqga", "kbfo5JlBxTIhjVwtjHleWS5Iw5wa", ["62c5f5ef-dead-48bf-9f09-292ca5e41577", "4c763ea1-be51-4eff-81db-863bc04791bb"])
+
+    #ddd1.querying_device_info("Cd1v0k2gTBCbpQlMVlW1FVqOSqga", "kbfo5JlBxTIhjVwtjHleWS5Iw5wa", "c6e0dfb1-8042-472a-a35d-e984f118d2a6")
+
     #ddd1.dev_delete("Cd1v0k2gTBCbpQlMVlW1FVqOSqga", "kbfo5JlBxTIhjVwtjHleWS5Iw5wa", "484114f6-a49c-4bab-88e6-4ddaf1cc1c8f")
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imperituroard
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Dzmitry Buynovskiy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-09 00:00:00.000000000 Z
+date: 2020-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,16 +28,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: 13.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: 13.0.1
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -112,30 +112,30 @@ dependencies:
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.10.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.10.9
 - !ruby/object:Gem::Dependency
   name: ipaddr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.2
 description: Gem from imperituroard for different actions
 email:
 - imperituro.ard@gmail.com