freewifi 0.2.3 → 0.2.7

data/lib/freewifi/mikrotik/newhub_mtik_ssh.rb

@@ -25,7 +25,7 @@ class NEWhubWifi_1
         #result = ssh.exec!("/interface eoip print where tunnel-id=#{tunnel_id}")
         #p result
         result = ssh.exec!("/interface eoip print where tunnel-id=#{tunnel_id}")
-        regimsi = /\s+name=\"(.+)\"\s+/
+        regimsi = /\s+name="(.+)"\s+/
         m1 = regimsi.match(result)[1]
         sleep 0.2
         result2 = ssh.exec!("/interface bridge port remove [/interface bridge port find interface=#{m1}]")
@@ -42,7 +42,7 @@ class NEWhubWifi_1
     begin
       Net::SSH.start(hub2, user_hub, :password => password_hub) do |ssh|
         result = ssh.exec!("/interface eoip print where tunnel-id=#{tunnel_id}")
-        regimsi = /\s+name=\"(.+)\"\s+/
+        regimsi = /\s+name="(.+)"\s+/
         m1 = regimsi.match(result)[1]
         sleep 0.2
         result2 = ssh.exec!("/interface bridge port remove [/interface bridge port find interface=#{m1}]")
@@ -222,12 +222,12 @@ class NEWhubWifi_1
           end
         end
       end
-      output_params = {:code => 200, :result => "check_pool_range_includes_1: Request processed", :body => {:result => res}}
+      output_params = {:code => 200, :result => 'check_pool_range_includes_1: Request processed', :body => {:result => res}}
     rescue
-      output_params = {:code => 507, :result => "check_pool_range_includes_1: Unknown SDK error"}
+      output_params = {:code => 507, :result => 'check_pool_range_includes_1: Unknown SDK error'}
     end
 
-    additional_func_wifi_1.printer_texter_wifi_1({:input_params => input_params, :output_params => output_params, :procedure => "check_pool_range_includes_1", :file => "freewifi/mikrotik/newhub_mtik_ssh.rb", :sdk => "freewifi"}, "debug")
+    additional_func_wifi_1.printer_texter_wifi_1({:input_params => input_params, :output_params => output_params, :procedure => 'check_pool_range_includes_1', :file => 'freewifi/mikrotik/newhub_mtik_ssh.rb', :sdk => 'freewifi'}, 'debug')
     output_params
   end
 
@@ -245,7 +245,7 @@ class NEWhubWifi_1
 
     command_provisioning_24ghz = "/caps-man provisioning add hw-supported-modes=b,g,gn ip-address-ranges=#{ap_ip} action=create-dynamic-enabled place-before=30 master-configuration=#{conf_24ghz_name} name-format=identity"
 
-    command_provisioning_5ghz = "/caps-man provisioning add hw-supported-modes=a,ac,an ip-address-ranges=#{ap_ip} action=create-dynamic-enabled place-before=30 master-configuration=#{conf_24ghz_name} name-format=identity"
+    command_provisioning_5ghz = "/caps-man provisioning add hw-supported-modes=a,ac,an ip-address-ranges=#{ap_ip} action=create-dynamic-enabled place-before=30 master-configuration=#{conf_5ghz_name} name-format=identity"
 
     Net::SSH.start(capsman1, capsman_user1, :password => capsman_pass1) do |ssh|
       result = ssh.exec!(command_conf_24ghz)
@@ -270,8 +270,8 @@ class NEWhubWifi_1
       result = ssh.exec!(command)
       s1 = result.split("\r\n\r\n")
       for a in s1
-        a1 = a.gsub("\r\n", "")
-        a2 = a1.gsub(",     ", ",")
+        a1 = a.gsub("\r\n", '')
+        a2 = a1.gsub(',     ', ',')
         reg_addr_range = / (\d) .+ ip-address-ranges=(\d{1,3}.+\.\d{1,3}|\d{1,3}.+\.\d{1,3}\/\d{1,2})\s+/
         m1 = a2.scan(reg_addr_range)
         num = m1[0][0]
