imperituroard 0.5.7 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96222a0e0f14b7abc4ff4d1434d6c55115f07623
-  data.tar.gz: 8d1d4264fa33fec3d27cfb5c7c900c1f293a1112
+  metadata.gz: dec8fb3791d83727a6bfd54fc71889481af42b42
+  data.tar.gz: 583739817cad732740861c08845910e849770b55
 SHA512:
-  metadata.gz: 3c8887a0051b6fb3e7d57d3092ae7ac343f677e32d2e24a2ebaaaf8e54acd15662ad41185d4e2c588a2987001c2c7a5a8fcdc24eb7c65bad6633bdf316f7634b
-  data.tar.gz: 98c743b8d56c5a6b637edeb8f11445664ab30af49625eae7d6d1e76f9fa04cebb9dffb07b30fa16a230b08034a86314c8eac6f93e9981476266c296f73113368
+  metadata.gz: 27b131265896d1793261ea994a011e436171f6d5e74bc0c11a4d2e7039545a715ca693be6faab217e321d52e41ae92a6488fb00027c9c2a3beab8fc24b4f198b
+  data.tar.gz: c5d72b86f1168829d5287c14120f70705a1bfb317ee896071d84b161a0a6b2ec3495a3e3c525a2e1aa2aa0a7d530c78f76c8d790dfe0a290a9c56401a7d9f71e

data/lib/imperituroard/platforms/staros/staros_automation.rb

@@ -0,0 +1,95 @@
+require 'net/ssh'
+
+staros_thr_1233 = []
+conf = {}
+
+staros_hosts = {
+    #5700
+}
+
+def printer (config)
+  for gggg1 in config
+
+    p ""
+    p ""
+    p "##{gggg1[0]}"
+    for jjj in gggg1[1]
+      p jjj
+    end
+  end
+end
+
+staros_hosts.each do |ggsn|
+  staros_thr_1233 << Thread.new do
+
+    p ggsn
+
+    begin
+
+      conf[ggsn[0]] = []
+
+      Net::SSH.start(ggsn[1], "ывапывап", :password => "пыапыва") do |ssh|
+        staros_answer = ssh.exec!("show configuration context Ga | grep edr")
+
+        regexp = /file name (\S+) rotation volume (\d+) rotation time \d+ storage-limit \d+ headers edr-format-name compression gzip file-sequence-number rulebase-seq-num/
+
+        ggg = staros_answer.match(regexp)
+        conf[ggsn[0]].push("configure")
+        conf[ggsn[0]].push("context Ga")
+        conf[ggsn[0]].push("edr-module active-charging-service charging")
+        conf[ggsn[0]].push("file name #{ggg[1]} rotation volume 40000000 rotation time 600 storage-limit 536870912 headers edr-format-name compression gzip file-sequence-number rulebase-seq-num")
+        conf[ggsn[0]].push("end")
+
+        #config
+        # staros_answer1 = ssh.exec!("configure")
+        # p staros_answer1
+        # staros_answer2 = ssh.exec!("context Ga")
+        # p staros_answer2
+        # staros_answer3 = ssh.exec!("edr-module active-charging-service charging")
+        # p staros_answer3
+        # staros_answer4 = ssh.exec!("file name #{ggg[1]} rotation volume 40000000 rotation time 600 storage-limit 536870912 headers edr-format-name compression gzip file-sequence-number rulebase-seq-num")
+        # p staros_answer4
+        # staros_answer5 = ssh.exec!("end")
+        # p staros_answer5
+
+        #check
+        staros_answer7 = ssh.exec!("show configuration | grep hostname")
+        reggg = /system hostname (\S+)/
+        hostname_this = staros_answer7.match(reggg)[1]
+
+        staros_answer8 = ssh.exec!("show configuration context Ga | grep edr")
+        regexp2 = /file name (\S+) rotation volume (\d+) rotation time \d+ storage-limit \d+ headers edr-format-name compression gzip file-sequence-number rulebase-seq-num/
+
+        ggg2 = staros_answer8.match(regexp2)
+
+        a1 = ggg2[1].gsub("edr-", "")
+        #p a1
+        #p hostname_this
+        #p ggg2
+
+        if a1 != hostname_this
+          p "incorrect: #{hostname_this}"
+        end
+
+
+        if ggg2[2] == "40000000"
+        else
+          p "incorrect value: #{hostname_this}"
+        end
+
+      end
+
+    rescue
+
+      p "#{ggsn[0]} ERROR"
+
+    end
+
+  end
+end
+staros_thr_1233.each(&:join)
+
+#p conf
+
+
+#printer(conf)

