imperituroard 0.5.7 → 1.0.2

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 = "1.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imperituroard
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 1.0.2
 platform: ruby
 authors:
 - Dzmitry Buynovskiy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-27 00:00:00.000000000 Z
+date: 2020-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.2.4.2
+        version: 5.0.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.2.4.2
+        version: 5.0.7.2
 description: Gem from imperituroard for different actions
 email:
 - imperituro.ard@gmail.com
@@ -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
@@ -246,7 +249,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="