@@ -280,7 +280,7 @@ class NEWhubWifi_1
         final_provision_old << triplet
         exists_check = self.check_pool_range_includes_1(triplet[1], ap_ip)
 
-        if exists_check[:body][:result] != "exists"
+        if exists_check[:body][:result] != 'exists'
           #self.capsman_set_ip_range_1(capsman1, capsman_user1, capsman_pass1, ap_ip)
           #set data to capsman
           rewrite_ip_command = "/caps-man provisioning set numbers=#{triplet[0]} ip-address-ranges=#{triplet[1]},#{ap_ip}"
@@ -314,7 +314,7 @@ class NEWhubWifi_1
       else
         p result
         conf_names = []
-        reg_config_name = /name=\"(\S+)\"/
+        reg_config_name = /name="(\S+)"/
         m1 = result.scan(reg_config_name)
         for a1 in m1
           if a1[0] != []
@@ -326,7 +326,7 @@ class NEWhubWifi_1
       end
     end
     rescue
-      output_params = {:code => 507, :result => "set_capsman_config_1: Unknown SDK error"}
+      output_params = {:code => 507, :result => 'set_capsman_config_1: Unknown SDK error'}
     end
 
     additional_func_wifi_1.printer_texter_wifi_1({:input_params => input_params, :output_params => output_params, :procedure => "set_capsman_config_1", :file => "freewifi/mikrotik/newhub_mtik_ssh.rb", :sdk => "freewifi"}, "debug")

data/lib/freewifi/mikrotik/schemes_conf_gen.rb

@@ -15,9 +15,9 @@ class MtikSchemesGen_1
 
     [
         "/system identity set name=#{hostname}",
-        "/interface bridge add name=bridge_tunnel",
+        '/interface bridge add name=bridge_tunnel',
         "/interface eoip add remote-address=#{hub_vip.to_s} tunnel-id=#{tunnel_id.to_s} name=tunnel_to_hub",
-        "/interface bridge port add interface=tunnel_to_hub bridge=bridge_tunnel",
+        '/interface bridge port add interface=tunnel_to_hub bridge=bridge_tunnel',
         "/interface bridge port add interface=wlan1 bridge=bridge_tunnel",
         "/interface wireless set wlan1 mode=ap-bridge ssid=#{ap_ssid} disabled=no name=wireless_public_interface frequency=2442",
         "/interface ppp-client set ppp-out1 apn=vpn pin=1111 disabled=no",

data/lib/freewifi/version.rb

@@ -1,3 +1,3 @@
 module Freewifi_1
-  VERSION = "0.2.3"
+  VERSION = '0.2.7'
 end

data/lib/freewifi.rb

@@ -1,10 +1,10 @@
 #$LOAD_PATH.unshift File.expand_path("../freewifi", __dir__)
-$LOAD_PATH.unshift File.expand_path("../mikrotik", __dir__)
-$LOAD_PATH.unshift File.expand_path("../database/mysql", __dir__)
-$LOAD_PATH.unshift File.expand_path("../database/mongo", __dir__)
-$LOAD_PATH.unshift File.expand_path("../additional", __dir__)
-$LOAD_PATH.unshift File.expand_path("../general", __dir__)
-$LOAD_PATH.unshift File.expand_path("../huawei", __dir__)
+$LOAD_PATH.unshift File.expand_path('../mikrotik', __dir__)
+$LOAD_PATH.unshift File.expand_path('../database/mysql', __dir__)
+$LOAD_PATH.unshift File.expand_path('../database/mongo', __dir__)
+$LOAD_PATH.unshift File.expand_path('../additional', __dir__)
+$LOAD_PATH.unshift File.expand_path('../general', __dir__)
+$LOAD_PATH.unshift File.expand_path('../huawei', __dir__)
 
 require "freewifi/version"
 require "freewifi/params"
@@ -135,7 +135,7 @@ module Freewifi_1
                   :subscribers_contacts => subscribers_contacts,
                   :wifi_ssid => wifi_ssid,
                   :portalstyle => portalstyle,
-                  :ap => "MikroTik",
+                  :ap => 'MikroTik',
                   :ap_serial_number => ap_serial_number,
                   :ap_model => ap_model,
                   :description => description,
@@ -146,7 +146,7 @@ module Freewifi_1
           }
 
           mongo_response = mongo_connector_wifi_1.data_ap_auto_created_insert_1(data)