data/lib/imperituroard/platforms/staros/staros_automation_fun.rb

@@ -0,0 +1,37 @@
+require 'net/ssh'
+
+class StarosAutomationFun
+
+  attr_accessor :ignore_y
+
+  def initialize
+    @ignore_y = 1 #1-yes, 0-no
+  end
+
+  def staros_massive_command(staros_hosts, staros_login, staros_password, command_array)
+
+
+    staros_thr_pool_222 = []
+
+    staros_hosts.each do |ggsn|
+      staros_thr_pool_222 << Thread.new do
+
+        Net::SSH.start(ggsn[1], staros_login, :password => staros_password) do |session|
+
+          gg = session.exec!("context AAA")
+          p gg
+          gg1 = session.exec!("show subscribers summary")
+          p gg1
+
+
+
+        end
+
+
+
+      end
+    end
+    staros_thr_pool_222.each(&:join)
+
+  end
+end

data/lib/imperituroard/projects/mhub.rb

@@ -51,6 +51,7 @@ class MhubFunctions_2
   # "notifyContentType"=>"application/json"}}
 
 
+  #for bank dabrabyt
   def get_send_message_2(params, ip_src, ip_real, ip_vip)
 
     input_params = {:params => params}
@@ -123,6 +124,7 @@ class MhubFunctions_2
   end
 
 
+  #for bank dabrabyt
   def rec_deliv_report_2(params, ip_src, ip_real, ip_vip)
     input_params = {:params => params, :ip_src => ip_src, :ip_real => ip_real, :ip_vip => ip_vip}
     output_params = {}

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

@@ -1,8 +1,9 @@
 require 'imperituroard/projects/iot/internal_functions'
+require 'imperituroard/projects/mhub/subs/dabrab/dabrab_proced'
 
 class Sksk_2
 
-  attr_accessor :sk_url, :sk_url_broadcast, :sk_login, :sk_password, :internal_func, :telegram_connector
+  attr_accessor :sk_url, :sk_url_broadcast, :sk_login, :sk_password, :internal_func, :telegram_connector, :dabrab_add_func
 
   def initialize(sk_url, sk_login, sk_password, sk_url_broadcast, telegram_api_url, telegram_chat_id)
     @sk_url = sk_url
@@ -11,6 +12,7 @@ class Sksk_2
     @internal_func = InternalFunc.new
     @sk_url_broadcast = sk_url_broadcast
     @telegram_connector = Telegram_2.new(telegram_api_url, telegram_chat_id)
+    @dabrab_add_func = Dabrab.new
   end
 
 
@@ -82,50 +84,49 @@ class Sksk_2
     request_message = {}
 
     begin
-
       thr_sk_send_viber_one = Thread.new do
