ruby-netmon-qt 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a978565563fb163a935e9f0a3e9e8f2cfdfaff0dcf06689aa0461e3848b2bfa1
-  data.tar.gz: 461e57c1fac0d69aaa6bc09b23b8171a6bb1be2ba7a0e1d01f51bdd27d27e270
+  metadata.gz: ef00043ddd797d7eb54541887a7fc555b4cf364776c4816fd1c0595846b1bfa5
+  data.tar.gz: ae2776b9ba39d934ca00e2429e025b45b7dc2465a45ff63c3632051c4cadcbbc
 SHA512:
-  metadata.gz: d70a7bbacf6c59cb4b7f7467b4e2ab7abe6a8b5c9f8e6f94bf69f1cae475a2cecb00451da1293e48331eb656bed714316f1653b1321466d446ef7f91be27f0d4
-  data.tar.gz: f6b49eed6b11ab1a0e169f4e3c7dd90d833b192aa169d01104f3f46959e6192f3930d67fac45c8a40ee7844236d77f48fe079438ef4dac9c10e1d64857002ec2
+  metadata.gz: 97834105620607927518ef39a38e3430cd22debf3c1e56637c850ab7ee1f63e774307764bf938e45512efd607d0b6d4fbc84bb016437d252281e5d6c12f0f371
+  data.tar.gz: c43afc8ec1c5d1fac3e97a8cce5fc90f8844d11727172ccdb57a31e54442e86a90228678003d47dd3eca41b1749c000ef9a4913c1430c66ab9bf61d32a31e430

data/lib/netmon-qt/app/components/connstableview/sortfilterproxymodel.rb

@@ -25,9 +25,11 @@ class ConnsTableView < RubyQt6::Bando::QWidget
       when COLUMN_PROCESS_NAME
         less_than_process_name(lhs, rhs)
       when COLUMN_LOCAL_ADDRESS, COLUMN_REMOTE_ADDRESS
-        less_than_column_address(lhs, rhs)
+        less_than_address(lhs, rhs)
       when COLUMN_PROCESS_ID, COLUMN_LOCAL_PORT, COLUMN_REMOTE_PORT
-        less_than_column_numeric(lhs, rhs)
+        less_than_numeric(lhs, rhs)
+      when COLUMN_SINCE
+        less_than_since(lhs, rhs)
       else
         super
       end
@@ -50,7 +52,7 @@ class ConnsTableView < RubyQt6::Bando::QWidget
       end
     end
 
-    def less_than_column_address(lhs, rhs)
+    def less_than_address(lhs, rhs)
       lhs_data = IPAddr.new(source_model.data(lhs).value.to_s)
       rhs_data = IPAddr.new(source_model.data(rhs).value.to_s)
       return false if lhs_data.ipv6? && rhs_data.ipv4?
@@ -58,10 +60,27 @@ class ConnsTableView < RubyQt6::Bando::QWidget
       lhs_data < rhs_data
     end
 
-    def less_than_column_numeric(lhs, rhs)
+    def less_than_numeric(lhs, rhs)
       lhs_data = source_model.data(lhs).value.to_s.to_i
       rhs_data = source_model.data(rhs).value.to_s.to_i
       lhs_data < rhs_data
     end
+
+    def less_than_since(lhs, rhs)
+      lhs_data, rhs_data = [lhs, rhs].map do |index|
+        s = source_model.data(index).value.to_s
+        next 0 if s.empty?
+        s.scan(/\d+\w/).map do |value_unit|
+          value, unit = value_unit[..-1].to_i, value_unit[-1]
+          case unit
+          when "d" then value * 24 * 60 * 60
+          when "h" then value * 60 * 60
+          when "m" then value * 60
+          when "s" then value
+          end
+        end.reduce(:+)
+      end
+      lhs_data < rhs_data
+    end
   end
 end

data/lib/netmon-qt/app/components/connstableview/store.rb

@@ -10,6 +10,7 @@ class ConnsTableView < RubyQt6::Bando::QWidget
   COLUMN_LOCAL_PORT     = 7
   COLUMN_REMOTE_ADDRESS = 8
   COLUMN_REMOTE_PORT    = 9
