phoseum-cli 0.0.21 → 0.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e2bd25792289a6beebdf3d17cb4b4365086d407348c4ca7e17862b65522f57d
-  data.tar.gz: f4fbfa8dc826cfb429b15b3ccbc79446af45d6a44dbd99e01ce96ee77dfa15b6
+  metadata.gz: dda101298c10dfba931a42da89cf49f7621341ab94c6f6eb5b763d17abe36084
+  data.tar.gz: 3b60673f5aa9ace4862570622496360d83352d89407d9863cf4f2391ba73efb3
 SHA512:
-  metadata.gz: f25658cea0878061423c1761a5017fcbc4e78535bbce0175266539732f7eb862db30342d7a7276e182a71461548f021112c460c8d253dabc5624d17bc2597285
-  data.tar.gz: 7cd9478c899d770e8cb15e1d83f1e0a030783ac3f5f10bdf99d2e8c046588001c77818b9d6abeb900fa2b979fa9bd47f87427f2305db0074d4cd501b4daabb77
+  metadata.gz: 113d85253686c204b3eaa02643050193cdb7a65ea33e1654b7fa8da1c1e65f56b197db195c0f4cc9059f447a4781c18f5b48afce52dd5b7b36e23ff25657d6dd
+  data.tar.gz: 46efcbf1a8b7679f9c0888355ebc1963f047bc56ab079b9122f9e0050b84ab4162b6d4906066b4b213d8410b16c544475664ceed0fccb2a86bbb3948bedf8771

data/bin/phoseum-cli

@@ -237,45 +237,6 @@ def health(what='',name='')
   exit 0
 end
 
-def user_mgmt(action,user,pass='',role='')
-  post_body={}
-  if action == "add_user"
-    post_body=JSON.generate({"action" => "create-user", "user" => "#{user}", "password" => "#{pass}", "role" => "#{role}"})
-    if !$config['DEFAULT_SECRET']
-      puts "You must have a DEFAULT_SECRET setting to be able to create a user".red
-      exit 1
-    end
-  end
-  base = URI.parse("#{$config['SERVERURL']}")
-  puts "\nConnecting to: #{$config['SERVERURL']}".yellow if !$QUIET
-  request = Net::HTTP::Post.new(base)
-  request.body = post_body
-  request.basic_auth("auth", $config['DEFAULT_SECRET'])
-  response = Net::HTTP.start(base.hostname, $config['PORT'],
-                             :timeout => $config['CALL_TIMEOUT'],
-                             :use_ssl => base.scheme == "https",
-                             :verify_mode => OpenSSL::SSL::VERIFY_PEER,
-                             :ca_file => $config['CA_TRUST']
-                             ) do |http|
-    http.request(request)
-  end
-  begin
-    list = JSON.parse(response.body)
-    if list['error']
-      puts list['error'].red
-      exit 1
-    end
-    if list['success']
-      data=list['success']
-      puts data
-    end
-  rescue
-    puts "Error on Login".red
-    puts clean_html(response.body)
-  end
-  exit 0
-end
-
 def user_login(puser='',ppass='')
 
   server_value = cross_versions()
@@ -388,6 +349,17 @@ case options
     end
     health(what,value)
   when -> (cre) { cre[:create_user] }
+    secretinfo = api_caller({"action" => "check-secret", "value" => $config['DEFAULT_SECRET']},true)
+    if secretinfo['error']
+      err_msg = JSON.parse(secretinfo)
+      puts err_msg['error'].red
+      puts "You will only be able to change your own password.".red
+      exit 1
+    end
+    if secretinfo['success']
+      puts secretinfo['success'].green
+    end
+
     if options[:create_user]
       value=check_string_sanity(options[:create_user])
       username_sanity(value)
@@ -401,15 +373,18 @@ case options
         new_password=STDIN.getpass('Password: ')
         print "\t"
         confirm=STDIN.getpass('Confirm: ')
-        password_sanity(new_password)
         if new_password == confirm
-          if add_user(value,new_password,options[:role])
+          password_sanity(new_password)
+          if add_user(value,confirm,options[:role])
             puts "User #{value} added successfully".green
             exit 0
           else
             puts "Failed to add User #{value}".red
             exit 1
-          end  
+          end
+        else
+          puts "Passwords won't match, aborting. #{new_password} != #{confirm}".red
+          exit 1
         end
       end
     end
@@ -451,7 +426,7 @@ case options
     if options[:user]
       what='user'
       value=options[:user]
-      secretinfo = api_caller({"action" => "check-secret"},true)
+      secretinfo = api_caller({"action" => "check-secret", "value" => $config['DEFAULT_SECRET']},true)
       if secretinfo['error']
         err_msg = JSON.parse(secretinfo)
         puts err_msg['error'].red
@@ -493,7 +468,7 @@ case options
         puts "Current user is #{auth_user}".green
       end
 
-      secretinfo = api_caller({"action" => "check-secret"},true)
+      secretinfo = api_caller({"action" => "check-secret", "value" => $config['DEFAULT_SECRET']},true)
       if secretinfo['error']
         err_msg = JSON.parse(secretinfo)
         puts err_msg['error'].red

data/lib/phoseum/phoseum-cli-lib.rb

@@ -370,4 +370,4 @@ def local_version
   return
 end
 
-VERSION_SIGN="0.0.21"
+VERSION_SIGN="0.0.22"

data/lib/phoseum/phoseum-common-lib.rb

@@ -21,7 +21,6 @@ class String
     capital= false
     regular= false
     all_valid= true
-    puts "Testing #{self}"
     n=self.split("")
     self.slice!(0..self.size)
     n.each { |b|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phoseum-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.22
 platform: ruby
 authors:
 - Julio C Hegedus