+        viber_mess_ans = dabrab_add_func.dabrabyt_text_field_parse(text)
+
+        if viber_mess_ans[:code] == 200
+          uri = URI(sk_url)
+          #8 - client id
+
+          https = Net::HTTP.new(uri.host, uri.port)
+          https.use_ssl=true
+          https.verify_mode = OpenSSL::SSL::VERIFY_NONE
+          req = Net::HTTP::Post.new(uri.path, initheader = {:"Content-Type" => 'application/json'})
+
+          req.basic_auth sk_login, sk_password
+
+          req["Content-Type"] = "application/json"
+          req["Accept"] = "application/json"
+
+          request_message = {
+              "phone_number": msisdn,
+              #"extra_id": "4232j4h89932kjhs",
+              "callback_url": callback_url,
+              #"start_time": "2019-08-16 09:59:10",
+              "tag": "Dabrab_custom_api_1",
+              "channels": [
+                  "viber"
+              ],
+              "channel_options": {
+                  "viber": viber_mess_ans[:body][:to_sk_format]
+              }
+          }
+          req.body = request_message.to_json
+          res = https.request(req)
+          output_params = {:code => 200,
+                           :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)}}
+
+        else
+          output_params = {:code => 508, :result => "Sksk_2.sk_send_viber_one: Something wrong with dabrabyt_text_field_parse"}
+        end
 
 
-        uri = URI(sk_url)
-        #8 - client id
-
-        https = Net::HTTP.new(uri.host, uri.port)
-        https.use_ssl=true
-        https.verify_mode = OpenSSL::SSL::VERIFY_NONE
-        req = Net::HTTP::Post.new(uri.path, initheader = {:"Content-Type" => 'application/json'})
-
-        req.basic_auth sk_login, sk_password
-
-        req["Content-Type"] = "application/json"
-        req["Accept"] = "application/json"
-
-        request_message = {
-            "phone_number": msisdn,
-            #"extra_id": "4232j4h89932kjhs",
-            "callback_url": callback_url,
-            #"start_time": "2019-08-16 09:59:10",
-            "tag": "Dabrab_custom_api_1",
-            "channels": [
-                "viber"
-            ],
-            "channel_options": {
-                "viber": {
-                    "text": text,
-                    "ttl": 60,
-                    # "img": "http://olddogs.org/logo.png",
-                    # "caption": "Old Dogs need you!",
-                    # "action": "http://olddogs.org",
-                },
-            }
-        }
-        req.body = request_message.to_json
-        res = https.request(req)
-        output_params = {:code => 200,
-                         :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)}}
-
       end
 
       thr_sk_send_viber_one.join
@@ -149,53 +150,54 @@ class Sksk_2
 
       thr_sk_send_viber_sms_one = Thread.new do
 
-        uri = URI(sk_url)
-        #8 - client id
-
-        https = Net::HTTP.new(uri.host, uri.port)
-        https.use_ssl=true
-        https.verify_mode = OpenSSL::SSL::VERIFY_NONE
-        req = Net::HTTP::Post.new(uri.path, initheader = {:"Content-Type" => 'application/json'})
-
-        req.basic_auth sk_login, sk_password
-
-        req["Content-Type"] = "application/json"
-        req["Accept"] = "application/json"
-
-        request_message = {
-            "phone_number": msisdn,
-            #"extra_id": "4232j4h89932kjhs",
-            "callback_url": callback_url,
-            #"start_time": "2019-08-16 09:59:10",
-            "tag": "Dabrab_custom_api_1",
-            "channels": [
-                "viber",
-                "sms"
-            ],
-            "channel_options": {
-                "sms": {
-                    "text": sms_text,
-                    "alpha_name": alphaname,
-                    "ttl": 600
-                },
-                "viber": {
-                    "text": viber_txt,
-                    "ttl": 60,
-                    # "img": "http://olddogs.org/logo.png",
-                    # "caption": "Old Dogs need you!",
-                    # "action": "http://olddogs.org",
-                },
-            }
-        }
-
-        req.body = request_message.to_json
-        res = https.request(req)
-
-        output_params = {:code => 200,
-                         :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)}}
+        viber_mess_ans = dabrab_add_func.dabrabyt_text_field_parse(viber_txt)
+
+        if viber_mess_ans[:code] == 200
+          uri = URI(sk_url)
+          #8 - client id
+
+          https = Net::HTTP.new(uri.host, uri.port)
+          https.use_ssl=true
+          https.verify_mode = OpenSSL::SSL::VERIFY_NONE
+          req = Net::HTTP::Post.new(uri.path, initheader = {:"Content-Type" => 'application/json'})
+
+          req.basic_auth sk_login, sk_password
+
+          req["Content-Type"] = "application/json"
+          req["Accept"] = "application/json"
+
+          request_message = {
+              "phone_number": msisdn,
+              #"extra_id": "4232j4h89932kjhs",
+              "callback_url": callback_url,
+              #"start_time": "2019-08-16 09:59:10",
+              "tag": "Dabrab_custom_api_1",
+              "channels": [
+                  "viber",
+                  "sms"
+              ],
+              "channel_options": {
+                  "sms": {
+                      "text": sms_text,
+                      "alpha_name": alphaname,
+                      "ttl": 600
+                  },
+                  "viber": viber_mess_ans[:body][:to_sk_format]
+              }
+          }
+
+          req.body = request_message.to_json
+          res = https.request(req)
+
+          output_params = {:code => 200,
+                           :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)}}
+
+        else
+          output_params = {:code => 508, :result => "Sksk_2.sk_send_viber_sms_one: Something wrong with dabrabyt_text_field_parse"}
+        end
 
       end
 
