op5util 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddd8e69993dd982aa3c358690c9dc37c3528a051
-  data.tar.gz: bd4ee465837223e38b036747753279eeefd2faa2
+  metadata.gz: 66a61ce3bc99e6e4d91278aefc1c6d3f5f9c4fd2
+  data.tar.gz: ba3e0fd30da81840f892b86f3244337a1c74ae6b
 SHA512:
-  metadata.gz: 8887314cd4c173d9bd97e22190e78784e373ed737d961562bcdfd2831c735eeb5d71fc2ffe7df0e8e778c16c73046407dfb12627c9c45464469fb9d9ca9dfa83
-  data.tar.gz: 770838adce301257d86a0bff79d30fded9b24f9f9ba596772e26f8a1fc36e66151ef9eef1fd70f0bd7286ca4f0de2ca0e2d8f7632d70f7131a30fca74ea2c0e6
+  metadata.gz: 971e2e9b7b31ec5df7b079ed2da7b67c0783d7b21cf916b6d42df074f3d4a0bb08d2f7990b9373745a4543f251424e42fe82c020dbe3ccad374509142649b7cc
+  data.tar.gz: 27bd5cf0ba4dd63fac584f02c4e92c16b91a2465a14cc77a29ae64d73297a0d185510d4e02f78b7120b32c0af509421432cfffc994438462a24159163f15ea1b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    op5util (0.1.2)
+    op5util (0.1.3)
       colorize (= 0.8.1)
       gli (= 2.16.1)
       httparty (= 0.15.5)

data/bin/op5util

@@ -9,7 +9,7 @@ include GLI::App
 
 program_desc 'A small utility to perform common Op5 administration tasks from the command line'
 program_long_desc '
-About authentication, if you supply username/password as command-line flags they will be used first. If username/password options isn\'t supplied on the command-line, the environment variables OP5USER and OP5PASS will be used. If there are no environment variables present, the file ~/.op5pass (or --authfile=)  will be read. The file format is a single line with username and password separated by a : (colon). The supplied credentials shoud be an account with administrative privileges.
+About authentication, if you supply username/password as command-line flags they will be used first. If username/password options isn\'t supplied on the command-line, the environment variables OP5USER and OP5PASS will be used. If there are no environment variables present, the file ~/.op5pass (or --authfile=, or environment OP5AUTHFILE)  will be read. The file format is a single line with username and password separated by a : (colon). The supplied credentials shoud be an account with administrative privileges.
 
 This application uses the REST-api described at https://your.op5.sever/api/help. Although TLS/SSL is used, no verification of the certificate is done as most Op5-servers have a self-signed certificate.'
 
@@ -32,7 +32,7 @@ desc 'Hostname or IP-address of the Op5 monitor server, if not supplied the envi
 arg_name 'monitor'
 flag [:m, :monitor]
 
-desc 'Authfile containing "username:password" used to authenticate with Op5 server'
+desc 'Authfile containing "username:password" used to authenticate with Op5 server, enviromnent variable OP5AUTHFILE will override the default value'
 default_value '~/.op5pass'
 arg_name 'authfile'
 flag [:f, :authfile]
@@ -157,8 +157,11 @@ command :hostgroups do |c|
 end
 
 pre do |global, _command, _options, _args|
+  global[:authfile] = ENV['OP5AUTHFILE'] if !ENV['OP5AUTHFILE'].nil? && (global[:authfile] == '~/.op5pass')
   Op5util.check_auth(global) ? true : false
   if global[:monitor].nil? && ENV['MONITOR'].nil?
+    puts 'Hostname of Op5 server is required, Use -m/--monitor=op5.server.com or environment variable MONITOR'
+    raise Op5util::NoMonitorServerError
     false
   else
     global[:monitor] = ENV['MONITOR'] if global['monitor'].nil?
@@ -174,7 +177,7 @@ on_error do |exception|
   # return false to skip default error handling
   # TODO: Catch error and print an apropriate message
   puts "Error, #{exception}"
-  false
+  true
 end
 
 exit run(ARGV)

data/lib/op5util/check_auth.rb

@@ -8,6 +8,9 @@
 # Toplevel documentation
 module Op5util
   class NoAuthMethodError < StandardError; end
+  class UnacceptableAuthFilePermission < StandardError; end
+  class NoMonitorServerError < ArgumentError; end
+
   def check_authfile(file)
     authline = File.open(File.expand_path(file)).readline.chomp
   rescue StandardError
@@ -18,6 +21,11 @@ module Op5util
   end
 
   def check_auth(global_opts)
+    authfile_path = File.expand_path(global_opts[:authfile])
+    if File.exist?(authfile_path) && File.stat(authfile_path).mode.to_s(8)[-2, 2] != '00'
+      puts "Authfile must not be readable by other than owner, run \"chmod 400 #{global_opts[:authfile]}\" to set better permissions"
+      raise UnacceptableAuthFilePermission
+    end
     if !global_opts[:username].nil? && !global_opts[:password].nil?
       true
     elsif !ENV['OP5USER'].nil? && !ENV['OP5PASS'].nil?
@@ -28,6 +36,7 @@ module Op5util
       (global_opts[:username], global_opts[:password]) = check_authfile(global_opts[:authfile])
       global_opts[:username].nil? ? false : true
     else
+      puts 'No method of authentication with Op5-Server given'
       raise NoAuthMethodError
     end
   end

data/lib/op5util/version.rb

@@ -1,3 +1,3 @@
 module Op5util
-  VERSION = '0.1.2'.freeze
+  VERSION = '0.1.3'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: op5util
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Niklas Paulsson
@@ -146,6 +146,7 @@ files:
 - pkg/op5util-0.0.9.gem
 - pkg/op5util-0.1.0.gem
 - pkg/op5util-0.1.1.gem
+- pkg/op5util-0.1.2.gem
 - screenshots/host_op5.png
 - screenshots/host_op5_listview.png
 - screenshots/usecase1.png