+  COLUMN_SINCE          = 10
 
   # TCP: Use Traffic Light Color Palette
   COLORS_TCP_STATE = {
@@ -49,7 +50,7 @@ class ConnsTableView < RubyQt6::Bando::QWidget
 
     def initialize(parent)
       @geoiolookup = begin
-        MaxMind::DB.new(NetmonQt.settings.GET_geolite2_mmdb, mode: MaxMind::DB::MODE_MEMORY)
+        MaxMind::DB.new(NetmonQt.settings.GET_geoip_country_mmdb, mode: MaxMind::DB::MODE_MEMORY)
       rescue Errno::EACCES, Errno::ENOENT
       end
 
@@ -92,6 +93,7 @@ class ConnsTableView < RubyQt6::Bando::QWidget
           .push("Local Port")
           .push("Remote Address")
           .push("Remote Port")
+          .push("Since")
       )
     end
 
@@ -152,7 +154,7 @@ class ConnsTableView < RubyQt6::Bando::QWidget
     def initialize_icon_ipaddress(ipaddress)
       return if @geoiolookup.nil?
 
-      islocal = Netmon.local_address?(ipaddress)
+      islocal = Netmon::LocalAddressChecker.local?(ipaddress)
       return QIcon.from_theme(QIcon::ThemeIcon::Computer) if islocal
 
       record = @geoiolookup.get(ipaddress)
@@ -188,7 +190,8 @@ class ConnsTableView < RubyQt6::Bando::QWidget
         initialize_standarditem(initialize_icon_ipaddress(conn.local_address), conn.local_address),
         initialize_standarditem(conn.local_port.to_s),
         initialize_standarditem(initialize_icon_ipaddress(conn.remote_address), conn.remote_address),
-        initialize_standarditem(conn.remote_port.to_s)
+        initialize_standarditem(conn.remote_port.to_s),
+        initialize_standarditem(conn.since_text)
       )
 
       @active_processes.add(comm)
@@ -213,7 +216,8 @@ class ConnsTableView < RubyQt6::Bando::QWidget
       {
         COLUMN_PROCESS_ID => conn.pid_text,
         COLUMN_STATE => conn.state,
-        COLUMN_USER => conn.uname
+        COLUMN_USER => conn.uname,
+        COLUMN_SINCE => conn.since_text
       }.each do |column, text|
         item = @itemmodel.item_from_index(keyitemindex.sibling_at_column(column))
         item.set_text(text)

data/lib/netmon-qt/app/components/connstableview.rb

@@ -140,6 +140,7 @@ class ConnsTableView < RubyQt6::Bando::QWidget
     @tableview.set_column_width(COLUMN_PROCESS_NAME, 128)
     @tableview.set_column_width(COLUMN_LOCAL_ADDRESS, 192)
     @tableview.set_column_width(COLUMN_REMOTE_ADDRESS, 192)
+    @tableview.set_column_width(COLUMN_SINCE, 128)
 
     @tableview.sort_by_column(COLUMN_PROCESS_NAME, Qt::AscendingOrder)
     @tableview.set_sorting_enabled(true)

data/lib/netmon-qt/app/services/conns_lookup_service.rb

@@ -14,13 +14,13 @@ class ConnsLookupService
       end
     end
 
-    Dir.glob("/proc/[1-9]*/fd/[1-9]*") do |dir|
-      ino = File.stat(dir).ino
-      conn = ino2conn[ino]
+    Dir.glob("/proc/[1-9]*/fd/[1-9]*") do |filepath|
+      conn = ino2conn[File.stat(filepath).ino]
       next if conn.nil?
 
-      conn.pid = dir.split("/")[2].to_i
+      conn.pid = filepath.split("/")[2].to_i
       conn.comm = File.read("/proc/#{conn.pid}/comm").strip
+      conn.created_at = File.lstat(filepath).ctime
     rescue Errno::EACCES, Errno::ENOENT
     end
 
@@ -39,8 +39,6 @@ class ConnsLookupService
       Netmon::Connection::PROTOCOL_UDP4
     when "udp6"
       Netmon::Connection::PROTOCOL_UDP6
-    else
-      ""
     end
   end
 end

data/lib/netmon-qt/config/settings.rb

@@ -16,8 +16,8 @@ module NetmonQt
       default_connections_check_interval
     end
 
-    def GET_geolite2_mmdb
-      default_geolite2_mmdb
+    def GET_geoip_country_mmdb
+      default_geoip_country_mmdb
     end
 
     private