@@ -281,44 +283,49 @@ class Sksk_2
     begin
 
       thr_sk_send_viber_list = Thread.new do
-        uri = URI(sk_url_broadcast)
-        #8 - client id
 
-        https = Net::HTTP.new(uri.host, uri.port)
-        https.use_ssl = true
-        https.verify_mode = OpenSSL::SSL::VERIFY_NONE
-        req = Net::HTTP::Post.new(uri.path, initheader = {:"Content-Type" => 'application/json'})
+        viber_mess_ans = dabrab_add_func.dabrabyt_text_field_parse(text)
 
-        req["Content-Type"] = "application/json"
-        req["Accept"] = "application/json"
+        if viber_mess_ans[:code] == 200
+          uri = URI(sk_url_broadcast)
+          #8 - client id
 
-        req.basic_auth sk_login, sk_password
+          https = Net::HTTP.new(uri.host, uri.port)
+          https.use_ssl = true
+          https.verify_mode = OpenSSL::SSL::VERIFY_NONE
+          req = Net::HTTP::Post.new(uri.path, initheader = {:"Content-Type" => 'application/json'})
 
+          req["Content-Type"] = "application/json"
+          req["Accept"] = "application/json"
 
-        # [{"phone_number": 375298766719}, {"phone_number": 375295730878}]
-        request_message = {
-            "recipients": msisdn_list,
-            "callback_url": callback_url,
-            "tag": "Dabrab_custom_api_1",
-            "channels": [
-                "viber"
-            ],
-            "channel_options": {
-                "viber": {
-                    "text": text,
-                    "ttl": 60
-                }
-            }
-        }
+          req.basic_auth sk_login, sk_password
 
-        req.body = request_message.to_json
-        res = https.request(req)
 
-        output_params = {:code => 200,
-                         :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)}}
+          # [{"phone_number": 375298766719}, {"phone_number": 375295730878}]
+          request_message = {
+              "recipients": msisdn_list,
+              "callback_url": callback_url,
+              "tag": "Dabrab_custom_api_1",
+              "channels": [
+                  "viber"
+              ],
+              "channel_options": {
+                  "viber": viber_mess_ans[:body][:to_sk_format]
+              }
+          }
+
+          req.body = request_message.to_json
+          res = https.request(req)
+
+          output_params = {:code => 200,
+                           :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)}}
+        else
+          output_params = {:code => 508, :result => "Sksk_2.sk_send_viber_list: Something wrong with dabrabyt_text_field_parse"}
+        end
+
       end
       thr_sk_send_viber_list.join
     rescue
@@ -337,50 +344,57 @@ class Sksk_2
 
     begin
       thr_sk_send_viber_sms_list = Thread.new do
-        uri = URI(sk_url_broadcast)
-        #8 - client id
 
-        https = Net::HTTP.new(uri.host, uri.port)
-        https.use_ssl = true
-        https.verify_mode = OpenSSL::SSL::VERIFY_NONE
-        req = Net::HTTP::Post.new(uri.path, initheader = {:"Content-Type" => 'application/json'})
+        viber_mess_ans = dabrab_add_func.dabrabyt_text_field_parse(viber_text)
 
