gnms 2.1.0.rc2 → 2.1.0

data/gnms.gemspec

@@ -33,8 +33,8 @@ end
 
 Gem::Specification.new do |s|
   s.name        = "gnms"
-  #s.version     = GNMSVERSION
-  s.version     = "#{GNMSVERSION}.rc2"
+  s.version     = GNMSVERSION
+  #s.version     = "#{GNMSVERSION}.rc2"
   s.platform    = Gem::Platform::RUBY
   s.required_ruby_version = '>= 1.8.6'
   s.authors     = ["David Maciejak"]
@@ -54,14 +54,14 @@ Gem::Specification.new do |s|
 
   s.add_dependency("facter")
   s.add_dependency("goocanvas")
-  s.add_dependency("gdk_pixbuf2", "~> 1.1.7")
-  s.add_dependency("glib2", "~> 1.1.7")
-  s.add_dependency("gtk2", "~> 1.1.7")
+  s.add_dependency("gdk_pixbuf2", ">= 1.1.7")
+  s.add_dependency("glib2", ">= 1.1.7")
+  s.add_dependency("gtk2", ">= 1.1.7")
   s.add_dependency("net-ssh")
   s.add_dependency("snmp")
   s.add_dependency("xmpp4r")
   s.add_dependency("sqlite3")
-  s.add_dependency("pcaprub", "~>0.11.3")
+  s.add_dependency("pcaprub", ">= 0.11.3")
   s.add_dependency("packetfu")
   s.add_dependency("gruff")
 #  s.add_dependency("ruby-ldap")  

data/lib/cmd_parse.rb

@@ -148,14 +148,12 @@ def listport(ip)
     if nmap_version >= 6.0 
       lp=`#{$config.nmap_path} -sU -sT #{ip} --host_timeout 60 2>/dev/null| grep open | grep "^[0-9]"`
     else
-      lp=`#{$config.nmap_path} -sU -sT #{ip} --host_timeout 60000 2>/dev/null| grep open | grep "^[0-9]"`	
+      if nmap_version > 0.0
+        lp=`#{$config.nmap_path} -sU -sT #{ip} --host_timeout 60000 2>/dev/null| grep open | grep "^[0-9]"`
+      end
     end
-    $_=lp
-    gsub("/"," ")
-    gsub("open","")
-    gsub("|filtered","")
-    gsub("\ +"," ")
-    return $_
+    result = lp.gsub("/"," ").gsub("open","").gsub("|filtered","").gsub("\ +"," ")    
+    return result
 end
 
 #
@@ -282,68 +280,66 @@ end
 #	verify if oid ref threshold value is ok
 #
 def test_monitored_snmp(ip)
-	$log.info "cmd_parse test_monitored_snmp #{ip}"
-	if $host[ip] && ($host[ip].snmp_monitoring.size() > 0)
-		max_severity=UNKNOWN
-
-	  if $host[ip].get_account_id("snmp")
-  	  community_pub, community_priv = $host[ip].get_account_id("snmp")
-		begin
+  if $host[ip] && ($host[ip].snmp_monitoring.size() > 0)
+    max_severity = UNKNOWN
 
