zabcon 0.0.357 → 0.0.366

data/libs/command_tree.rb

@@ -19,8 +19,8 @@
 #--
 ##########################################
 # Subversion information
-# $Id: command_tree.rb 347 2011-11-23 06:59:47Z nelsonab $
-# $Revision: 347 $
+# $Id: command_tree.rb 365 2011-12-22 04:26:54Z nelsonab $
+# $Revision: 365 $
 ##########################################
 #++
 
@@ -439,7 +439,7 @@ class Command
   end
 
   def call_tokenizer(parameters)
-    debug(6,:msg=>"parameters",:var=>"\"#{parameters.to_s}\"")
+    debug(6,:msg=>"parameters",:var=>"\"#{parameters.inspect}\"")
     debug(7,:msg=>"Using tokenizer", :var=>@tokenizer.to_s)
     tokenized_parameters=@tokenizer.new(parameters)
     tokenized_parameters=@tokenizer_method.call(tokenized_parameters) if @tokenizer_method
@@ -448,7 +448,7 @@ class Command
   end
 
   def call_arg_processor(parameters)
-    debug(6,:msg=>"parameters",:var=>"\"#{parameters.to_s}\"")
+    debug(6,:msg=>"parameters",:var=>"\"#{parameters.inspect}\"")
     check_parameters(parameters)
     @arguments=Arguments.new(parameters, @flags)
     debug(6,:var=>@arguments)
@@ -480,7 +480,7 @@ class Command
 
     puts @depreciated if !@depreciated.nil?
     if !@flags.nil? && @flags[:login_required] && !server.connected?
-      raise LoginRequired.new("\"#{@command_name}\" requires an active login")
+      raise LoginRequired.new("\"#{@path.join(" ")}\" requires an active login")
     end
 
     @response.data=@cmd_method.call(parameters)

data/libs/help.xml

@@ -21,8 +21,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 ##########################################
 Subversion information
-$Id: help.xml 281 2011-04-06 18:10:16Z nelsonab $
-$Revision: 281 $
+$Id: help.xml 361 2011-12-19 00:21:52Z richlv $
+$Revision: 361 $
 ##########################################
 
  Zabcon help file
@@ -166,7 +166,7 @@ Add Item
 syntax: add item type=active hostid=num description="some text" key="item.key"
 
 valid parameters:
-  hostid, snmpv3_securitylevel, snmp_community, publickey, delta, history, 
+  hostid, snmpv3_securitylevel, snmp_community, publickey, delta, history,
   key, snmp_oid, delay_flex, multiplier, delay, mtime, username, authtype,
   data_type, ipmi_sensor,snmpv3_authpassphrase, prevorgvalue, units, trends,
   snmp_port, formula, type, params, logtimefmt, snmpv3_securityname,
@@ -242,7 +242,7 @@ syntax: delete user id=num
 
   <item command="delete_item">
 Delete Item
-syntax: delete item itemid=num 
+syntax: delete item itemid=num
  itemid must be a number
  </item>
 

data/libs/input.rb

@@ -18,8 +18,8 @@
 
 ##########################################
 # Subversion information
-# $Id: input.rb 272 2011-01-06 21:04:22Z nelsonab $
-# $Revision: 272 $
+# $Id: input.rb 361 2011-12-19 00:21:52Z richlv $
+# $Revision: 361 $
 ##########################################
 
 require 'readline'

data/libs/lexer.rb

@@ -19,8 +19,8 @@
 #--
 ##########################################
 # Subversion information
-# $Id: lexer.rb 345 2011-11-23 04:28:53Z nelsonab $
-# $Revision: 345 $
+# $Id: lexer.rb 361 2011-12-19 00:21:52Z richlv $
+# $Revision: 361 $
 ##########################################
 #++
 

data/libs/printer.rb

@@ -19,8 +19,8 @@
 
 ##########################################
 # Subversion information