-        req.basic_auth sk_login, sk_password
+        if viber_mess_ans[:code] == 200
 
+          uri = URI(sk_url_broadcast)
+          #8 - client id
 
-        req["Content-Type"] = "application/json"
-        req["Accept"] = "application/json"
+          https = Net::HTTP.new(uri.host, uri.port)
+          https.use_ssl = true
+          https.verify_mode = OpenSSL::SSL::VERIFY_NONE
+          req = Net::HTTP::Post.new(uri.path, initheader = {:"Content-Type" => 'application/json'})
 
-        # [{"phone_number": 375298766719}, {"phone_number": 375295730878}]
-        request_message = {
-            "recipients": msisdn_list,
-            "callback_url": callback_url,
-            "tag": "Dabrab_custom_api_1",
-            "channels": [
-                "viber",
-                "sms"
-            ],
-            "channel_options": {
-                "sms": {
-                    "alpha_name": alphaname,
-                    "text": sms_text,
-                    "ttl": 60
-                },
-                "viber": {
-                    "text": viber_text,
-                    "ttl": 60
-                }
-            }
-        }
+          req.basic_auth sk_login, sk_password
 
-        req.body = request_message.to_json
-        res = https.request(req)
 
-        output_params = {:code => 200,
-                         :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)}}
+          req["Content-Type"] = "application/json"
+          req["Accept"] = "application/json"
+
+          # [{"phone_number": 375298766719}, {"phone_number": 375295730878}]
+          request_message = {
+              "recipients": msisdn_list,
+              "callback_url": callback_url,
+              "tag": "Dabrab_custom_api_1",
+              "channels": [
+                  "viber",
+                  "sms"
+              ],
+              "channel_options": {
+                  "sms": {
+                      "alpha_name": alphaname,
+                      "text": sms_text,
+                      "ttl": 60
+                  },
+                  "viber": viber_mess_ans[:body][:to_sk_format]
+              }
+          }
+
+          req.body = request_message.to_json
+          res = https.request(req)
+
+          output_params = {:code => 200,
+                           :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)}}
+
+        else
+          output_params = {:code => 508, :result => "Sksk_2.sk_send_viber_sms_list: Something wrong with dabrabyt_text_field_parse"}
+        end
+
       end
 
       thr_sk_send_viber_sms_list.join

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

@@ -1,5 +1,117 @@
 class Dabrab
 
