imperituroard 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7099d271ae8850c9fe1799ef6a1aa26191a8041
-  data.tar.gz: aa800c9ed06865ae2e11b6e46441208c98763273
+  metadata.gz: 52002c225cdd8a15b12f2d30c3bd9abbb7c81cdb
+  data.tar.gz: '098b0b33d5bdfb45f0b0912c9f5d882cf06a9278'
 SHA512:
-  metadata.gz: 2d81c1af75860e3815ee8e258bdaeacb3ac68f85086ff4a4a5cb20dd1304dbf924a51c9a6458ce15991c4ad6d8fea2f0e67f12d07375ff094a23ce88410caf87
-  data.tar.gz: 35036f5a002e190af58383c5e85e0d93213954c959de3801ac0a86703419940e4aa0b6c6fd832c0f1850617a9f86c65aa3563e79cd5fa1beb1b62f93e0f9b424
+  metadata.gz: 885ae1c34b6f201e8f77a2ea0f0a21852c0b95a37f4c01e9394ad63892264c4070e79ff0d20103b452eb54c2651ed1d1a424182a18feb282973cf697f9f2bb9a
+  data.tar.gz: 56cc1e2a934b2cd1b8be4d83794838daa358d27939fb27eb3fda9a463a485639c3409d275a9ef8d8735674f429ceafe521f439015d2d5d5a6d7f3d9bb9c94b55

data/imperituroard.gemspec

@@ -36,5 +36,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "mongo", "2.11.4"
   spec.add_development_dependency "nokogiri", "1.10.9"
   spec.add_development_dependency "ipaddr", "1.2.2"
+  spec.add_development_dependency "simpleidn", "0.1.1"
+  spec.add_development_dependency "net-scp", "3.0.0"
+
+
 
 end

data/lib/imperituroard.rb

@@ -3,8 +3,10 @@ $LOAD_PATH.unshift File.expand_path("../projects/wttx", __dir__)
 $LOAD_PATH.unshift File.expand_path("../projects/mhub", __dir__)
 $LOAD_PATH.unshift File.expand_path("../projects/mhub/subs/dabrab", __dir__)
 $LOAD_PATH.unshift File.expand_path("../platforms/cps", __dir__)
+$LOAD_PATH.unshift File.expand_path("../platforms/public", __dir__)
 $LOAD_PATH.unshift File.expand_path("../projects", __dir__)
 
+
 require "imperituroard/version"
 require "imperituroard/projects/wttx/phpipamdb"
 require "imperituroard/projects/wttx/phpipamcps"
@@ -18,7 +20,9 @@ require 'imperituroard/projects/mhub/subs/dabrab/dabrab_proced'
 require 'imperituroard/projects/mhub/subs/dabrab/dabrab_platform'
 require 'imperituroard/projects/mhub'
 require 'imperituroard/projects/iot'
+require 'imperituroard/projects/dns'
 require 'imperituroard/platforms/cps/qps_connector'
+require 'imperituroard/platforms/public/telegram'
 require 'json'
 require 'ipaddr'
 require 'date'
@@ -249,6 +253,10 @@ class Iot
     mongo_client.audit_logger(proc_name, src_ip, input_json, output_json, real_ip)
   end
 
+  def test111
+    iot_connector.test
+  end
+
 
 end
 
@@ -269,12 +277,12 @@ class Mhub_2
     @sk_login = sk_login
     @sk_password = sk_password
     @internal_func = InternalFunc.new
-    @mhub_connector = Sksk_1.new(sk_url_simple, sk_login, sk_password, sk_url_broadcast)
+    @mhub_connector = Sksk_2.new(sk_url_simple, sk_login, sk_password, sk_url_broadcast, telegram_api_url, telegram_chat_id)
     @internal_func = InternalFunc.new
     @dabrab_connecter = Dabrab.new
-    @add_functions_connector = AdditionalFunc.new(telegram_api_url, telegram_chat_id)
+
     @static_callback = static_callback
-    @crm_connector = Crm_1.new(crm_callback_url, crm_login, crm_password)
+    @crm_connector = Crm_2.new(crm_callback_url, crm_login, crm_password, telegram_api_url, telegram_chat_id)
     @mhub_connector = MhubFunctions_2.new(sk_url_simple, sk_login, sk_password, telegram_api_url, telegram_chat_id, sk_url_broadcast, static_callback, crm_callback_url, crm_login, crm_password)
   end
 
@@ -298,6 +306,8 @@ class Mhub_2
     mhub_connector.rec_deliv_report_2(params, ip_src, ip_real, ip_vip)
   end
 
+
+
 end
 
 
@@ -319,4 +329,47 @@ class CpsFunctions_2
     qps_connector.get_subscriber_msisdn(msisdn)
   end
 
+end
+
+
+class Ukaz60Automation_2
+
+  attr_accessor :dns
+
+  def initialize(telegram_api_url,
+                 telegram_chat_id,
+                 work_directory,
+                 filename_blocked,
+                 filename_tmp_blocked,
+                 ip_for_redirect,
+                 add_bl_memory_script,
+                 del_bl_memory_script,
+                 dns_login,
+                 dns_password,
+                 belgim_login,
+                 belgim_password,
+                 belgim_url)
+    @ukaz69_dns_func = Dns_2.new(telegram_api_url,
+                                 telegram_chat_id,
+                                 work_directory,
+                                 filename_blocked,
+                                 filename_tmp_blocked,
+                                 ip_for_redirect,
+                                 add_bl_memory_script,
+                                 del_bl_memory_script,
+                                 dns_login,
+                                 dns_password,
+                                 belgim_login,
+                                 belgim_password,
+                                 belgim_url)
+  end
+
+
+  def test
+
+  end
+
+
+
+
 end

