freewifi 0.2.5 → 0.2.9

data/lib/freewifi/additional/additional_functions.rb

@@ -23,7 +23,7 @@ class InternalFunc_1
       response_mess = https_connector.request(request_mess)
       body = response_mess.body
       return {:code => 200,
-              :result => 'Request completed successfully',
+              :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

data/lib/freewifi/general/wifi_portal_procedures.rb

@@ -21,58 +21,52 @@ class WiFiPortal_1
                 :mtik_api_connector,
                 :hua_controller_connector,
                 :iwag_connector1,
-                :iwag_connector2,
-                :protocol_mtik,
-                :mtik_capsman_list
-
-  def initialize(apigw_wsdl,
-                 apigw_endpoint,
-                 apigw_namespace,
-                 apigw_wsse_aut_log,
-                 apigw_wsse_aut_pass,
-                 iwag1_host,
-                 iwag1_username,
-                 iwag1_password,
-                 iwag1_port,
-                 mtik_control_ips_get,
-                 mtik_user,
-                 mtik_password,
-                 hua_wlc_1_ip,
-                 hua_wlc_2_ip,
-                 hua_wlc_login,
-                 hua_wlc_password,
-                 iwag2_host,
-                 iwag2_username,
-                 iwag2_password,
-                 iwag2_port,
-                 protocol_mtik,
-                 mtik_capsman_list
-  )
-    @iwag_telnet_connector = CSRtelnet_1.new(iwag1_host, iwag1_username, iwag1_password)
-    @ard_api_gw_connector_wifi = Savon.client do
-      #ssl_verify_mode :none
-      wsdl apigw_wsdl
-      endpoint apigw_endpoint
-      namespace apigw_namespace
-      wsse_auth(apigw_wsse_aut_log, apigw_wsse_aut_pass, :digest)
-      encoding 'UTF-8'
-      headers = {"Accept-Encoding" => "gzip, deflate", "Connection" => "Keep-Alive"}
-    end
+                :iwag_connector2
+
+      def initialize(apigw_wsdl,
+                     apigw_endpoint,
+                     apigw_namespace,
+                     apigw_wsse_aut_log,
+                     apigw_wsse_aut_pass,
+                     iwag1_host,
+                     iwag1_username,
+                     iwag1_password,
+                     iwag1_port,
+                     mtik_control_ips_get,
+                     mtik_user,
+                     mtik_password,
+                     hua_wlc_1_ip,
+                     hua_wlc_2_ip,
+                     hua_wlc_login,
+                     hua_wlc_password,
+                     iwag2_host,
+                     iwag2_username,
+                     iwag2_password,
+                     iwag2_port
+      )
+        @iwag_telnet_connector = CSRtelnet_1.new(iwag1_host, iwag1_username, iwag1_password)
+        @ard_api_gw_connector_wifi = Savon.client do
+          #ssl_verify_mode :none
+          wsdl apigw_wsdl
+          endpoint apigw_endpoint
+          namespace apigw_namespace
+          wsse_auth(apigw_wsse_aut_log, apigw_wsse_aut_pass, :digest)
+          encoding 'UTF-8'
+          headers = {"Accept-Encoding" => "gzip, deflate", "Connection" => "Keep-Alive"}
+        end
 
-    @iwag1_host = iwag1_host
-    @iwag_username = iwag1_username
-    @iwag_password = iwag1_password
+        @iwag1_host = iwag1_host
+        @iwag_username = iwag1_username
+        @iwag_password = iwag1_password
 
-    @mtik_api_connector = NEWhubWifiApi_1.new(mtik_control_ips_get, mtik_user, mtik_password)
+        @mtik_api_connector = NEWhubWifiApi_1.new(mtik_control_ips_get, mtik_user, mtik_password)
 
-    @hua_controller_connector = HuaWifi_1.new(hua_wlc_1_ip, hua_wlc_2_ip, hua_wlc_login, hua_wlc_password)
+        @hua_controller_connector = HuaWifi_1.new(hua_wlc_1_ip, hua_wlc_2_ip, hua_wlc_login, hua_wlc_password)
 
-    @iwag_connector1 = IwagRequester.new(iwag1_host, iwag1_username, iwag1_password, iwag1_port)
-    @iwag_connector2 = IwagRequester.new(iwag2_host, iwag2_username, iwag2_password, iwag2_port)
+        @iwag_connector1 = IwagRequester.new(iwag1_host, iwag1_username, iwag1_password, iwag1_port)
+        @iwag_connector2 = IwagRequester.new(iwag2_host, iwag2_username, iwag2_password, iwag2_port)
 
-    @protocol_mtik = protocol_mtik
-    @mtik_capsman_list = mtik_capsman_list
-  end
+      end
 
 
   def python_mac_iwag1_1(ipaddress)
@@ -258,7 +252,13 @@ class WiFiPortal_1
 
   def get_subs_add_info4new_1(access_interface, subscribers_mac)
 
-    capsman_list = mtik_capsman_list
+    capsman_list = [
+        "172.24.247.15",
+        "172.24.214.155",
+        "172.24.214.140",
+        "172.24.214.105",
+        "172.24.223.105"
+    ]
 
     answer = ""
 
@@ -271,27 +271,11 @@ class WiFiPortal_1
       capsman_list.each do |capsman|
         threads_mikro_wlc << Thread.new do
           begin
-            if protocol_mtik == 'api'
-              p mikr_info5 = mtik_api_connector.get_info_subs_from_mik_1(subscribers_mac, capsman)
-              splitting5 = mikr_info5.split("---")
-              if splitting5[1] != "not on mikrotik controller" && splitting5[1]!="unknown" && splitting5[1]!=nil
-                answer = mikr_info5
-                p answer
-              end
-            elsif protocol_mtik == 'ssh'
-              p mikr_info5 = mtik_api_connector.get_info_subs_from_mik_ssh(subscribers_mac, capsman)
-              splitting5 = mikr_info5.split("---")
-              if splitting5[1] != "not on mikrotik controller" && splitting5[1]!="unknown" && splitting5[1]!=nil
-                answer = mikr_info5
-                p answer
-              end
-            else
-              p mikr_info5 = mtik_api_connector.get_info_subs_from_mik_1(subscribers_mac, capsman)
-              splitting5 = mikr_info5.split("---")
-              if splitting5[1] != "not on mikrotik controller" && splitting5[1]!="unknown" && splitting5[1]!=nil
-                answer = mikr_info5
-                p answer
-              end
+            p mikr_info5 = mtik_api_connector.get_info_subs_from_mik_1(subscribers_mac, capsman)
+            splitting5 = mikr_info5.split("---")
+            if splitting5[1] != "not on mikrotik controller" && splitting5[1]!="unknown" && splitting5[1]!=nil
+              answer = mikr_info5
+              p answer
             end
           rescue
             p "thr0 wrong"

data/lib/freewifi/mikrotik/newhub_mtik_api.rb

@@ -1,5 +1,4 @@
 require 'mtik'
-require 'net/ssh'
 
 class NEWhubWifiApi_1
 
@@ -12,184 +11,87 @@ class NEWhubWifiApi_1
   end
 
 
-  def get_info_subs_from_mik_1(subs_mac, controllers_ip)
-    input_parameters = {:subs_mac => subs_mac, :controllers_ip => controllers_ip}
-    #region get additional information
-
-    subscribers_mac = subs_mac
-    access_point =""
-    ssid_ap =""
-    tx_rate_set = ""
-    tx_rate = ""
-    rx_rate = ""
-    rx_signal = ""
-    uptime = ""
-    packets = ""
-    bytes = ""
-
-    MTik::verbose = false
-    mikrot_connection1 = MTik::Connection.new :host => controllers_ip, :user => mtik_user, :pass => mtik_password, :conn_timeout => 7, :cmd_timeout => 7
-    mikrot_connection1.get_reply('/caps-man/registration-table/getall') do |req, sentence|
-
-      req.reply.each do |reply|
-        if reply.key?('mac-address')
-          #p reply
-          if reply['mac-address'] == subscribers_mac
-
-            access_point = reply['interface']
-            ssid_ap = reply['ssid']
-            tx_rate = reply['tx-rate']
-            rx_rate = reply['rx-rate']
-            rx_signal = reply['rx-signal']
-            uptime = reply['uptime']
-            packets = reply['packets']
-            bytes = reply['bytes']
-            tx_rate_set = reply['tx-rate-set']
-          end
+def get_info_subs_from_mik_1(subs_mac, controllers_ip)
+  input_parameters = {:subs_mac => subs_mac, :controllers_ip => controllers_ip}
+  #region get additional information
+
+  subscribers_mac = subs_mac
+  access_point =""
+  ssid_ap =""
+  tx_rate_set = ""
+  tx_rate = ""
+  rx_rate = ""
+  rx_signal = ""
+  uptime = ""
+  packets = ""
+  bytes = ""
+
+  MTik::verbose = false
+  mikrot_connection1 = MTik::Connection.new :host => controllers_ip, :user => mtik_user, :pass => mtik_password, :conn_timeout => 7, :cmd_timeout => 7
+  mikrot_connection1.get_reply('/caps-man/registration-table/getall') do |req, sentence|
+
+    req.reply.each do |reply|
+      if reply.key?('mac-address')
+        #p reply
+        if reply['mac-address'] == subscribers_mac
+
+          access_point = reply['interface']
+          ssid_ap = reply['ssid']
+          tx_rate = reply['tx-rate']
+          rx_rate = reply['rx-rate']
+          rx_signal = reply['rx-signal']
+          uptime = reply['uptime']
+          packets = reply['packets']
+          bytes = reply['bytes']
+          tx_rate_set = reply['tx-rate-set']
         end
       end
     end
-
-    if access_point=="" || ssid_ap=="" || packets==""
-      access_point = "not on mikrotik controller"
-      ssid_ap = "unknown"
-      tx_rate_set = "unknown"
-      tx_rate = "0"
-      rx_rate = "0"
-      rx_signal = "0"
-      uptime = "0"
-      packets = "0"
-      bytes = "0"
-    end
-
-    if access_point==nil
-      access_point= "unknown"
-    end
-    if ssid_ap==nil
-      ssid_ap= "unknown"
-    end
-    if tx_rate_set==nil
-      tx_rate_set= "unknown"
-    end
-    if tx_rate==nil
-      tx_rate= "unknown"
-    end
-    if rx_rate==nil
-      rx_rate= "unknown"
-    end
-    if rx_signal==nil
-      rx_signal= "unknown"
-    end
-    if uptime==nil
-      uptime= "unknown"
-    end
-    if packets==nil
-      packets= "unknown"
-    end
-    if bytes==nil
-      bytes= "unknown"
-    end
-
-    #endregion
-    subscribers_mac+ "---" + access_point + "---" + ssid_ap + "---" + tx_rate_set + "---"+ tx_rate + "---"+ rx_rate + "---"+ rx_signal + "---"+ uptime + "---"+ packets + "---"+ bytes
-
   end
 
+  if access_point=="" || ssid_ap=="" || packets==""
+    access_point = "not on mikrotik controller"
+    ssid_ap = "unknown"
+    tx_rate_set = "unknown"
+    tx_rate = "0"
+    rx_rate = "0"
+    rx_signal = "0"
+    uptime = "0"
+    packets = "0"
+    bytes = "0"
+  end
 
-
-  def get_info_subs_from_mik_ssh(subs_mac, controllers_ip)
-    input_parameters = {:subs_mac => subs_mac, :controllers_ip => controllers_ip}
-    #region get additional information
-
-
-    subscribers_mac = subs_mac
-    access_point =""
-    ssid_ap =""
-    tx_rate_set = ""
-    tx_rate = ""
-    rx_rate = ""
-    rx_signal = ""
-    uptime = ""
-    packets = ""
-    bytes = ""
-
-    begin
-      Net::SSH.start(controllers_ip, mtik_user, :password => mtik_password) do |ssh|
-        #result = ssh.exec!("/interface eoip print where tunnel-id=#{tunnel_id}")
-        #p result
-        result = ssh.exec!("/caps-man registration-table print detail value-list  where mac-address=#{subs_mac}")
-        p result
-        access_point_reg = /interface:\s(.+)\r\n/
-        access_point = result.scan(access_point_reg)[0][0]
-        ssid_reg = /ssid:\s(.+)\r\n/
-        ssid_ap = result.scan(ssid_reg)[0][0]
-
-        tx_rate_set = "unknown"
-        tx_rate = "0"
-        rx_rate = "0"
-        rx_signal = "0"
-        uptime = "0"
-        packets = "0"
-        bytes = "0"
-
-        p access_point
-        p ssid_ap
-        #regimsi = /\s+name="(.+)"\s+/
-        #m1 = regimsi.match(result)[1]
-
-        #result2 = ssh.exec!("interface bridge port add bridge=#{bridge_name} interface=#{tunnel_name}")
-      end
-        #Net::SSH.stop
-    rescue
-      nil
-    end
-
-    p "1111111111111111111"
-
-    if access_point=="" || ssid_ap=="" || packets==""
-      access_point = "not on mikrotik controller"
-      ssid_ap = "unknown"
-      tx_rate_set = "unknown"
-      tx_rate = "0"
-      rx_rate = "0"
-      rx_signal = "0"
-      uptime = "0"
-      packets = "0"
-      bytes = "0"
-    end
-
-    if access_point==nil || access_point==''
-      access_point= "unknown"
-    end
-    if ssid_ap==nil || ssid_ap==''
-      ssid_ap= "unknown"
-    end
-    if tx_rate_set==nil || tx_rate_set==''
-      tx_rate_set= "unknown"
-    end
-    if tx_rate==nil || tx_rate==''
-      tx_rate= "unknown"
-    end
-    if rx_rate==nil || rx_rate==''
-      rx_rate= "unknown"
-    end
-    if rx_signal==nil || rx_signal==''
-      rx_signal= "unknown"
-    end
-    if uptime==nil || uptime==''
-      uptime= "unknown"
-    end
-    if packets==nil || packets==''
-      packets= "unknown"
-    end
-    if bytes==nil || bytes==''
-      bytes= "unknown"
-    end
-
-    #endregion
-    subscribers_mac+ "---" + access_point + "---" + ssid_ap + "---" + tx_rate_set + "---"+ tx_rate  + "---"+ rx_rate + "---"+ rx_signal + "---"+ uptime + "---"+ packets + "---"+ bytes
-
+  if access_point==nil
+    access_point= "unknown"
+  end
+  if ssid_ap==nil
+    ssid_ap= "unknown"
+  end
+  if tx_rate_set==nil
+    tx_rate_set= "unknown"
+  end
+  if tx_rate==nil
+    tx_rate= "unknown"
+  end
+  if rx_rate==nil
+    rx_rate= "unknown"
   end
+  if rx_signal==nil
+    rx_signal= "unknown"
+  end
+  if uptime==nil
+    uptime= "unknown"
+  end
+  if packets==nil
+    packets= "unknown"
+  end
+  if bytes==nil
+    bytes= "unknown"
+  end
+
+  #endregion
+  subscribers_mac+ "---" + access_point + "---" + ssid_ap + "---" + tx_rate_set + "---"+ tx_rate  + "---"+ rx_rate + "---"+ rx_signal + "---"+ uptime + "---"+ packets + "---"+ bytes
 
+end
 
 end

data/lib/freewifi/version.rb

@@ -1,3 +1,3 @@
 module Freewifi_1
-  VERSION = '0.2.5'
+  VERSION = '0.2.9'
 end

data/lib/freewifi.rb

@@ -303,9 +303,7 @@ class PortalFwifi_1
                  iwag2_username,
                  iwag2_password,
                  iwag1_port=22,
-                 iwag2_port=22,
-                 protocol_mtik='api',
-                 mtik_capsman_list
+                 iwag2_port=22
   )
 
     @general_procedures = WiFiPortal_1.new(apigw_wsdl,
@@ -327,9 +325,7 @@ class PortalFwifi_1
                                            iwag2_host,
                                            iwag2_username,
                                            iwag2_password,
-                                           iwag2_port,
-                                           protocol_mtik,
-                                           mtik_capsman_list
+                                           iwag2_port
     )
     @mtik_control_ips_get = mtik_control_ips_get
     @mtik_user = mtik_user

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: freewifi
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.9
 platform: ruby
 authors:
 - Dzmitry Buynovskiy