+  def dabrabyt_text_field_parse(stri)
+    button_url = ""
+    image = ""
+    button_text = ""
+    text = stri
+
+    #############
+    #0 - Text only
+    #1 - Text + Button
+    #2 - Text + Image + Button
+    #3 - image only
+    #############
+    scheme = 0
+    scheme_dic = {0 => "Text only", 1 => "Text+Button", 2 => "Text+Image+Button", 3 => "Image only"}
+    #############
+
+    output_answer = {}
+    sk_format = {}
+
+    begin
+
+      regexp_image1 = /(image:(\S+)[\s\n]?)/
+      button_url1 = /(button_url:(\S+)[\s\n]?)/
+      button_text1 = /(button_text:["']([^"]+)["'][\s\n])/
+
+      button_url_dat = stri.scan(button_url1)
+      button_text_dat = stri.scan(button_text1)
+      image_dat = stri.scan(regexp_image1)
+
+
+      p button_url_dat
+      p button_text_dat
+      p image_dat
+
+      begin
+        if button_url_dat != [] && button_url_dat != nil && button_url_dat != ""
+          button_url = button_url_dat[0][1]
+          text = text.gsub(button_url_dat[0][0], "")
+        end
+      rescue
+        nil
+      end
+
+      begin
+        if button_text_dat != [] && button_text_dat != nil && button_text_dat != ""
+          button_text = button_text_dat[0][1]
+          text = text.gsub(button_text_dat[0][0], "")
+        end
+      rescue
+        nil
+      end
+
+      begin
+        if image_dat != [] && image_dat != nil && image_dat != ""
+          image = image_dat[0][1]
+          text = text.gsub(image_dat[0][0], "")
+        end
+      rescue
+        nil
+      end
+      text = text.gsub(/\s+$/, '').gsub(/\n$/, '')
+
+
+      if button_url != "" && button_text != "" && image != "" #111
+        scheme = 2
+      elsif button_url != "" && button_text != "" && image == "" #110
+        scheme = 1
+      elsif button_url == "" && button_text == "" && image != "" #001
+        if text == ""
+          scheme = 3
+        else
+          scheme = 2
+          button_url = image
+          button_text = "Открыть"
+        end
+      elsif button_url != "" && button_text == "" && image != "" #101
+        scheme = 2
+        button_text = "Открыть"
+      elsif button_url == "" && button_text != "" && image != "" #011
+        scheme = 2
+        button_url = image
+      elsif button_url == "" && button_text != "" && image == "" #010
+        scheme = 0
+      elsif button_url != "" && button_text == "" && image == "" #100
+        button_text = "Открыть"
+        scheme = 1
+      else
+        scheme = 0
+      end
+
+      if scheme==0
+        sk_format = {"text": text, "ttl": 60}
+      elsif scheme==1
+        sk_format = {"text": text, "ttl": 60, "caption": button_text, "action": button_url}
+      elsif scheme==2
+        sk_format = {"text": text, "ttl": 60, "caption": button_text, "action": button_url, "img": image}
+      elsif scheme==3
+        sk_format = {"img": image, "ttl": 60}
+      else
+        nil
+      end
+
+      p sk_format
+
+      output_answer ={:code => 200, :result => "Success", :body => {:to_sk_format => sk_format, :button_url => button_url, :image => image, :button_text => button_text, :text => text, :scheme => scheme, :scheme_dic => scheme_dic[scheme]}}
+    rescue
+      output_answer ={:code => 507, :result => "dabrabyt_text_field_parse: Unknown error"}
+    end
+    output_answer
+  end
+
+
   def num_formatter(infobip_msisdn, extra_id)
     #[{"to"=>{"phoneNumber"=>"375297116638", "emailAddress"=>nil}}]
     # [{"phone_number": 375298766719}, {"phone_number": 375295730878}]
@@ -50,20 +162,20 @@ class Dabrab
       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"]}
+                   "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"]}
+                   "status": {"groupId": 5,
+                              "groupName": "REJECTED",
+                              "id": 21,
+                              "name": "REJECTED_SYSTEM_ERROR",
+                              "description": "Unknown error"},
+                   "messageId": a["message_id"]}
       end
 
       messages_sect.append(status1)

data/lib/imperituroard/projects/ukaz60.rb

@@ -53,13 +53,14 @@ class Ukaz60All_2
       if format_for_forti[:code] == 200
         url_uploading = forti_connector.upload_url(format_for_forti[:body][:to_fortigate])
         if url_uploading[:code] == 200
-          update_fortigate_ansible = forti_connector.update_weburl_fortigate
+          #update_fortigate_ansible = forti_connector.update_weburl_fortigate
+          update_fortigate_ansible = forti_connector.update_weburl_fortimanager
           if update_fortigate_ansible[:code] == 200
             forti_answer = {:code => 200, :result => "Fortigate processed", :data => update_fortigate_ansible[:body][:body], :num_uploaded_to_forti => format_for_forti[:body][:num_list]}
           else
             forti_answer = {:code => update_fortigate_ansible[:code], :result => update_fortigate_ansible[:result]}
           end
-          forti_connector.clean_tmp_folders
+          #forti_connector.clean_tmp_folders
         else
           forti_answer = {:code => 401, :result => "Failed for uploading data to ansible server"}
         end
@@ -109,6 +110,7 @@ class Ukaz60All_2
 
     begin
       get_belgim_data = belgim_connector.belgim_ukaz60_get
+      p get_belgim_data
 
       if get_belgim_data[:code] == 200
 

data/lib/imperituroard/projects/ukaz60/belgim.rb