data/lib/imperituroard/platforms/public/telegram.rb

@@ -0,0 +1,34 @@
+
+
+
+class Telegram_2
+
+  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/dns.rb

@@ -0,0 +1,44 @@
+require 'imperituroard/projects/dns/ukaz60/dns_update'
+
+
+class Dns_2
+
+  attr_accessor :ukaz69_dns_func
+
+  def initialize(telegram_api_url,
+                 telegram_chat_id,
+                 work_directory,
+                 filename_blocked,
+                 filename_tmp_blocked,
+                 ip_for_redirect,
+                 add_bl_memory_script,
+                 del_bl_memory_script,
+                 dns_login,
+                 dns_password,
+                 belgim_login,
+                 belgim_password,
+                 belgim_url)
+
+    @ukaz69_dns_func = Ukaz60Dns_2.new(telegram_api_url,
+                                       telegram_chat_id,
+                                       work_directory,
+                                       filename_blocked,
+                                       filename_tmp_blocked,
+                                       ip_for_redirect,
+                                       add_bl_memory_script,
+                                       del_bl_memory_script,
+                                       dns_login,
+                                       dns_password,
+                                       belgim_login,
+                                       belgim_password,
+                                       belgim_url)
+  end
+
+
+  def ukaz60_dns_autoupdate()
+
+  end
+
+
+
+end

data/lib/imperituroard/projects/dns/ukaz60/dns_update.rb