-# $Id: printer.rb 332 2011-09-30 07:24:38Z nelsonab $
-# $Revision: 332 $
+# $Id: printer.rb 361 2011-12-19 00:21:52Z richlv $
+# $Revision: 361 $
 ##########################################
 
 require 'zbxapi/zdebug'
@@ -348,7 +348,7 @@ class OutputPrinter
       else
         cols_to_show=cols.empty? ? nil : cols[:show]
       end
-    
+
       puts dataset.message if dataset.message
 
 #    p dataset[:result].class

data/libs/revision.rb

@@ -1 +1 @@
-REVISION=357
+REVISION=366

data/libs/utility_items.rb

@@ -17,8 +17,8 @@
 
 ##########################################
 # Subversion information
-# $Id: utility_items.rb 325 2011-09-26 08:57:00Z nelsonab $
-# $Revision: 325 $
+# $Id: utility_items.rb 361 2011-12-19 00:21:52Z richlv $
+# $Revision: 361 $
 ##########################################
 
 require "zbxapi/zdebug"

data/libs/zabbix_server.rb

@@ -22,6 +22,7 @@
 # $Revision: 325 $
 ##########################################
 
+require 'yaml'
 require 'zbxapi'
 require 'zbxapi/zdebug'
 require 'libs/zabcon_globals'
@@ -101,6 +102,8 @@ class ZabbixServer
       File.open(path,"w") do |f|
         f.write({"auth"=>@connection.auth}.to_yaml)
       end
+      #Enforce that the auth cache file isn't world readable
+      File.chmod(0600,path)
     end
 
   end

data/libs/zabcon_commands.rb

@@ -17,8 +17,8 @@
 
 ##########################################
 # Subversion information
-# $Id: zabcon_commands.rb 350 2011-11-23 09:46:46Z nelsonab $
-# $Revision: 350 $
+# $Id: zabcon_commands.rb 364 2011-12-22 04:21:13Z nelsonab $
+# $Revision: 364 $
 ##########################################
 
 require "zbxapi/zdebug"
@@ -267,10 +267,14 @@ ZabconCommand.add_command "raw api" do
     params.delete_at(0)
     args={}
     if !params.empty?
-      args=ExpressionTokenizerHash.new(params.join(" ")).parse
+      params.each { |param|
+        if param.is_a?(Hash)
+          args.merge!(param)
+        else
+          raise Command::ParameterError.new("Unexpected parameter \"#{param}\"")
+        end
+      }
     end
-    #api_func=params[:method]
-    #params=params[:params]
     server.connection.raw_api(api_func, args)
   end
 

data/libs/zabcon_core.rb

@@ -20,8 +20,8 @@
 
 ##########################################
 # Subversion information
-# $Id: zabcon_core.rb 350 2011-11-23 09:46:46Z nelsonab $
-# $Revision: 350 $
+# $Id: zabcon_core.rb 365 2011-12-22 04:26:54Z nelsonab $
+# $Revision: 365 $
 ##########################################
 
 #require 'libs/utility_items'
@@ -29,6 +29,7 @@ require 'libs/revision'
 require 'parseconfig'
 require 'ostruct'
 require 'rexml/document'
+require 'yaml'
 require 'libs/zabbix_server'
 require 'libs/printer'
 require 'zbxapi/zdebug'
@@ -185,6 +186,7 @@ class ZabconCore
     end
 
     return if load_path.nil? || load_path.empty?