@@ -52,7 +52,11 @@ class Belgim_2
       results = {}
 
       # Get data from Belgim site by curl
-      return_from_belgim = `curl -d "name=#{belgim_login}&pass=#{belgim_password}" -H "Content-Type: application/x-www-form-urlencoded" -X POST #{belgim_url}`
+      curl_belgie_command = "curl -d \"name=#{belgim_login}&pass=#{belgim_password}\" -H \"Content-Type: application/x-www-form-urlencoded\" -X POST #{belgim_url} --insecure"
+      #return_from_belgim = `curl -d "name=#{belgim_login}&pass=#{belgim_password}" -H "Content-Type: application/x-www-form-urlencoded" -X POST #{belgim_url} --insecure`
+      return_from_belgim = `#{curl_belgie_command}`
+      p curl_belgie_command
+
       return_from_belgim = return_from_belgim.gsub!("\n", "")
 
       #parse Belgim file by regexpression

data/lib/imperituroard/projects/ukaz60/fortigate.rb

@@ -99,6 +99,29 @@ class FortiUkaz60_2
     output_data
   end
 
+
+  #2.1 function for process data to fortigate by fortimanager by ansible
+  # Full ready
+  def update_weburl_fortimanager
+    output_data = {}
+    begin
+      command = "/bin/bash /scripts/temp_fortimanager_url_upload.sh"
+      ansible_answer = ""
+      Net::SSH.start(ansible_host, ansible_ssh_user, :password => ansible_ssh_password) do |ssh|
+        ansible_answer = ssh.exec!(command)
+      end
+      p "ansible_answer: #{ansible_answer}"
+
+      #hh = "\nPLAY [ha_master] ***************************************************************\n\nTASK [set url table] ***********************************************************\nchanged: [gom32sg1]\nchanged: [bre32sg1]\nchanged: [min32sg1]\nchanged: [vit32sg1]\nchanged: [min32sg3]\nchanged: [gro32sg1]\nchanged: [mog32sg1]\n\nTASK [check current url table] *************************************************\nok: [min32sg1]\nok: [bre32sg1]\nok: [min32sg3]\nok: [vit32sg1]\nok: [gom32sg1]\nok: [gro32sg1]\nok: [mog32sg1]\n\nTASK [debug] *******************************************************************\nok: [min32sg1] => {\n    \"msg\": \"URL loaded/in-file: [1273 / 1273]\"\n}\nok: [min32sg3] => {\n    \"msg\": \"URL loaded/in-file: [1273 / 1273]\"\n}\nok: [bre32sg1] => {\n    \"msg\": \"URL loaded/in-file: [1273 / 1273]\"\n}\nok: [vit32sg1] => {\n    \"msg\": \"URL loaded/in-file: [1273 / 1273]\"\n}\nok: [gom32sg1] => {\n    \"msg\": \"URL loaded/in-file: [1273 / 1273]\"\n}\nok: [gro32sg1] => {\n    \"msg\": \"URL loaded/in-file: [1273 / 1273]\"\n}\nok: [mog32sg1] => {\n    \"msg\": \"URL loaded/in-file: [1273 / 1273]\"\n}\n\nPLAY RECAP *********************************************************************\nbre32sg1                   : ok=3    changed=1    unreachable=0    failed=0    skipped=0    rescued=0    ignored=0   \ngom32sg1                   : ok=3    changed=1    unreachable=0    failed=0    skipped=0    rescued=0    ignored=0   \ngro32sg1                   : ok=3    changed=1    unreachable=0    failed=0    skipped=0    rescued=0    ignored=0   \nmin32sg1                   : ok=3    changed=1    unreachable=0    failed=0    skipped=0    rescued=0    ignored=0   \nmin32sg3                   : ok=3    changed=1    unreachable=0    failed=0    skipped=0    rescued=0    ignored=0   \nmog32sg1                   : ok=3    changed=1    unreachable=0    failed=0    skipped=0    rescued=0    ignored=0   \nvit32sg1                   : ok=3    changed=1    unreachable=0    failed=0    skipped=0    rescued=0    ignored=0   \n\n"
+      answ_pr = add_func_connector.ansible_answer_parse(ansible_answer)
+      output_data = {:code => 200, :result => "update_weburl_fortigate: Request completed", :body => answ_pr}
+    rescue
+      output_data = {:code => 507, :result => "update_weburl_fortigate: Unknown SDK error"}
+    end
+    add_functions_full.printer_texter(output_data, "debug")
+    output_data
+  end
+
   #3 Clean all temp files
   # Full ready
   def clean_tmp_folders