-          if mongo_response[:code]==200
+          if mongo_response[:code] == 200
 
             newcapsman1 = NEWhubWifi_1.new
             threads_1 = []
@@ -157,27 +157,27 @@ module Freewifi_1
 
                 input_intern_data = {:wifi_ssid_processed => wifi_ssid_processed, :company_name_processed => company_name_processed, :capsman => capsman}
 
-                mongo_connector_wifi_1.audit_logger_wifi_1("add_mikrotik_ap_mobile_1", remote_ip, input_intern_data, nil, real_ip, subscriber_ip)
+                mongo_connector_wifi_1.audit_logger_wifi_1('add_mikrotik_ap_mobile_1', remote_ip, input_intern_data, nil, real_ip, subscriber_ip)
 
                 newcapsman1.set_capsman_config_1(wifi_ssid_processed, capsman, capsman_user, capsman_password, sim_ipaddress, company_name_processed)
               end
             end
             threads_1.each(&:join)
 
-            output_params = {:code => 200, :result => "Request completed successfully", :body => {:tunnel_id => tunnel_addition[:body][:eoip_tunnel_id], :tunnel_name => tunnel_addition[:body][:eoip_tunnel_name]}}
+            output_params = {:code => 200, :result => 'Request completed successfully', :body => {:tunnel_id => tunnel_addition[:body][:eoip_tunnel_id], :tunnel_name => tunnel_addition[:body][:eoip_tunnel_name]}}
           else
-            output_params = {:code => 400, :result => "Something wrong with insertion to mongo"}
+            output_params = {:code => 400, :result => 'Something wrong with insertion to mongo'}
           end
         else
           output_params = {:code => 401, :result => tunnel_addition[:result]}
         end
       else
-        output_params = {:code => 202, :result => "AP exists", :body => {:tunnel_id => ap_state[:tunnel_id].to_s}}
+        output_params = {:code => 202, :result => 'AP exists', :body => {:tunnel_id => ap_state[:tunnel_id].to_s}}
       end
     rescue
-      output_params = {:code => 507, :result => "Unknown SDK error"}
+      output_params = {:code => 507, :result => 'Unknown SDK error'}
     end
-    mongo_connector_wifi_1.audit_logger_wifi_1("add_mikrotik_ap_mobile_1", remote_ip, input_params, output_params, real_ip, subscriber_ip)
+    mongo_connector_wifi_1.audit_logger_wifi_1('add_mikrotik_ap_mobile_1', remote_ip, input_params, output_params, real_ip, subscriber_ip)
     #additional_func.printer_texter({:input_params => input_params, :output_params => output_params, :procedure => "add_mikrotik_ap_mobile", :file => "freewifi.rb"}, "info")
     output_params
   end
@@ -211,9 +211,9 @@ module Freewifi_1
       output_params = {:code => res[:code], :result => res[:result], :body => {:ap_configuration => conf_1}}
 
     rescue
-      output_params = {:code => 507, :result => "Unknown SDK error"}
+      output_params = {:code => 507, :result => 'Unknown SDK error'}
     end
-    mongo_connector_wifi_1.audit_logger_wifi_1("mtik_sch1_config_gen_1", remote_ip, input_params, conf_1, real_ip, subscriber_ip)
+    mongo_connector_wifi_1.audit_logger_wifi_1('mtik_sch1_config_gen_1', remote_ip, input_params, conf_1, real_ip, subscriber_ip)
     output_params
   end
 
@@ -243,10 +243,11 @@ module Freewifi_1
   def test()
     newcapsman1 = NEWhubWifi_1.new
 
+    capsman_ip = ['1.1.1.1']
     threads = []
     capsman_ip.each do |capsman|
       threads << Thread.new do
-        newcapsman1.set_capsman_config_1("test_ss", capsman, capsman_user, capsman_password, "172.25.208.14", "test_company")
+        newcapsman1.set_capsman_config_1('test_ss', capsman, capsman_user, capsman_password, '172.25.208.14', 'test_company')
       end
     end
     threads.each(&:join)