@@ -26,8 +26,15 @@ module NetmonQt
       4_000
     end
 
-    def default_geolite2_mmdb
-      "/usr/share/GeoIP/GeoLite2-Country.mmdb"
+    def default_geoip_country_mmdb
+      candidates = [
+        "/usr/local/share/GeoIP/Country.mmdb",
+        "/usr/local/share/GeoIP/GeoLite2-Country.mmdb",
+        "/usr/share/GeoIP/Country.mmdb",
+        "/usr/share/GeoIP/GeoLite2-Country.mmdb"
+      ]
+      candidates.each { |filepath| return filepath if File.exist?(filepath) }
+      candidates[0]
     end
   end
 end

data/lib/netmon-qt/lib/netmon/connection.rb

@@ -29,6 +29,7 @@ module Netmon
     attr_accessor :remote_address, :remote_port
     attr_accessor :state, :uid, :inode
     attr_accessor :pid, :comm
+    attr_accessor :created_at
 
     def initialize(attrs)
       attrs.each do |attr, value|
@@ -53,5 +54,15 @@ module Netmon
       return comm if comm
       inode.zero? ? COMM_DEFUNCT : COMM_UNKNOWN
     end
+
+    def since_text
+      return "" if created_at.nil?
+
+      m, s = (Time.now - created_at).to_i.divmod(60)
+      h, m = m.divmod(60)
+      d, h = h.divmod(24)
+      units = {"d" => d, "h" => h, "m" => m, "s" => s}
+      units.map { |unit, value| value.zero? ? nil : "#{value}#{unit}" }.compact.join(" ")
+    end
   end
 end

data/lib/netmon-qt/lib/netmon/localaddresschecker.rb

@@ -0,0 +1,19 @@
+module Netmon
+  module LocalAddressChecker
+    CIDR_LIST = [
+      IPAddr.new("224.0.0.0/24"), # Local Multicast - IPv4
+      IPAddr.new("ff02::/16"),    # Local Multicast - IPv6
+      IPAddr.new("0.0.0.0"),      # Unspecified     - IPv4
+      IPAddr.new("::")            # Unspecified     - IPv6
+    ].freeze
+
+    def self.local?(address)
+      ip = IPAddr.new(address)
+      return true if ip.link_local?
+      return true if ip.loopback?
+      return true if ip.private?
+      return true if CIDR_LIST.any? { |cidr| cidr.include?(address) }
+      false
+    end
+  end
+end

data/lib/netmon-qt/lib/netmon.rb

@@ -1,3 +1,3 @@
 require_relative "netmon/connection"
-require_relative "netmon/localaddresscheck"
+require_relative "netmon/localaddresschecker"
 require_relative "netmon/procnet"

data/lib/netmon-qt/version.rb

@@ -1,3 +1,3 @@
 module NetmonQt
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/lib/netmon-qt.rb

@@ -1,4 +1,5 @@
 require "etc"
+require "ipaddr"
 
 require "maxmind/db"
 require "qt6/qtwidgets"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-netmon-qt
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - John Doe
@@ -343,7 +343,7 @@ files:
 - lib/netmon-qt/lib/contrib/sighandler.rb
 - lib/netmon-qt/lib/netmon.rb
 - lib/netmon-qt/lib/netmon/connection.rb
-- lib/netmon-qt/lib/netmon/localaddresscheck.rb
+- lib/netmon-qt/lib/netmon/localaddresschecker.rb
 - lib/netmon-qt/lib/netmon/procnet.rb
 - lib/netmon-qt/version.rb
 - misc/screenshots/mainwindow.png

data/lib/netmon-qt/lib/netmon/localaddresscheck.rb

@@ -1,19 +0,0 @@
-require "ipaddr"
-
-module Netmon
-  CIDR_LIST = [
-    IPAddr.new("224.0.0.0/24"), # Local Multicast - IPv4
-    IPAddr.new("ff02::/16"),    # Local Multicast - IPv6
-    IPAddr.new("0.0.0.0"),      # Unspecified     - IPv4
-    IPAddr.new("::")            # Unspecified     - IPv6
-  ].freeze
-
-  def self.local_address?(address)
-    ip = IPAddr.new(address)
-    return true if ip.link_local?
-    return true if ip.loopback?
-    return true if ip.private?
-    return true if CIDR_LIST.any? { |cidr| cidr.include?(address) }
-    false
-  end
-end