zabcon 0.0.356 → 0.0.357

data/libs/revision.rb

@@ -1 +1 @@
-REVISION=356
+REVISION=357

data/libs/zabbix_server.rb

@@ -31,6 +31,8 @@ class ZabbixServer_overload < ZabbixAPI
   alias zbxapi_initialize initialize
   alias zbxapi_do_request do_request
 
+  attr_accessor :major, :minor
+
   def initialize(url,debug_level=0)
     @env = env
     zbxapi_initialize(url,debug_level)
@@ -94,6 +96,13 @@ class ZabbixServer
     puts "#{@server_url} connected"  if env["echo"]
     puts "API Version: #{@version}"  if env["echo"]
 
+    if env["session_file"] && !env["session_file"].empty?
+      path=File.expand_path(env["session_file"])
+      File.open(path,"w") do |f|
+        f.write({"auth"=>@connection.auth}.to_yaml)
+      end
+    end
+
   end
 
   def logout
@@ -111,6 +120,20 @@ class ZabbixServer
     end
   end
 
+  def use_auth(auth)
+    @server_url = @server_url.nil? ? env["server"] : @server_url
+
+    @connection = ZabbixServer_overload.new(@server_url,env["debug"])
+    @connection.auth=auth
+    major,minor=@connection.do_request(@connection.json_obj('APIInfo.version',{}))['result'].split('.')
+    @connection.major=major.to_i
+    @connection.minor=minor.to_i
+    @version=@connection.API_version
+    @connected=true
+
+    true
+  end
+
   def loggedin?
     @connected
   end

data/libs/zabcon_commands.rb

@@ -82,6 +82,11 @@ end
 ZabconCommand.add_command "logout" do
   set_method do
     server.logout
+    path=File.expand_path(env["session_file"])
+    begin
+      File.delete(path)
+    rescue Errno::ENOENT
+    end
   end
   set_help_tag :logout
 end
@@ -408,7 +413,8 @@ end
 
 ZabconCommand.add_command "add host group" do
   set_method do |params|
-    server.connection.hostgroup.create(params)
+    groupid = server.connection.hostgroup.create(params)
+    "Created host groupid: #{groupid["groupids"]}"
   end
   set_flag :login_required
   set_flag :print_output
@@ -519,7 +525,7 @@ ZabconCommand.add_command "delete user" do
     else
       id=params["id"]
     end
-    result=@connection.user.delete(id)
+    result=server.connection.user.delete(id)
 
     if !result.empty?
       puts "Deleted user id #{result["userids"]}"
@@ -564,7 +570,7 @@ ZabconCommand.add_command "update user" do
       elsif parameters["userid"].nil?
         puts "Missing required userid statement."
       end
-      @connection.user.update([parameters])
+      server.connection.user.update([parameters])
     end
   end
   set_valid_args 'userid','name', 'surname', 'alias', 'passwd', 'url',

data/libs/zabcon_core.rb

@@ -60,7 +60,25 @@ class ZabconCore
     #TODO Remove reference to ArgumentProcessor when new command objects in use
     debug(5,:msg=>"Setting up ArgumentProcessor")
 
-    if !env["server"].nil? and !env["username"].nil? and !env["password"].nil? then
+    loaded_session=false
+    begin
+      if !env["server"].nil? && !env["session_file"].nil? &&
+          !env["session_file"].empty?
+        path=File.expand_path(env["session_file"])
+        puts "Attempting to load previous session key from #{env["session_file"]}" if env["echo"]
+        yaml=YAML::load(File.open(path))
+        loaded_session=ZabbixServer.instance.use_auth(yaml["auth"])
+        puts "#{env["server"]} connected"  if env["echo"]
+        puts "API Version: #{ZabbixServer.instance.version}"  if env["echo"]
+      end
+    rescue Errno::ENOENT
+      puts "Failed to load previous session key" if env["echo"]
+    rescue ZbxAPI_ExceptionLoginPermission
+      puts "Failed to load previous session key" if env["echo"]
+    end
+
+    if !loaded_session && !env["server"].nil? &&
+      !env["username"].nil? && !env["password"].nil?
       puts "Found valid login credentials, attempting login"  if env["echo"]
       begin
         ZabbixServer.instance.login

data/revision_information

@@ -22,4 +22,8 @@
 * Added deprecate_function to Command class
   Will show a warning message with new function name to use along with
   command file path and line numbers/command name
-* Fixed Ruby version check for 1.9.x
+* Fixed Ruby version check for 1.9.x
+* Added session loading. Zabcon will save the auth key upon login to a file
+  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.

data/zabcon.conf.default

@@ -8,6 +8,12 @@ password=zabbix
 # Set the debug level.  0=off
 #debug=0
 
+#Where will the login session information be stored.
+#If a valid session is found, it's credentials will be tried first
+#thus speeding up the login/connection process.
+#Leave empty to disable.
+#session_file=~/zabcon.session
+
 # Attempt to show help for a bad command.
 #show_help=false
 

data/zabcon.rb

@@ -147,6 +147,12 @@ class ZabconApp
       opts.on("-d", "--debug LEVEL", Integer, "Specify debug level (Overrides config","file)") do |level|
         @cmd_opts.debug=level
       end
+      opts.on("-s","--session PATH","Path to the file to store session information.") do |session|
+        @cmd.session_file=session
+      end
+      opts.on("--no-session","Disable checking of the session file on startup") do
+        @cmd.session_file=""
+      end
       opts.on("-e", "--[no-]echo", "Enable startup echo.  Default is on ","for interactive") do |echo|
         @cmd_opts.echo=echo
       end
@@ -178,6 +184,7 @@ class ZabconApp
     env["load_config"]=true
     env["truncate_length"]=5000
     env["custom_commands"]=nil
+    env["session_file"]="~/zabcon.session"
 
     #output related environment variables
     env["table_output"]=STDIN.tty?   # Is the output a well formatted table, or csv like?

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zabcon
 version: !ruby/object:Gem::Version 
-  hash: 727
+  hash: 725
   prerelease: false
   segments: 
   - 0
   - 0
-  - 356
-  version: 0.0.356
+  - 357
+  version: 0.0.357
 platform: ruby
 authors: 
 - A. Nelson