phoseum-cli 0.0.21 → 0.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e2bd25792289a6beebdf3d17cb4b4365086d407348c4ca7e17862b65522f57d
-  data.tar.gz: f4fbfa8dc826cfb429b15b3ccbc79446af45d6a44dbd99e01ce96ee77dfa15b6
+  metadata.gz: 518b20606af6427165c3a508202ebc7a3f3197414d0fed8e561c04073ca73a57
+  data.tar.gz: 87f76b684309ac2562bf0701697eb8dd69102402bbfbaad47dd767abde726379
 SHA512:
-  metadata.gz: f25658cea0878061423c1761a5017fcbc4e78535bbce0175266539732f7eb862db30342d7a7276e182a71461548f021112c460c8d253dabc5624d17bc2597285
-  data.tar.gz: 7cd9478c899d770e8cb15e1d83f1e0a030783ac3f5f10bdf99d2e8c046588001c77818b9d6abeb900fa2b979fa9bd47f87427f2305db0074d4cd501b4daabb77
+  metadata.gz: c7e46c70b62722c149beee38cc23c7fc3427b5fdf555e59ceca41097c58e767d9d7eb24eefb453b74efb3bd988d0580b485268146d111328d0556cfb5f55288e
+  data.tar.gz: 799ead2525025953ebd93c7c07c4c6444bcaca50b1b2d4ace245af45333b41b4e5d4e18dae92ef0d73f79784c29f77a459dda0c31a305ca9cd0978dca1da956f

data/bin/phoseum-cli

@@ -25,6 +25,7 @@ client_checks
 
 def upload(album,syn_name='',description='')
   headers = {}
+
   if !validate_token($config['TOKEN'])
     if token = user_login()
       headers = { "bearer" => token }
@@ -204,14 +205,13 @@ def health(what='',name='')
 
   if list['success']
     data=list['success']
-
     if data['Albums']
       puts "  >> Albums Available at this level (#{data['Albums'].count})".green if !$QUIET
       data['Albums'].each do |album|
         if $DEBUG
           puts JSON.pretty_generate(album)
         else
-          created = DateTime.strptime(album['created'],'%s')
+          created = DateTime.strptime(album['created'].to_s,'%s')
           puts "Name: #{album['name']} | Web Path: #{album['web_path']} | description: #{album['description']} | created: #{created} "
         end
       end
@@ -223,8 +223,9 @@ def health(what='',name='')
         if $DEBUG
           puts JSON.pretty_generate(photo)
         else
-          added = DateTime.strptime(photo['added'],'%s')
-          puts "Name: #{photo['name']} | Filename: #{photo['image']} | Format: #{photo['full_info']['format']} | Dim.(WxH): #{photo['full_info']['geometry']['width']} x #{photo['full_info']['geometry']['height']} | Size: #{photo['size']} | Included: #{added}"
+          added = DateTime.strptime(photo['added'].to_s,'%s')
+          photo['exif']=JSON.parse(photo['exif'])
+          puts "Name: #{photo['name']} | Filename: #{photo['image']} | Format: #{photo['exif']['format']} | Dim.(WxH): #{photo['exif']['geometry']['width']} x #{photo['exif']['geometry']['height']} | Size: #{photo['size']} | Included: #{added}"
         end
       end
     end
@@ -237,45 +238,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 +350,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 +374,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 +427,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 +469,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.26"

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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phoseum-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.26
 platform: ruby
 authors:
 - Julio C Hegedus
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-24 00:00:00.000000000 Z
+date: 2020-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yaml