@@ -0,0 +1,415 @@
+
+require 'imperituroard/platforms/public/telegram'
+
+require 'simpleidn'
+require 'net/scp'
+require 'net/ssh'
+require 'ipaddr'
+require 'net/http'
+require 'json'
+require 'date'
+
+
+
+class Ukaz60Dns_2
+
+
+  attr_accessor :telegram_messanger,
+                :work_directory,
+                :filename_blocked,
+                :filename_tmp_blocked,
+                :ip_for_redirect,
+                :add_bl_memory_script,
+                :del_bl_memory_script,
+                :dns_login,
+                :dns_password,
+                :belgim_login,
+                :belgim_password,
+                :belgim_url,
+                :blo,
+                :unblo
+
+  def initialize(telegram_api_url,
+                 telegram_chat_id,
+                 work_directory,
+                 filename_blocked,
+                 filename_tmp_blocked,
+                 ip_for_redirect,
+                 add_bl_memory_script,
+                 del_bl_memory_script,
+                 dns_login,
+                 dns_password,
+                 belgim_login,
+                 belgim_password,
+                 belgim_url
+  )
+    @telegram_messanger = Telegram_2.new(telegram_api_url, telegram_chat_id)
+    @work_directory = work_directory
+    @filename_blocked = filename_blocked
+    @filename_tmp_blocked = filename_tmp_blocked
+    @ip_for_redirect = ip_for_redirect
+    @add_bl_memory_script = add_bl_memory_script
+    @del_bl_memory_script = del_bl_memory_script
+    @blo = 0
+    @unblo = 0
+  end
+
+
+
+  def gen_mem_script()
+
+    string = File.open(filename_blocked, 'r'){ |file| file.read }
+    redns = /local-zone: "(.+)" redirect/
+    m111 = string.scan(redns)
+
+    string = File.open(filename_tmp_blocked, 'r'){ |file| file.read }
+    m222 = string.scan(redns)
+
+
+    old = []
+    new = []
+    diff = []
+    diff2 = []
+
+    for iii in m111
+      new.push(iii[0])
+    end
+
+    for jjj in m222
+      old.push(jjj[0])
+    end
+
+    def difference(other)
+      h = other.each_with_object(Hash.new(0)) { |e,h| h[e] += 1 }
+      reject { |e| h[e] > 0 && h[e] -= 1 }
+    end
+
+    for dfdfd in new
+      if old.include?(dfdfd)
+      else
+        diff.push(dfdfd)
+      end
+    end
+
+    for dfdfd2 in old
+      if new.include?(dfdfd2)
+      else
+        diff2.push(dfdfd2)
+      end
+    end
+
+    file = File.open(add_bl_memory_script, "w")
+    for j in diff
+      a111 = 'unbound-control local_data ' + j + " A #{ip_for_redirect}"
+      a222 = 'unbound-control local_zone ' + j + ' redirect'
+      #print a1
+      file.puts(a111)
+      file.puts(a222)
+    end
+    file.close
+
+    file2 = File.open(del_bl_memory_script, "w")
+    for j in diff2
+      b111 = 'unbound-control local_zone_remove ' + j
+      b222 = 'unbound-control local_data_remove ' + j
+      #print a1
+      file2.puts(b111)
+      file2.puts(b222)
+    end
+    file2.close
+
+    p diff
+    p diff2
+
+
+    if diff != [] && @blo == 0
+      telegram_messanger.telegram_message("Domains for blocking: " + diff.to_s)
+      @blo = 1
+    end
+
+    if diff2 != [] && @unblo == 0
+      telegram_messanger.telegram_message("Domains for unblocking: " + diff2.to_s)
+      @unblo = 1
+    end
+
+
+    if diff == [] && diff2 == []
+      "compared"
+    else
+      "mismatch"
+    end
+
+  end
+
+
+  def dns_processe
+    a = "cruel world"
+    f = a.scan(/\w+/)
+
+    starttime = DateTime.now
+
+
+    comm = `curl -d "name=#{belgim_login}&pass=#{belgim_password}" -H "Content-Type: application/x-www-form-urlencoded" -X POST #{belgim_url}`
+
+    comm = comm.gsub!("\n","")
+
+#p comm
+
+#comm = comm.gsub!("\r","")
+
+#p comm
+
+    redns = /<dns>(.{1,100})dns>/
+    rednsurl = /<url>(.{1,100})url>/
+
+    m1 = comm.scan(redns)
+    m2 = []
+
+    f1 = comm.scan(rednsurl)
+    f2 =[]
+
+    results = {}
+
+    for i in m1
+      a1 = i[0]
+      elem = a1.gsub!("</","")
+
+      if elem.include? " "
+        elem = elem.gsub!(" ", "")
+      end
+
+
+      if elem.match(/а|б|в|г|д|е|ж|ё|Ё|з|и|й|к|л|м|н|о|п|р|с|т|у|ф|х|ц|ч|ш|щ|ь|ы|ъ|э|ю|я|А|Б|В|Г|Д|Е|Ж|З|И|Й|К|Л|М|Н|О|П|Р|С|Т|У|Ф|Х|Ц|Ч|Ш|Щ|Ь|Ы|Ъ|Э|Ю|Я/)
+        elem = SimpleIDN.to_ascii(elem)
+      end
+
+      p elem
+
+      if elem != "-"
+
+        m2.push(elem)
+
+        daaa = elem[0]+elem[1]+elem[2]+elem[3]
+
+        if daaa != "www."
+          m2.push("www."+elem)
+        end
+
+        if daaa == "www."
+          gar = elem[4..elem.length]
+          m2.push(gar)
+        end
+
+      end
+
+
+    end
+
+    p m2
+
+
+    for s in f1
+      a1 = s[0]
+
+
+      elem1 = a1.gsub!("</","")
+      elem2 =""
+
+      if elem1.include? "http://"
+        elem1.gsub!("http://", "")
+      end
+
+      if elem1.include? "http:/"
+        elem1.gsub!("http:/", "")
+      end
+
+
+      if elem1.include? "https://"
+        elem1.gsub!("https://", "")
+        if elem1.include?("/")
+          elem1=elem1.split("/")[0]
+        end
+      end
+
+      if elem1.include? " "
+        elem1 = elem1.gsub!(" ", "")
+      end
+
+      #p elem1
+
+      if elem1[elem1.size-1]=="/"
+        sss = elem1.size
+        elem1 = elem1[0..sss-2]
+      end
+
+      if !elem1.include? "/"
+        if elem1.match(/а|б|в|г|д|е|ж|ё|Ё|з|и|й|к|л|м|н|о|п|р|с|т|у|ф|х|ц|ч|ш|щ|ь|ы|ъ|э|ю|я|А|Б|В|Г|Д|Е|Ж|З|И|Й|К|Л|М|Н|О|П|Р|С|Т|У|Ф|Х|Ц|Ч|Ш|Щ|Ь|Ы|Ъ|Э|Ю|Я/)
+          elem1 = SimpleIDN.to_ascii(elem1)
+        end
+
+        if elem1 != "-" && elem1 != ""
+          m2.push(elem1)
+
+          p elem1
+
+
+          daaa2 = elem1[0]+elem1[1]+elem1[2]+elem1[3]
+
+          p daaa2
+
+
+
+
+          if daaa2 != "www."
+            m2.push("www."+elem1)
+          end
+
+          if daaa2 == "www."
+            gar1 = elem1[4..elem1.length]
+            m2.push(gar1)
+          end
+
+        end
+      end
+
+    end
+
+    m2 = m2.uniq
+
+
+
+    stringnunblo = File.open('/scripts/ruby/dns/nonblocked.conf', 'r'){ |file| file.read }
+
+    noblocked =  stringnunblo.split("\n")
+
+    m2 = m2 - noblocked
+
+
+    stringnunblo2 = File.open('/scripts/ruby/dns/manualblocked.conf', 'r'){ |file| file.read }
+    manualblocked =  stringnunblo2.split("\n")
+
+    m2 = m2 + manualblocked
+    m2 = m2.uniq
+
+    numblocked = m2.length
+    manualblockedlen = manualblocked.length
+    numblwithoutexcluded = m2.length
+    numnoblocked = noblocked.length
+
+
+    results.update({"numblocked" => numblocked, "numblwithoutexcluded"=>numblwithoutexcluded, "numnoblocked"=>numnoblocked, "manualblocked"=>manualblockedlen})
+
+    File.delete("blocked.conf") if File.exist?("blocked.conf")
+    File.delete("blocked_old.conf") if File.exist?("blocked_old.conf")
+
+    file = File.open("blocked.conf", "w")
+    for j in m2
+      a1 = 'local-zone: "' + j + '." redirect'
+      a2 = "local-data: \"" + j + ". IN A \"#{ip_for_redirect}\""
+      #print a1
+      file.puts(a1)
+      file.puts(a2)
+    end
+    file.close
+
+    dnses = [
+        "172.30.159.67",
+        "172.30.159.68",
+        "172.30.161.145",
+        "172.30.161.146",
+        "172.29.253.33",
+        "172.29.253.34",
+        "172.28.240.33",
+        "172.28.240.34",
+        "172.27.234.33",
+        "172.27.234.34",
+        "172.26.253.33",
+        "172.26.253.34",
+        "172.25.225.51",
+        "172.25.225.52",
+        "172.24.214.130",
+        "172.24.247.155",
+        "172.24.247.157"
+    ]
+
+    dnsnamess = {
+        "172.30.159.67" => "min26dns1",
+        "172.30.159.68" => "min26dns2",
+        "172.30.161.145" => "min26dns3",
+        "172.30.161.146" => "min26dns4",
+        "172.29.253.33" => "gro26dns1",
+        "172.29.253.34" => "gro26dns2",
+        "172.28.240.33" => "bre26dns1",
+        "172.28.240.34" => "bre26dns2",
+        "172.27.234.33" => "gom26dns1",
+        "172.27.234.34" => "gom26dns2",
+        "172.26.253.33" => "mog26dns1",
+        "172.26.253.34" => "mog26dns2",
+        "172.25.225.51" => "vit26dns1",
+        "172.25.225.52" => "vit26dns2",
+        "172.24.214.130" => "minsrv1",
+        "172.24.247.155" => "minsrv2",
+        "172.24.247.157" => "minsrv3"
+    }
+
+
+
+    for fa in dnses
+
+      Net::SCP.download!(fa, dns_login,
+                         "/usr/local/etc/unbound/blocked.conf", "blocked_old.conf",
+                         :ssh => { :password => dns_password })
+
+      ressss = gen_mem_script
+
+      if ressss == "mismatch"
+        Net::SCP.upload!(fa, dns_login,
+                         "blocked.conf", "/usr/local/etc/unbound/blocked.conf",
+                         :ssh => { :password => dns_password })
+
+        results.update({dnsnamess[fa] => "updated"})
+
+        Net::SCP.upload!(fa, dns_login,
+                         "add_bl_memory.sh", "/tmp/add_bl_memory.sh",
+                         :ssh => { :password => dns_password })
+
+        Net::SCP.upload!(fa, dns_login,
+                         "del_bl_memory.sh", "/tmp/del_bl_memory.sh",
+                         :ssh => { :password => dns_password })
+
+        Net::SSH.start(fa, dns_login, :password => dns_password) do |ssh|
+          sleep 4
+          result = ssh.exec!("sh /tmp/add_bl_memory.sh")
+          result2 = ssh.exec!("sh /tmp/del_bl_memory.sh")
+          #puts resul
+          #results.update({fa+"_stat" => result+"_"+result2})
+        end
+
+      else
+        results.update({dnsnamess[fa] => "compared"})
+      end
+
+    end
+
+    p results
+    p m2
+
+    endtime =DateTime.now
+
+    results.update({"scriptstart"=>starttime.to_s, "scriptend"=>endtime.to_s})
+
+    telegram_messanger.telegram_message(results.to_s)
+
+
+#File.delete("blocked.conf") if File.exist?("blocked.conf")
+#File.delete("blocked_old.conf") if File.exist?("blocked_old.conf")
+#File.delete("add_bl_memory.sh") if File.exist?("add_bl_memory.sh")
+
+  end
+
+
+end
+
+
+
+

data/lib/imperituroard/projects/iot.rb

@@ -975,7 +975,7 @@ class IotFunctions_2
   end
 
 
-  def test()
+  def test
     #ddd = MongoIot.new(mongoip, mongoport, mongo_database)
     #ddd.get_profiles_by_login("test")
 
@@ -984,10 +984,9 @@ class IotFunctions_2
 
     #p ddd.get_profile_id_by_name("1341241")
     #p ddd.get_device_type_info_by_model("BGT_PPMC11")
+    p "yyyyy"
 
     #fff = HuaIot.new("134.17.93.4", "443", "/Users/imperituroard/Desktop/cert.crt", "/Users/imperituroard/Desktop/key.pem")
-    p hua_aceanconnect_connector.querying_device_id("Cd1v0k2gTBCbpQlMVlW1FVqOSqga", "eWllZpHgXgvgDAQlJjWs4QXaR94a", "91234")
+    p hua_aceanconnect_connector.querying_device_id("Jy5KpoBUOScZEcrO2bRZhzfaIOUa", "VFFWTOb9k3_cQhzrGsRWT4HE8Z0a", "123456789876543")
   end
-
-
-end
+end

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

@@ -5,32 +5,14 @@ require 'json'
 
 class AdditionalFunc
 
-  attr_accessor :telegram_api_url, :telegram_chat_id
+  attr_accessor :telegram_api_url, :telegram_chat_id, :telegram_messanger
 
   def initialize(telegram_api_url, telegram_chat_id)
     @telegram_api_url = telegram_api_url
     @telegram_chat_id = telegram_chat_id
+    @telegram_messanger = Telegram_2.new(telegram_api_url, 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
 
   def answ_dev_query_format_process(dev_list)
     dataaa_ok = []

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

@@ -233,7 +233,7 @@ class HuaIot
   def querying_device_id(app_id, secret, node_id)
     token = get_token(app_id, secret)[:body]["accessToken"]
     p token
-    path = "/iocm/app/dm/v1.1.0/queryDeviceIdByNodeId?nodeId=" + node_id + "&appId=Cd1v0k2gTBCbpQlMVlW1FVqOSqga"
+    path = "/iocm/app/dm/v1.1.0/queryDeviceIdByNodeId?nodeId=" + node_id + "&appId=Jy5KpoBUOScZEcrO2bRZhzfaIOUa"
     p path
     p path
     url_string = "https://" + platformip + ":" + platformport + path

data/lib/imperituroard/projects/mhub.rb

@@ -22,19 +22,20 @@ class MhubFunctions_2
                 :internal_func,
                 :dabrab_connecter,
                 :static_callback,
-                :crm_connector
+                :crm_connector,
+                :telegram_connector
 
   def initialize(sk_url_simple, sk_login, sk_password, telegram_api_url, telegram_chat_id, sk_url_broadcast, static_callback, crm_callback_url, crm_login, crm_password)
     @sk_url = sk_url_simple
     @sk_login = sk_login
     @sk_password = sk_password
     @internal_func = InternalFunc.new
-    @mhub_connector = Sksk_1.new(sk_url_simple, sk_login, sk_password, sk_url_broadcast)
+    @mhub_connector = Sksk_2.new(sk_url_simple, sk_login, sk_password, sk_url_broadcast, telegram_api_url, telegram_chat_id)
     @internal_func = InternalFunc.new
     @dabrab_connecter = Dabrab.new
-    @add_functions_connector = AdditionalFunc.new(telegram_api_url, telegram_chat_id)
+    @telegram_connector = Telegram_2.new(telegram_api_url, telegram_chat_id)
     @static_callback = static_callback
-    @crm_connector = Crm_1.new(crm_callback_url, crm_login, crm_password)
+    @crm_connector = Crm_2.new(crm_callback_url, crm_login, crm_password, telegram_api_url, telegram_chat_id)
   end
 
 
@@ -110,7 +111,8 @@ class MhubFunctions_2
       output_params = {"code": 200, "result": "Data processed", "body": {"answer": mes_data[:body][:mess_to_recip], "sender": {"ip_src": ip_src, "ip_real": ip_real, "ip_vip": ip_vip}}}
 
     rescue
-      output_params = {"code": 500, "result": "Unknown SDK error", "body": {"answer": {}, "sender": {"ip_src": ip_src, "ip_real": ip_real, "ip_vip": ip_vip}}}
+      output_params = {"code": 500, "result": "MhubFunctions_2.get_send_message_2: Unknown SDK error", "body": {"answer": {}, "sender": {"ip_src": ip_src, "ip_real": ip_real, "ip_vip": ip_vip}}}
+      telegram_connector.telegram_message(output_params)
     end
 
     internal_func.printer_texter({:input => input_params, :output => output_params, :hub_resp => hub_resp, :procedure => "Mhub_2.get_send_message"}, "debug")
@@ -123,27 +125,17 @@ class MhubFunctions_2
     input_params = {:params => params, :ip_src => ip_src, :ip_real => ip_real, :ip_vip => ip_vip}
     output_params = {}
     hub_resp = {}
-    null_statement = [nil, "nil", "", "null"]
 
     begin
-
       mes_report = dabrab_connecter.delivery_report_transform(params)[:body][:report_to_recip]
-
-      p "mes_report"
-      p mes_report
-      p "mes_report"
-
       result = crm_connector.crm_status_1(mes_report)
-
       output_params = {"code": 200, "result": "Data processed", "body": {"answer": {"code": 200, "status": "Success"}, "sender": {"ip_src": ip_src, "ip_real": ip_real, "ip_vip": ip_vip}}}
-
     rescue
-      output_params = {"code": 500, "result": "Unknown SDK error", "body": {"answer": {}, "sender": {"ip_src": ip_src, "ip_real": ip_real, "ip_vip": ip_vip}}}
+      output_params = {"code": 500, "result": "MhubFunctions_2.rec_deliv_report_2: Unknown SDK error", "body": {"answer": {}, "sender": {"ip_src": ip_src, "ip_real": ip_real, "ip_vip": ip_vip}}}
+      telegram_connector.telegram_message(output_params)
     end
-
     internal_func.printer_texter({:input => input_params, :output => output_params, :hub_resp => hub_resp, :procedure => "Mhub_2.recieve_delivery_report"}, "debug")
     output_params
-
   end
 
 
@@ -153,5 +145,4 @@ class MhubFunctions_2
   end
 
 
-
 end

data/lib/imperituroard/projects/mhub/sk.rb

@@ -1,15 +1,16 @@
 require 'imperituroard/projects/iot/internal_functions'
 
-class Sksk_1
+class Sksk_2
 
-  attr_accessor :sk_url, :sk_url_broadcast, :sk_login, :sk_password, :internal_func
+  attr_accessor :sk_url, :sk_url_broadcast, :sk_login, :sk_password, :internal_func, :telegram_connector
 
-  def initialize(sk_url, sk_login, sk_password, sk_url_broadcast)
+  def initialize(sk_url, sk_login, sk_password, sk_url_broadcast, telegram_api_url, telegram_chat_id)
     @sk_url = sk_url
     @sk_login = sk_login
     @sk_password = sk_password
     @internal_func = InternalFunc.new
     @sk_url_broadcast = sk_url_broadcast
+    @telegram_connector = Telegram_2.new(telegram_api_url, telegram_chat_id)
   end
 
 
@@ -38,7 +39,7 @@ class Sksk_1
 
         request_message = {
             "phone_number": msisdn,
-            "extra_id": "4232j4h89932kjhs",
+            #"extra_id": "4232j4h89932kjhs",
             "callback_url": callback_url,
             #"start_time": "2019-08-16 09:59:10",
             "tag": "Dabrab_custom_api_1",
@@ -57,7 +58,7 @@ class Sksk_1
         req.body = request_message.to_json
         res = https.request(req)
         output_params = {:code => 200,
-                         :result => "Sksk_1.sk_send_sms_one: Request processed",
+                         :result => "Sksk_2.sk_send_sms_one: Request processed",
                          :body => {:request_message => request_message,
                                    :res_code => res.code,
                                    :res_body => JSON.parse(res.body.to_s)}}
@@ -66,7 +67,8 @@ class Sksk_1
       thr_sk_send_sms_one.join
 
     rescue
-      output_params = {:code => 500, :result => "Sksk_1.sk_send_sms_one: Something wrong", :body => {:request_message => request_message}}
+      output_params = {:code => 500, :result => "Sksk_2.sk_send_sms_one: Something wrong", :body => {:request_message => request_message}}
+      telegram_connector.telegram_message(output_params)
     end
     internal_func.printer_texter({:input => input_params, :output => output_params, :procedure => "Sksk_1.sk_send_sms_one"}, "debug")
     output_params
@@ -99,7 +101,7 @@ class Sksk_1
 
         request_message = {
             "phone_number": msisdn,
-            "extra_id": "4232j4h89932kjhs",
+            #"extra_id": "4232j4h89932kjhs",
             "callback_url": callback_url,
             #"start_time": "2019-08-16 09:59:10",
             "tag": "Dabrab_custom_api_1",
@@ -119,7 +121,7 @@ class Sksk_1
         req.body = request_message.to_json
         res = https.request(req)
         output_params = {:code => 200,
-                         :result => "Sksk_1.sk_send_viber_one: Request processed",
+                         :result => "Sksk_2.sk_send_viber_one: Request processed",
                          :body => {:request_message => request_message,
                                    :res_code => res.code,
                                    :res_body => JSON.parse(res.body.to_s)}}
@@ -130,9 +132,10 @@ class Sksk_1
 
 
     rescue
-      output_params = {:code => 500, :result => "Sksk_1.sk_send_viber_one: Something wrong"}
+      output_params = {:code => 500, :result => "Sksk_2.sk_send_viber_one: Something wrong"}
+      telegram_connector.telegram_message(output_params)
     end
-    internal_func.printer_texter({:input => input_params, :output => output_params, :procedure => "Sksk_1.sk_send_viber_one"}, "debug")
+    internal_func.printer_texter({:input => input_params, :output => output_params, :procedure => "Sksk_2.sk_send_viber_one"}, "debug")
     output_params
   end
 
@@ -161,7 +164,7 @@ class Sksk_1
 
         request_message = {
             "phone_number": msisdn,
-            "extra_id": "4232j4h89932kjhs",
+            #"extra_id": "4232j4h89932kjhs",
             "callback_url": callback_url,
             #"start_time": "2019-08-16 09:59:10",
             "tag": "Dabrab_custom_api_1",
@@ -189,7 +192,7 @@ class Sksk_1
         res = https.request(req)
 
         output_params = {:code => 200,
-                         :result => "Sksk_1.sk_send_viber_sms_one: Request processed",
+                         :result => "Sksk_2.sk_send_viber_sms_one: Request processed",
                          :body => {:request_message => request_message,
                                    :res_code => res.code,
                                    :res_body => JSON.parse(res.body.to_s)}}
@@ -199,9 +202,10 @@ class Sksk_1
       thr_sk_send_viber_sms_one.join
 
     rescue
-      output_params = {:code => 500, :result => "Sksk_1.sk_send_viber_sms_one: Something wrong"}
+      output_params = {:code => 500, :result => "Sksk_2.sk_send_viber_sms_one: Something wrong"}
+      telegram_connector.telegram_message(output_params)
     end
-    internal_func.printer_texter({:input => input_params, :output => output_params, :procedure => "Sksk_1.sk_send_viber_sms_one"}, "debug")
+    internal_func.printer_texter({:input => input_params, :output => output_params, :procedure => "Sksk_2.sk_send_viber_sms_one"}, "debug")
     output_params
 
   end
@@ -251,7 +255,7 @@ class Sksk_1
         res = https.request(req)
 
         output_params = {:code => 200,
-                         :result => "Sksk_1.sk_send_sms_list: Request processed",
+                         :result => "Sksk_2.sk_send_sms_list: Request processed",
                          :body => {:request_message => request_message,
                                    :res_code => res.code,
                                    :res_body => JSON.parse(res.body.to_s)}}
@@ -260,9 +264,10 @@ class Sksk_1
       thr_sk_send_sms_list.join
 
     rescue
-      output_params = {:code => 500, :result => "Sksk_1.sk_send_sms_list: Something wrong"}
+      output_params = {:code => 500, :result => "Sksk_2.sk_send_sms_list: Something wrong"}
+      telegram_connector.telegram_message(output_params)
     end
-    internal_func.printer_texter({:input => input_params, :output => output_params, :procedure => "Sksk_1.sk_send_sms_list"}, "debug")
+    internal_func.printer_texter({:input => input_params, :output => output_params, :procedure => "Sksk_2.sk_send_sms_list"}, "debug")
     output_params
   end
 
@@ -310,16 +315,17 @@ class Sksk_1
         res = https.request(req)
 
         output_params = {:code => 200,
-                         :result => "Sksk_1.sk_send_viber_list: Request processed",
+                         :result => "Sksk_2.sk_send_viber_list: Request processed",
                          :body => {:request_message => request_message,
                                    :res_code => res.code,
                                    :res_body => JSON.parse(res.body.to_s)}}
       end
       thr_sk_send_viber_list.join
     rescue
-      output_params = {:code => 500, :result => "Sksk_1.sk_send_viber_list: Something wrong"}
+      output_params = {:code => 500, :result => "Sksk_2.sk_send_viber_list: Something wrong"}
+      telegram_connector.telegram_message(output_params)
     end
-    internal_func.printer_texter({:input => input_params, :output => output_params, :procedure => "Sksk_1.sk_send_viber_list"}, "debug")
+    internal_func.printer_texter({:input => input_params, :output => output_params, :procedure => "Sksk_2.sk_send_viber_list"}, "debug")
     output_params
   end
 
@@ -371,7 +377,7 @@ class Sksk_1
         res = https.request(req)
 
         output_params = {:code => 200,
-                         :result => "Sksk_1.sk_send_viber_sms_list: Request processed",
+                         :result => "Sksk_2.sk_send_viber_sms_list: Request processed",
                          :body => {:request_message => request_message,
                                    :res_code => res.code,
                                    :res_body => JSON.parse(res.body.to_s)}}
@@ -380,9 +386,10 @@ class Sksk_1
       thr_sk_send_viber_sms_list.join
 
     rescue
-      output_params = {:code => 500, :result => "Sksk_1.sk_send_viber_sms_list: Something wrong"}
+      output_params = {:code => 500, :result => "Sksk_2.sk_send_viber_sms_list: Something wrong"}
+      telegram_connector.telegram_message(output_params)
     end
-    internal_func.printer_texter({:input => input_params, :output => output_params, :procedure => "Sksk_1.sk_send_viber_sms_list"}, "debug")
+    internal_func.printer_texter({:input => input_params, :output => output_params, :procedure => "Sksk_2.sk_send_viber_sms_list"}, "debug")
     output_params
   end
 

data/lib/imperituroard/projects/mhub/subs/dabrab/dabrab_platform.rb

@@ -1,18 +1,19 @@
 require 'imperituroard/projects/iot/internal_functions'
 
 
-class Crm_1
+class Crm_2
 
-  attr_accessor :crm_callback_url, :crm_login, :crm_password, :internal_func
+  attr_accessor :crm_callback_url, :crm_login, :crm_password, :internal_func, :telegram_connector
 
-  def initialize(crm_callback_url, crm_login, crm_password)
+  def initialize(crm_callback_url, crm_login, crm_password, telegram_api_url, telegram_chat_id)
     @crm_callback_url = crm_callback_url
     @crm_login = crm_login
     @crm_password = crm_password
     @internal_func = InternalFunc.new
+    @telegram_connector = Telegram_2.new(telegram_api_url, telegram_chat_id)
   end
 
-  def crm_status_1(crm_payload)
+  def crm_status_2(crm_payload)
 
     input_params = {:crm_payload => crm_payload}
     output_params = {}
@@ -20,7 +21,7 @@ class Crm_1
 
     begin
 
-      thr_crm_status_1 = Thread.new do
+      thr_crm_status_2 = Thread.new do
         uri = URI(crm_callback_url)
         #8 - client id
 
@@ -37,18 +38,19 @@ class Crm_1
         req.body = crm_payload.to_json
         res = https.request(req)
         output_params = {:code => 200,
-                         :result => "Crm_1.crm_status_1: Request processed",
+                         :result => "Crm_2.crm_status_2: Request processed",
                          :body => {:request_message => crm_payload,
                                    :res_code => res.code,
                                    :res_body => JSON.parse(res.body.to_s)}}
         p res.body
       end
-      thr_crm_status_1.join
+      thr_crm_status_2.join
 
     rescue
-      output_params = {:code => 500, :result => "Crm_1.crm_status_1: Something wrong", :body => {:request_message => request_message}}
+      output_params = {:code => 500, :result => "Crm_2.crm_status_2: Something wrong", :body => {:request_message => request_message}}
+      telegram_connector.telegram_message(output_params)
     end
-    internal_func.printer_texter({:input => input_params, :output => output_params, :procedure => "Crm_1.crm_status_1"}, "debug")
+    internal_func.printer_texter({:input => input_params, :output => output_params, :procedure => "Crm_2.crm_status_2"}, "debug")
     output_params
 
   end

data/lib/imperituroard/projects/mhub/subs/dabrab/dabrab_proced.rb

@@ -1,27 +1,26 @@
-
-
-
 class Dabrab
 
-def num_formatter(infobip_msisdn, extra_id)
-  #[{"to"=>{"phoneNumber"=>"375297116638", "emailAddress"=>nil}}]
-  # [{"phone_number": 375298766719}, {"phone_number": 375295730878}]
+  def num_formatter(infobip_msisdn, extra_id)
+    #[{"to"=>{"phoneNumber"=>"375297116638", "emailAddress"=>nil}}]
+    # [{"phone_number": 375298766719}, {"phone_number": 375295730878}]
 
-  converted_msisdn_list = []
+    converted_msisdn_list = []
+
+    for g in infobip_msisdn
+      begin
+        converted_msisdn_list.append({
+                                         "phone_number": g["to"]["phoneNumber"].to_i
+                                         #"extra_id": extra_id
+                                     })
+      rescue
+        p "failed: #{g.to_s}"
+      end
 
-  for g in infobip_msisdn
-    begin
-    converted_msisdn_list.append({"phone_number": g["to"]["phoneNumber"].to_i, "extra_id": extra_id})
-    rescue
-      p "failed: #{g.to_s}"
     end
+    p converted_msisdn_list
+    converted_msisdn_list
 
   end
-  p converted_msisdn_list
-
-  converted_msisdn_list
-
-end
 
 
   def send_responce_formatter(hub_answer)
@@ -45,18 +44,29 @@ end
     }
 
     p "send_responce_formatter(hub_answer)"
-
     p hub_answer
 
     for a in hub_answer[:body][:res_body]["messages"]
-      s1 = {"to": {"phoneNumber": a["phone_number"]}, "status": {"groupId": 1,
-                                                "groupName": "PENDING",
-                                                "id": 26,
-                                                "name": "MESSAGE_ACCEPTED",
-                                                "description": "Message sent to next instance"},
-            "messageId": a["message_id"]}
-
-      messages_sect.append(s1)
+      status1 = {}
+      if a["processed"] == true && a["accepted"] == true
+        status1 = {"to": {"phoneNumber": a["phone_number"]},
+              "status": {"groupId": 1,
+                         "groupName": "PENDING",
+                         "id": 26,
+                         "name": "MESSAGE_ACCEPTED",
+                         "description": "Message sent to next instance"},
+              "messageId": a["message_id"]}
+      else
+        status1 = {"to": {"phoneNumber": a["phone_number"]},
+              "status": {"groupId": 5,
+                         "groupName": "REJECTED",
+                         "id": 21,
+                         "name": "REJECTED_SYSTEM_ERROR",
+                         "description": "Unknown error"},
+              "messageId": a["message_id"]}
+      end
+
+      messages_sect.append(status1)
     end
 
     p messages_sect
@@ -66,21 +76,32 @@ end
   end
 
 
-
   def delivery_report_transform(hub_report)
 #{"number"=>"375297116638", "time"=>1588673492000, "status"=>2, "substatus"=>23, "msg_status"=>23033, "message_id"=>"486649ba-a573-4ee9-8f58-018ed20ca6fd", "extra_id"=>"444/0/ServiceModel/ScGetReports.svc/GetReports", "sent_via"=>"viber", "controller"=>"reports", "action"=>"delivery", "report"=>{"number"=>"375297116638", "time"=>1588673492000, "status"=>2, "substatus"=>23, "msg_status"=>23033, "message_id"=>"486649ba-a573-4ee9-8f58-018ed20ca6fd", "extra_id"=>"444/0/ServiceModel/ScGetReports.svc/GetReports", "sent_via"=>"viber"}}
-
     p hub_report
     p "hub_report"
-
     data_for_status = {
-
         23011 => {:status_id => 5, :status_grid => 3, :status_grname => "DELIVERED", :status_name => "DELIVERED_TO_HANDSET", :status_descr => "Message delivered by SMS",
-                    :error_id => 0, :error_grid => 0, :error_grname => "Ok", :error_name=> "NO_ERROR", :error_descr => "No Error", :error_permanent => false
+                  :error_id => 0, :error_grid => 0, :error_grname => "Ok", :error_name => "NO_ERROR", :error_descr => "No Error", :error_permanent => false
         },
         23033 => {:status_id => 5, :status_grid => 3, :status_grname => "DELIVERED", :status_name => "DELIVERED_TO_HANDSET", :status_descr => "Message delivered by Viber",
-                  :error_id => 0, :error_grid => 0, :error_grname => "Ok", :error_name=> "NO_ERROR", :error_descr => "No Error", :error_permanent => false
-        }
+                  :error_id => 0, :error_grid => 0, :error_grname => "Ok", :error_name => "NO_ERROR", :error_descr => "No Error", :error_permanent => false
+        },
+        35015 => {:status_id => 15, :status_grid => 4, :status_grname => "EXPIRED", :status_name => "EXPIRED_EXPIRED", :status_descr => "SMS Message TTL EXPIRED",
+                  :error_id => 6, :error_grid => 1, :error_grname => "HANDSET_ERRORS", :error_name => "EC_ABSENT_SUBSCRIBER_SM", :error_descr => "Subscriber is absent", :error_permanent => false
+        }, #message SMS expired
+        36463 => {:status_id => 15, :status_grid => 4, :status_grname => "EXPIRED", :status_name => "EXPIRED_EXPIRED", :status_descr => "Viber Message TTL EXPIRED",
+                  :error_id => 6, :error_grid => 1, :error_grname => "HANDSET_ERRORS", :error_name => "EC_ABSENT_SUBSCRIBER_SM", :error_descr => "Subscriber is absent.", :error_permanent => false
+        }, #message Viber expired
+        36010 => {:status_id => 4, :status_grid => 2, :status_grname => "UNDELIVERABLE", :status_name => "UNDELIVERABLE_REJECTED_OPERATOR", :status_descr => "SMS. Subscriber not exists",
+                  :error_id => 6, :error_grid => 1, :error_grname => "HANDSET_ERRORS", :error_name => "EC_UNKNOWN_SUBSCRIBER", :error_descr => "Subscriber not found.", :error_permanent => true
+        }, #SMS subscriber not exists
+        36131 => {:status_id => 4, :status_grid => 2, :status_grname => "UNDELIVERABLE", :status_name => "UNDELIVERABLE_REJECTED_OPERATOR", :status_descr => "SMS. Unknown subscriber",
+                  :error_id => 6, :error_grid => 1, :error_grname => "HANDSET_ERRORS", :error_name => "EC_UNKNOWN_SUBSCRIBER", :error_descr => "Subscriber not found.", :error_permanent => true
+        }, #SMS unknown subscriber
+        36505 => {:status_id => 4, :status_grid => 2, :status_grname => "UNDELIVERABLE", :status_name => "UNDELIVERABLE_REJECTED_OPERATOR", :status_descr => "Viber. Subscriber not exists",
+                  :error_id => 6, :error_grid => 1, :error_grname => "HANDSET_ERRORS", :error_name => "EC_UNKNOWN_SUBSCRIBER", :error_descr => "Subscriber not found.", :error_permanent => true
+        } #Viber subscriber not exists
     }
 
     if data_for_status[hub_report[:msg_status]] != nil && data_for_status[hub_report[:msg_status]] != {} && data_for_status[hub_report[:msg_status]] != [] && data_for_status[hub_report[:msg_status]] != ""
@@ -142,10 +163,6 @@ end
           ]
       }
     end
-
-
-
-
     {:code => 200, :result => "Data processed", :body => {:report_to_recip => report_to_recip}}
   end
 

data/lib/imperituroard/version.rb

@@ -1,3 +1,3 @@
 module Imperituroard
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imperituroard
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Dzmitry Buynovskiy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-12 00:00:00.000000000 Z
+date: 2020-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,6 +136,34 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.2.2
+- !ruby/object:Gem::Dependency
+  name: simpleidn
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+- !ruby/object:Gem::Dependency
+  name: net-scp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 description: Gem from imperituroard for different actions
 email:
 - imperituro.ard@gmail.com
@@ -161,6 +189,9 @@ files:
 - lib/imperituroard/.DS_Store
 - lib/imperituroard/platforms/cps/qps_connector.rb
 - lib/imperituroard/platforms/cps/request_formatter.rb
+- lib/imperituroard/platforms/public/telegram.rb
+- lib/imperituroard/projects/dns.rb
+- lib/imperituroard/projects/dns/ukaz60/dns_update.rb
 - lib/imperituroard/projects/iot.rb
 - lib/imperituroard/projects/iot/add_functions.rb
 - lib/imperituroard/projects/iot/hua_oceanconnect_adapter.rb