@@ -302,7 +303,9 @@ class PortalFwifi_1
                  iwag2_username,
                  iwag2_password,
                  iwag1_port=22,
-                 iwag2_port=22
+                 iwag2_port=22,
+                 protocol_mtik='api',
+                 mtik_capsman_list=['172.24.247.15', '172.24.214.155', '172.24.214.140', '172.24.214.105', '172.24.223.105']
   )
 
     @general_procedures = WiFiPortal_1.new(apigw_wsdl,
@@ -324,7 +327,9 @@ class PortalFwifi_1
                                            iwag2_host,
                                            iwag2_username,
                                            iwag2_password,
-                                           iwag2_port
+                                           iwag2_port,
+                                           protocol_mtik,
+                                           mtik_capsman_list
     )
     @mtik_control_ips_get = mtik_control_ips_get
     @mtik_user = mtik_user
@@ -347,18 +352,18 @@ class PortalFwifi_1
         resp_procedure = general_procedures.get_subs_info_return_1(ipaddress)
         output_params = resp_procedure
       rescue
-        output_params = {:code => 507, :result => "Unknown SDK error"}
+        output_params = {:code => 507, :result => 'Unknown SDK error'}
       end
     end
     subs_info_ret_1_thr1.join
 
     subs_info_ret_1_thr2 = Thread.new do
       begin
-        p "mongo"
+        p 'mongo'
         #mongo_connector_wifi_1 = MongoWifiCl_1.new(mongo_ip, mongo_port, mongo_database)
         #mongo_connector_wifi_1.audit_logger_wifi_portal_1("wifi_get_subs_info_return_1", remote_ip, input_params, output_params, real_ip)
       rescue
-        additional_func_wifi_1.printer_texter_wifi_1({:input_params => input_params, :output_params => {:result => "mongo failed"}, :procedure => "wifi_get_subs_info_return_1", :file => "freewifi.rb"}, "debug")
+        additional_func_wifi_1.printer_texter_wifi_1({:input_params => input_params, :output_params => {:result => 'mongo failed'}, :procedure => 'wifi_get_subs_info_return_1', :file => 'freewifi.rb'}, 'debug')
         additional_func_wifi_1.telegram_message_1("{:function => \"wifi_get_subs_info_return_1\", :result => \"failed communicate with mongo database\", :sdk => \"freewifi\"}", telegram_api_url, telegram_chat_id)
       end
     end
@@ -377,7 +382,7 @@ class PortalFwifi_1
         resp_procedure = general_procedures.get_subs_info_ret_ssh_1(ipaddress)
         output_params = resp_procedure
       rescue
-        output_params = {:code => 507, :result => "Unknown SDK error"}
+        output_params = {:code => 507, :result => 'Unknown SDK error'}
       end
     end
     subs_info_ret_1_thr1.join
@@ -388,7 +393,7 @@ class PortalFwifi_1
           #mongo_connector_wifi_1 = MongoWifiCl_1.new(mongo_ip, mongo_port, mongo_database)
           #mongo_connector_wifi_1.audit_logger_wifi_portal_1("wifi_get_subs_info_return_1", remote_ip, input_params, output_params, real_ip)
       rescue
-        additional_func_wifi_1.printer_texter_wifi_1({:input_params => input_params, :output_params => {:result => "mongo failed"}, :procedure => "wifi_get_subs_info_return_1", :file => "freewifi.rb"}, "debug")
+        additional_func_wifi_1.printer_texter_wifi_1({:input_params => input_params, :output_params => {:result => "mongo failed"}, :procedure => "wifi_get_subs_info_return_1", :file => 'freewifi.rb'}, "debug")
         additional_func_wifi_1.telegram_message_1("{:function => \"wifi_get_subs_info_return_1\", :result => \"failed communicate with mongo database\", :sdk => \"freewifi\"}", telegram_api_url, telegram_chat_id)
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: freewifi
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.7
 platform: ruby
 authors:
 - Dzmitry Buynovskiy
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-20 00:00:00.000000000 Z
+date: 2022-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler