phoseum-cli 0.0.14 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 102e4fe0316e79e37507ece6aa7119cdf23f8f2029d27e97d7211dae8aedcc08
-  data.tar.gz: bfe78eca818f6e7d9ef1b015c76aecd03d52db5521424cc3d835739322232b4b
+  metadata.gz: '092592a7b73a29fb773b199b9e29f7054da0da5701583c1162c2500a1860635f'
+  data.tar.gz: fc71817a9eb49a14d2567694efaa91ee076e991a1780b8abdbf20b3a2c2032db
 SHA512:
-  metadata.gz: 6f3bbe28c768e6924090fa64cd3ff35d9125fe10a4fed80f495bb52d5d8576176d6cb9fc48cd577ac3f2a17a9f698b1eecd0e14e3f2070300e8da11815f7c0ed
-  data.tar.gz: 7710d08185a06695a4f461aca529a68219710051c48fcc43b356ab155970a7618fa72320a6f519393caf46cf2c0adb04aabb9a2561f9cf580876ab8df03fc4e6
+  metadata.gz: 78a80cda0d947299a0b95b86f2ccebcf1df4d263bdad641ff0d0aec8d3e2445a28d2062ba52f49d520bf334051448adcf02674069992f7b55d22e1eb60e9f288
+  data.tar.gz: 2b296a8c6ab2f30de4e7c85dd0b9acf55a3c5b8130ed9887c359220da14879d2b73895894b29f450c4b4a390f04edae6473fe317874183284d336066ddaac3cb

data/bin/phoseum-cli

@@ -277,6 +277,15 @@ def user_mgmt(action,user,pass='',role='')
 end
 
 def user_login(puser='',ppass='')
+
+  server_value = cross_versions()
+  if server_value['version'] != VERSION_SIGN
+    puts "Server and Client version won't match, please make them match to continue.".red
+    puts "Remote version: #{server_value['version']}"
+    puts "Local version: #{VERSION_SIGN}"
+    exit 1
+  end
+
   post_body={}
   user= !puser ? '' : puser
   pass= !ppass ? '' : ppass
@@ -332,7 +341,6 @@ def user_login(puser='',ppass='')
   return false
 end
 
-
 def delete(what='',path='')
   if !validate_token($config['TOKEN'])
     if token = user_login()
@@ -452,15 +460,23 @@ case options
     end
   when -> (o) { o[:options] }
     if options[:user]
-      print "Please confirm #{options[:user]} password.\n\t"
-      current_password=STDIN.getpass('Password: ')
-      if token = user_login(options[:user],current_password)
-        print "\n Change [P]assword, [U]sername, [R]ole :[P/U/R]: "
-        confirm=STDIN.gets.chomp
-      else
-        puts "User Check Failed".red
+      tokeninfo = api_caller({"action" => "token-payload", "token" => "#{$config['TOKEN']}"})
+      if tokeninfo['error']
+        puts "Your token seems invalid, please login again".red
         exit 1
       end
+      if tokeninfo['success']
+        puts tokeninfo.payload
+      end
+      # print "Please confirm #{options[:user]} password.\n\t"
+      # current_password=STDIN.getpass('Password: ')
+      # if token = user_login(options[:user],current_password)
+      #   print "\n Change [P]assword, [U]sername, [R]ole :[P/U/R]: "
+      #   confirm=STDIN.gets.chomp
+      # else
+      #   puts "User Check Failed".red
+      #   exit 1
+      # end
     else
     # if !what
       puts "Got no user to work with. Exiting.".red
@@ -504,6 +520,14 @@ case options
     else
       puts "Login failed".red
     end
+  when -> (vs) { vs[:version] }
+    local_version
+    exit 0
+  when -> (x) { x[:crossv] }
+    server_value = cross_versions()
+    puts "Remote version: #{server_value['version']}"
+    puts "Local version: #{VERSION_SIGN}"
+    exit 0
   when -> (t) { t[:test] }
     puts "Making local analysis of files on directory".green if !$QUIET
     test

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

@@ -48,6 +48,14 @@ def option_parser(opts)
       options[:verbose] = v
     end
 
+    opts.on("-V", "--version", "What version we are") do |vs|
+      options[:version] = vs
+    end
+
+    opts.on("-x", "--cross-versions", "Check version match between Client and API") do |x|
+      options[:crossv] = x
+    end
+
     opts.on("-r", "--role ROLE", "Role for user: [User, Super]. Use with 'create-user'") do |r|
       options[:role] = r
     end
@@ -253,6 +261,65 @@ def validate_token(token)
   end
 end
 
+def api_caller(json_body)
+  headers = {}
+  if $config['TOKEN']
+    headers={ "bearer" => "#{$config['TOKEN']}" }
+  else
+    return false
+  end
+  base = URI.parse("#{$config['SERVERURL']}")
+  request = Net::HTTP::Post.new(base,headers)
+  request.body = JSON.generate(json_body)
+  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)
+    return list
+  rescue
+    puts "\nThe server sent out an Error:".red
+    puts clean_html(response.body)
+    exit 1
+  end
+end
+
+
+def cross_versions
+  headers = {}
+  base = URI.parse("#{$config['SERVERURL']}")
+  request = Net::HTTP::Post.new(base,headers)
+  request.basic_auth("cli", "loginNOauth")
+  request.body = JSON.generate({"action" => "version-check" })
+  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)
+    return list
+    # if list['error']
+    #   return false
+    # end
+    # if list['success']
+    #   return true
+    # end
+  rescue
+    puts "\nThe server sent out an Error:".red
+    puts clean_html(response.body)
+    exit 1
+  end
+end
+
 def delete_user(username)
   headers = {}
   if $config['TOKEN']
@@ -285,3 +352,10 @@ def delete_user(username)
     exit 1
   end
 end
+
+def local_version
+  puts "This CLI library is running version: #{VERSION_SIGN}"
+  return
+end
+
+VERSION_SIGN="0.0.19"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phoseum-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.19
 platform: ruby
 authors:
 - Julio C Hegedus
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-11 00:00:00.000000000 Z
+date: 2020-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yaml