data/lib/imperituroard/projects/ukaz60/staros.rb

@@ -1,4 +1,7 @@
 require 'net/ssh'
+require 'uri'
+require "erb"
+include ERB::Util
 
 require 'imperituroard/platforms/staros/get_data_ssh'
 
@@ -124,3 +127,15 @@ class Ukaz60Staros_2
     returned_data
   end
 end
+
+
+uu ="/fgd?ef"
+
+#ggg = uu.force_encoding('ASCII-8BIT')
+#puts CGI.escape ggg
+p url_encode("foo/bar? baz&")
+
+p URI.parse("foo/bar? baz&").to_s
+p URI::encode("foo/bar? baz&")
+
+p URI.decode("newsx-ru.ru/by/251-potencia-spartagen-by/%3futm%20medium=251&utmcampaign=4&%20utm%20content=57849345&utm%20source=56960717")

data/lib/imperituroard/projects/ukaz60/ukaz60_add_func.rb

@@ -1,4 +1,5 @@
 require 'imperituroard/add_functions/logger/any_functions'
+require 'uri'
 
 class AddFuncUkaz60_2
 
@@ -209,7 +210,7 @@ class AddFuncUkaz60_2
             else
               star_dom_x = star_url_curr
             end
-            if belg_url.include?(star_dom_x)
+            if belg_url.include?(star_dom_x) || belg_url.include?(URI.decode(star_dom_x))
               blocked = 1
               for_unblock_tmp[star_host[:hostname]].push(star_dom)
             end
@@ -245,6 +246,16 @@ class AddFuncUkaz60_2
     rescue
       output_answ = {:code => 507, :result => "staros_compare_http: Unknown SDK error"}
     end
+
+    #p JSON.pretty_generate(output_answ)
+    p "staros_compare_http"
+    p output_answ
+
+    p "temp data"
+    for i in output_answ[:body][:for_unblock][:for_unblock]["vit11asr2"]
+    #for i in output_answ[:body][:for_block][:not_blocked_belgim]["vit11asr2"]
+      p i
+    end
     output_answ
   end
 
@@ -289,8 +300,6 @@ class AddFuncUkaz60_2
       answ_out[:body][:to_message][:data][:unblock_me] = data[:body][:for_unblock][:for_unblock_stat]
     end
 
-
-
     answ_out
   end
 

data/lib/imperituroard/version.rb

@@ -1,3 +1,3 @@
 module Imperituroard
-  VERSION = "0.5.7"
+  VERSION = "0.5.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imperituroard
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.8
 platform: ruby
 authors:
 - Dzmitry Buynovskiy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-27 00:00:00.000000000 Z
+date: 2020-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -202,10 +202,13 @@ files:
 - lib/imperituroard.rb
 - lib/imperituroard/.DS_Store
 - lib/imperituroard/add_functions/logger/any_functions.rb
+- lib/imperituroard/platforms/cps/cps_multiple_thread_req.rb
 - lib/imperituroard/platforms/cps/qps_connector.rb
 - lib/imperituroard/platforms/cps/request_formatter.rb
 - lib/imperituroard/platforms/public/telegram.rb
 - lib/imperituroard/platforms/staros/get_data_ssh.rb
+- lib/imperituroard/platforms/staros/staros_automation.rb
+- lib/imperituroard/platforms/staros/staros_automation_fun.rb
 - lib/imperituroard/platforms/staros/staros_parser.rb
 - lib/imperituroard/projects/dns.rb
 - lib/imperituroard/projects/iot.rb