-		SNMP::Manager.open(:Host => ip, :Community => community_pub, :Version => get_snmp_version($host[ip].get_default_inherit_snmp_version()), :Port => $host[ip].get_default_inherit_snmp_port().to_i, :Timeout => $host[ip].get_default_inherit_snmp_timeout().to_i, :Retries => $host[ip].get_default_inherit_snmp_retry().to_i) do |manager|
-		  $host[ip].snmp_monitoring.each_value {|snmp_mon|
-			  if snmp_mon.active?()
-				 snmp_oper="#{snmp_mon.oper()}"
-				 if "#{snmp_mon.oper()}" == "="
-					 snmp_oper="=="
-				 end
-				 begin
-
-				 snmp_direct_value="#{snmp_mon.value(manager,$host[ip])}"
-				 #here snmp_direct_value can be a string and not an operation
-				 #check if a OID value in not known by the agent
-				 if !snmp_direct_value.include?("Null")
-					 expr_test=""
-					 if snmp_direct_value.match('^[\d.+*/ -]+$')
-						 expr_test="#{snmp_direct_value} #{snmp_oper} #{snmp_mon.threshold}"
-					 else
-						 expr_test="'#{snmp_direct_value}' #{snmp_oper} '#{snmp_mon.threshold}'"
-					 end
-					 if eval(expr_test)
-						 if $status_value[snmp_mon.raw_severity] > max_severity
-							 max_severity=$status_value[snmp_mon.raw_severity]
-						 end
-				      	 	$event_win.add_event(EventWindow::SNMP_EVENT_TYPE, get_level_from_status($status[$status_value.index(max_severity)]), $host[ip], "Monitoring #{snmp_mon.oidref} matched")
-					 end
-				 else
-					$log.error("Problem in SNMP request on #{ip}, seems OID used is unknown on remote agent")
-					$event_win.add_event(EventWindow::SNMP_EVENT_TYPE, "ERR", $host[ip], "OID #{snmp_mon.oidref} used is unknown on remote agent")
-				 end
-				 rescue
-					$log.error("Problem in SNMP request on #{ip}, validate #{snmp_mon.oidref} OID Reference")
-					$event_win.add_event(EventWindow::SNMP_EVENT_TYPE, "ERR", $host[ip], "Problem validate #{snmp_mon.oidref} OID Reference")
-					return
-				 end
-			  end
-		  }
-		  #set the snmp severity to max find for this host
-		  if max_severity > $host[ip].snmp_sev
-			  $host[ip].set_snmp_severity(max_severity)
-		  end
-
-		end #manager
-		rescue Exception => msg
-			$log.error("Exception in test_monitored_snmp for #{ip}: #{msg}")
-		end
-	else
-		$log.error("snmp account not set for host #{ip}")
-		$event_win.add_event(EventWindow::SNMP_EVENT_TYPE, "ERR", $host[ip], "snmp account not set")
-	end
-	else
-		if $host[ip]
-				$host[ip].set_snmp_severity(UNMANAGED)
-		end
-	end
+    community_pub = $config.read_community
+    community_priv = $config.write_community
+    if $host[ip].get_account_id("snmp")
+      community_pub, community_priv = $host[ip].get_account_id("snmp")
+    end
+    begin
+      SNMP::Manager.open(:Host => ip, :Community => community_pub, :Version => get_snmp_version($host[ip].get_default_inherit_snmp_version()), :Port => $host[ip].get_default_inherit_snmp_port().to_i, :Timeout => $host[ip].get_default_inherit_snmp_timeout().to_i, :Retries => $host[ip].get_default_inherit_snmp_retry().to_i) do |manager|
+        $host[ip].snmp_monitoring.each_value {|snmp_mon|
+          if snmp_mon.active?()
+            snmp_oper="#{snmp_mon.oper()}"
+            if "#{snmp_mon.oper()}" == "="
+              snmp_oper="=="
+            end
+            begin
+
+              snmp_direct_value="#{snmp_mon.value(manager,$host[ip])}"
+              #here snmp_direct_value can be a string and not an operation
+              #check if a OID value in not known by the agent
+              if !snmp_direct_value.include?("Null")
+                expr_test=""
+                if snmp_direct_value.match('^[\d.+*/ -]+$')
+                  expr_test="#{snmp_direct_value} #{snmp_oper} #{snmp_mon.threshold}"
+                else
+                  expr_test="'#{snmp_direct_value}' #{snmp_oper} '#{snmp_mon.threshold}'"
+                end
+                if eval(expr_test)
+                  if $status_value[snmp_mon.raw_severity] > max_severity
+                    max_severity=$status_value[snmp_mon.raw_severity]
+                  end
+                  $event_win.add_event(EventWindow::SNMP_EVENT_TYPE, get_level_from_status($status[$status_value.index(max_severity)]), $host[ip], "Monitoring #{snmp_mon.oidref} matched")
+                end
+              else
+                $log.error("Problem in SNMP request on #{ip}, seems OID used is unknown on remote agent")
+                $event_win.add_event(EventWindow::SNMP_EVENT_TYPE, "ERR", $host[ip], "OID #{snmp_mon.oidref} used is unknown on remote agent")
+              end
+            rescue
+              $log.error("Problem in SNMP request on #{ip}, validate #{snmp_mon.oidref} OID Reference")
+              $event_win.add_event(EventWindow::SNMP_EVENT_TYPE, "ERR", $host[ip], "Problem validate #{snmp_mon.oidref} OID Reference")
+              return
+            end
+          end
+        }
+        #set the snmp severity to max find for this host
+        if max_severity > $host[ip].snmp_sev
+          $host[ip].set_snmp_severity(max_severity)
+        end
+      end #manager
+    rescue SNMP::RequestTimeout
+      $log.debug("test_monitored_snmp: request timeout to #{ip} port: #{$host[ip].get_default_inherit_snmp_port().to_i} community: #{community_pub} snmp_version: #{get_snmp_version(node.get_default_inherit_snmp_version())}")              
+    rescue Exception => msg
+      $log.error("Exception in test_monitored_snmp for #{ip}: #{msg}")
+    end
+  else
+    if $host[ip]
+      $host[ip].set_snmp_severity(UNMANAGED)
+    end
+  end
 end
 
 #