+    env["load_count"]||=0
 
     load_path.each { |f|
       env["load_count"]+=1
@@ -227,27 +229,30 @@ class ZabconCore
 
         end  # while
       end #end catch
-    rescue CommandList::InvalidCommand => e
-      puts e.message
-      retry
-    rescue Command::NonFatalError => e
-      puts e.message
-      retry
-    rescue Command::ParameterError => e
-      puts e.message
-      retry
-    rescue ZabbixServer::ConnectionProblem => e
+    rescue CommandList::InvalidCommand, Command::NonFatalError,
+        Command::ParameterError, ZabbixServer::ConnectionProblem,
+        ZbxAPI_ExceptionVersion, ZbxAPI_ExceptionBadAuth,
+        ZbxAPI_ParameterError, Command::LoginRequired => e
       puts e.message
       retry
+    #rescue Command::NonFatalError => e
+    #  puts e.message
+    #  retry
+    #rescue Command::ParameterError => e
+    #  puts e.message
+    #  retry
+    #rescue ZabbixServer::ConnectionProblem => e
+    #  puts e.message
+    #  retry
     rescue ParseError => e  #catch the base exception class
       e.show_message
       retry if e.retry?
-    rescue ZbxAPI_ExceptionVersion => e
-      puts e
-      retry  # We will allow for graceful recover from Version exceptions
-    rescue ZbxAPI_ExceptionBadAuth => e
-      puts e.message
-      retry
+    #rescue ZbxAPI_ExceptionVersion => e
+    #  puts e
+    #  retry  # We will allow for graceful recover from Version exceptions
+    #rescue ZbxAPI_ExceptionBadAuth => e
+    #  puts e.message
+    #  retry
     rescue ZbxAPI_ExceptionLoginPermission
       puts "No login permissions"
       retry

data/revision_information

@@ -27,3 +27,10 @@
   which is determined by the config file option "session_file".  When starting
   this file is interrogated if an auth key is found, Zabcon will try to use it.
   If the auth key does not work it continues with the normal startup sequence.
+* Configured auth cache file to have permissions of 0600
+* Fixed crash with ZBXAPI_ParameterError
+* Fixed command line override for auth
+
+*** 12/21/11 nelsonab
+* Fixed Bug #89
+* Fixed Bug #88

data/zabcon.conf.default

@@ -1,5 +1,5 @@
 server=http://localhost
-username=admin
+username=Admin
 password=zabbix
 
 # The following is a list of user editable config file options, the following
@@ -61,9 +61,9 @@ password=zabbix
 #show_load=all
 
 #dir1=custom_commands
-#If custom_commands is a directory in /usr/local/zabcon all files i that
+#If custom_commands is a directory in /usr/local/zabcon all files in that
 #directory, except (dot) files, will be loaded because the base search
-#path is /usr/loca/zabcon
+#path is /usr/local/zabcon
 
 #dir2=~/zabcon_commands
 #file1=~/my_zabcon_commands.rb

data/zabcon.rb

@@ -20,8 +20,8 @@
 
 ##########################################
 # Subversion information
-# $Id: zabcon.rb 325 2011-09-26 08:57:00Z nelsonab $
-# $Revision: 325 $
+# $Id: zabcon.rb 361 2011-12-19 00:21:52Z richlv $
+# $Revision: 361 $
 ##########################################
 
 #setup our search path or libraries
@@ -148,10 +148,10 @@ class ZabconApp
         @cmd_opts.debug=level
       end
       opts.on("-s","--session PATH","Path to the file to store session information.") do |session|
-        @cmd.session_file=session
+        @cmd_opts.session_file=session
       end
       opts.on("--no-session","Disable checking of the session file on startup") do
-        @cmd.session_file=""
+        @cmd_opts.session_file=""
       end
       opts.on("-e", "--[no-]echo", "Enable startup echo.  Default is on ","for interactive") do |echo|
         @cmd_opts.echo=echo

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zabcon
 version: !ruby/object:Gem::Version 
-  hash: 725
+  hash: 707
   prerelease: false
   segments: 
   - 0
   - 0
-  - 357
-  version: 0.0.357
+  - 366
+  version: 0.0.366
 platform: ruby
 authors: 
 - A. Nelson
@@ -15,7 +15,7 @@ autorequire:
 bindir: .
 cert_chain: []
 
-date: 2011-12-18 00:00:00 -05:00
+date: 2011-12-21 00:00:00 -05:00
 default_executable: zabcon
 dependencies: 
 - !ruby/object:Gem::Dependency