data/lib/config_global.rb

@@ -27,7 +27,7 @@ DEFAULT_SOUND_FILE = "Just beep"
 	attr_reader :default_width, :default_height, :default_map, :show_label, :noshow_fqdn, :show_tooltips, :confirm_delete, :confirm_quit, :log_level
 	attr_reader :read_community, :write_community, :snmp_version, :snmp_port, :snmp_timeout, :snmp_retry, :mail_server_addr, :mail_server_port, :sms_device, :im_login, :im_password, :irc_server, :irc_port, :irc_channel
 	attr_accessor :level
-	attr_reader :broadcast_ping_state, :broadcast_ping_delay, :mac_state, :mac_delay, :mac_lock, :mac_manufacturer, :syslog_mon, :syslog_port, :snmptrap_mon, :snmptrap_port, :snmptrap_community
+	attr_reader :find_node_state, :find_node_delay, :mac_state, :mac_delay, :mac_lock, :mac_manufacturer, :syslog_mon, :syslog_port, :snmptrap_mon, :snmptrap_port, :snmptrap_community
 	attr_reader :node_resolving, :node_resolving_delay
 	attr_reader :port_mon, :port_mon_delay, :snmp_mon, :snmp_mon_delay, :wmi_mon, :wmi_mon_delay, :custom_mon, :custom_mon_delay, :jmx_mon, :jmx_mon_delay
 	attr_reader :ping_path, :nmap_path, :ssh_path, :telnet_path, :browser_path, :vncviewer_path, :rdesktop_path, :xterm_path, :nmblookup_path, :xprobe_path, :wmic_path
@@ -130,8 +130,8 @@ def read_config_yaml()
 	  @sms_num_by_level = db["notification"]["sms_num"]
 	  @im_dest_by_level = db["notification"]["im_dest"]
 	  
-	  @broadcast_ping_state = db["scan"]["broadcast_ping"]["state"]
-	  @broadcast_ping_delay = db["scan"]["broadcast_ping"]["delay"]
+	  @find_node_state = db["scan"]["find_node"]["state"]
+	  @find_node_delay = db["scan"]["find_node"]["delay"]
 	  @mac_state = db["scan"]["mac"]["state"]
 	  @mac_delay = db["scan"]["mac"]["delay"]
 	  @mac_lock = db["scan"]["mac"]["lock"]
@@ -233,9 +233,9 @@ notification = {
 	}
 
 scan = {
-	'broadcast_ping' => {
-				'state' => @broadcast_ping_state,
-				'delay' => @broadcast_ping_delay.to_i,
+	'find_node' => {
+				'state' => @find_node_state,
+				'delay' => @find_node_delay.to_i,
 				},
 	'mac' => {
 			'state' => @mac_state,
@@ -385,7 +385,7 @@ def initialize ()
 	@wmi_mon_delay = "60"
 	@custom_mon_delay = "60"
 	@jmx_mon_delay = "60"
-	@broadcast_ping_delay = "300"
+	@find_node_delay = "300"
 	@node_resolving = true
 	@node_resolving_delay = "120"
 	@mac_delay = "60"

data/lib/format.rb

@@ -60,6 +60,23 @@ def isValidPort(port)
 	return false
 end
 
+def isValidMac(mac)
+  if mac.nil?
+    return false
+  end
+  lmac = mac.split(/:/)
+  if lmac.size != 6
+     return false
+  end
+  lmac.each do |val|
+    val_dec = val.to_i(16)
+    if (val.length != 2) || (val_dec > 255 || val_dec < 0)
+	return false
+    end
+  end
+  return true
+end
+
 #
 #	return true if arg is an integer
 #	need: an arg

data/lib/gnms.rb

@@ -38,6 +38,9 @@ PLUGIN_DIR = "#{GNMSLIB}/../plugins"
 ROOTMAPADDR="0.0.0.0"
 ROOTMAPNAME="ROOT"
 
+NILMAC = "00:00:00:00:00:00"
+DEFAULT_CLASS_C_NETMASK = "255.255.255.0"
+
 GNMS_PROJECT_SERVER="gnms.rubyforge.org"
 GNMS_PROJECT_URL=""
 
@@ -197,7 +200,7 @@ def verify_system_conf()
 			$log.error("This tool needs at least GTK version 2.4")
 		end
 	else
-		$log.error("This tool needs Ruby 1.8 or Ruby 1.9")
+		$log.error("This tool needs at least Ruby 1.8")
 	end
 	return 1
 end
@@ -223,9 +226,11 @@ end
 
 ####################################################################################
 #
-#	go!
+# let's rock!
 #
 
+require "#{GNMSLIB}"+'/version'
+require "#{GNMSLIB}"+'/main'
 
 #verify ruby/gtk/gnome conf
 unless verify_system_conf == 0
@@ -234,13 +239,7 @@ unless verify_system_conf == 0
 else
 	$log.info("System configuration is ok")
 
-
-##############################################################################
-#load other files
-require "#{GNMSLIB}"+'/version'
-require "#{GNMSLIB}"+'/main'
-##############################################################################
-
+$log.info("Running GNMS version #{GNMSVERSION}")
 
 Gtk::RC.parse_string <<EOS
 

data/lib/gui/adddelnode.rb

@@ -2,7 +2,6 @@
 # here we can find Gtk::Window for add or del an host
 #
 
-
 #
 # window to ask in which map to add a node,
 # list networks in combobox
@@ -30,7 +29,8 @@ def choose_network_map(node_ip, default_map=nil)
     get_network().each { |n|
       entry_map.append_text(n)
     }
-    entry_map.set_active(0)
+    entry_map.prepend_text("Exception list")
+    entry_map.set_active(1)
     if !default_map.nil? and !default_map.empty?
       ind = get_network().index(default_map)
       entry_map.set_active(ind) if ind
@@ -40,7 +40,7 @@ def choose_network_map(node_ip, default_map=nil)
     ok_button.signal_connect("clicked") {
       result = entry_map.active_text
       choosemap_win.destroy
-      $network_map_result = result 
+      $network_map_result = result
     }
     cancel_button = Gtk::Button.new(Gtk::Stock::CANCEL)
     cancel_button.signal_connect("clicked") {
@@ -55,14 +55,15 @@ def choose_network_map(node_ip, default_map=nil)
     end
     }
     
-    check_map = Gtk::CheckButton.new("Always use this network")
+    check_map = Gtk::CheckButton.new("Always map to this network")
     if $network_map_always == 1
       check_map.set_active true
     else
       check_map.set_active false    
     end
     check_map.signal_connect("toggled") {
-      $network_map_always = check_map.active? ? 1 : 0
+      # we don't care of the box is checked when the map is set to exception
+        $network_map_always = check_map.active? ? 1 : 0        
     }
     
     bbox.add ok_button
@@ -157,7 +158,7 @@ def addnodewin()
   hbox = Gtk::HBox.new
   hbox.show
   entry_netmask = Gtk::Entry.new
-  entry_netmask.set_text "255.255.255.0"
+  entry_netmask.set_text DEFAULT_CLASS_C_NETMASK
   entry_netmask.set_editable false
   entry_netmask.show
 
@@ -528,7 +529,7 @@ def addnetworkwin()
   hbox = Gtk::HBox.new
   hbox.show
   entry_netmask = Gtk::Entry.new
-  entry_netmask.set_text "255.255.255.0"
+  entry_netmask.set_text DEFAULT_CLASS_C_NETMASK
   entry_netmask.set_editable false
   entry_netmask.show
 
@@ -662,7 +663,7 @@ def addnetworkwin()
 end
 
 #
-# delete node
+# delete node window
 #
 def delnodewin()
     if $win == nil
@@ -795,5 +796,103 @@ def delnodewin()
 	 vbox_root.pack_start(separator, FALSE, TRUE, 0)
 	 vbox_root.pack_start(bbox, FALSE, TRUE, 0)
 
-    delwin.show
+   delwin.show
+end
+
+#
+# unwanted node window
+#
+def unwantednodewin()
+  if $win == nil
+    return
+  end
+  
+  unwtdwin=Gtk::Window.new
+  unwtdwin.set_transient_for($win)
+  unwtdwin.set_title("Unwanted node")
+  unwtdwin.set_size_request(250, 160)
+  unwtdwin.set_modal(true)
+
+  unwtdwin.signal_connect("key_press_event") {|w,e|
+    if e.keyval == Gdk::Keyval::GDK_Escape
+      unwtdwin.destroy
+    end
+  }
+
+  frame = Gtk::Frame::new("Del exception")
+  frame.border_width=10
+  frame.show
+  vbox_root=Gtk::VBox::new
+  vbox_root.show
+  unwtdwin.add vbox_root
+  vbox_root.add frame
+  vbox = Gtk::VBox.new
+  vbox.show
+  frame.add vbox
+
+  table = Gtk::Table.new(2,2,false)
+  table.set_row_spacings(5)
+  table.set_size_request(-1,15)
+  table.show
+
+  label_value = Gtk::Label.new "Value"
+  label_value.show
+  combo_value=Gtk::ComboBox.new
+  $node_exception_list.sort.each do |str|
+    combo_value.append_text(str)
+  end
+  combo_value.set_active(0)
+  combo_value.show
+
+  table.attach(label_value,0,1,0,1)
+  table.attach(combo_value,1,2,0,1)
+  
+  label_map_exception = Gtk::Label.new "Always map new node"
+  label_map_exception.show
+  check_map = Gtk::CheckButton.new
+  if $network_map_always == 1
+    check_map.set_active true
+  else
+    check_map.set_active false    
+  end
+  check_map.show
+  check_map.signal_connect("toggled") {
+    $network_map_always = check_map.active? ? 1 : 0        
+  }
+
+  table.attach(check_map,0,1,1,2)
+  table.attach(label_map_exception,1,2,1,2)  
+  
+  del_button = Gtk::Button.new(Gtk::Stock::REMOVE)
+  del_button.show
+  del_button.signal_connect("clicked") {
+    if combo_value.active >= 0
+      del_node_def_exception_list(combo_value.active_text)
+      combo_value.remove_text(combo_value.active)
+      combo_value.set_active(0)
+    end
+  }
+
+  close_button = Gtk::Button.new(Gtk::Stock::CLOSE)
+  close_button.show
+  close_button.signal_connect("clicked") {
+    unwtdwin.destroy
+  }
+
+  bbox =Gtk::HBox::new(FALSE, 10)
+  bbox.border_width=10
+  bbox.show
+
+  del_button.set_flags(Gtk::Widget::CAN_DEFAULT)
+  bbox.pack_start(del_button, TRUE, TRUE, 0)
+  close_button.set_flags(Gtk::Widget::CAN_DEFAULT)
+  bbox.pack_start(close_button, TRUE, TRUE, 0)
+
+  vbox.pack_start(table, FALSE, TRUE)
+  separator = Gtk::HSeparator::new()
+  separator.show
+  vbox_root.pack_start(separator, FALSE, TRUE, 0)
+  vbox_root.pack_start(bbox, FALSE, TRUE, 0)
+
+  unwtdwin.show
 end