phoseum-cli 0.0.20 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfc9c3e5f01d6ea982796a580be0195b76156127ab1b39c3c1bfdb0d1ada4f21
-  data.tar.gz: eb9e11b414ee5be39678593668f2fa8f02477e61b1cdbd85a0d69fbdf8728d6f
+  metadata.gz: 2661bcdb53adfc4d38701aca4eaa8cccc3738fd119f3a1da971d157bcf91f932
+  data.tar.gz: f1dd196b277efee399ae1af804a12350e23b8c1c06f023eb322306b9af11016a
 SHA512:
-  metadata.gz: c433b128e7140e01364e04309bec935cf66efcfebe785ffbe7f4cefbf0dcdf007cb2f8f7f6398eb7fcae87c751fb7f4213110422b03d621120c991369277d8a6
-  data.tar.gz: 1435d44fa6d8599e5ba9492fbce3bb5e30dba57e24c225f7ed6cbfd87ae56f7f3cca5820e9c94a7d259ca652e8875ec5ea503ebb1839969561cf99c5c5f28b7c
+  metadata.gz: 1d8ef28e22c329a13b78f2d5d9a4f476cd5d805828bb82e6681f4d41c17b720f26ea3c8bb3e05564084875b8db7b71b1e9af3ac26a756ded4f16841cf24503d2
+  data.tar.gz: 860e9fc1f0624c96f8c24b21429349d977dc27404e941f1f1e95a7b00537ed6c9a2b130c6d03c92dfdbaff30738ca2bb5c59f8aad05f7aadcdf7282a8919432a

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,13 +350,24 @@ case options
     end
     health(what,value)
   when -> (cre) { cre[:create_user] }
-    puts "Creating User".green if !$QUIET
+    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)
+      puts "Creating User #{value}".green if !$QUIET
       what='add_user'
-      if !options[:role]
-        puts "You need to select one of the valid Roles".red
+      if !options[:role] || options[:role] != "Super" && options[:role] != "User"
+        puts "You need to select one of the valid Roles (Super or User)".red
         exit 1
       else
         print "Please type the password twice for user #{value}.\n\t"
@@ -403,7 +376,16 @@ case options
         confirm=STDIN.getpass('Confirm: ')
         if new_password == confirm
           password_sanity(new_password)
-          user_mgmt(what,value,new_password,options[:role])
+          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
+        else
+          puts "Passwords won't match, aborting. #{new_password} != #{confirm}".red
+          exit 1
         end
       end
     end
@@ -445,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
@@ -487,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
@@ -534,7 +516,6 @@ case options
         if opt_action == "P"
           print "Please type new password for user #{user_work} .\n\t"
           new_password=STDIN.getpass('Password: ')
-          puts "testing #{new_password}"
           print "\t"
           check_password=STDIN.getpass('Confirm: ')
           if new_password != check_password

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

@@ -312,6 +312,17 @@ def change_username(user,new_user)
   end
 end
 
+def add_user(user,password,role)
+  result = api_caller({"action" => "create-user", "user" => user, "password" => password, "role" => role},true)
+  if result['error']
+    return false
+  end
+  if result['success']
+    return true
+  end
+end
+
+
 def change_role(user,new_role)
   result = api_caller({"action" => "change-role", "username" => user, "new-role" => new_role},true)
   if result['error']
@@ -334,7 +345,7 @@ def password_sanity(password)
 end
 
 def username_sanity(username)
-  if new_user.length < MIN_USER
+  if username.length < MIN_USER
     puts "New Username is shorter than #{MIN_USER} chars, please use a bigger username.".red
     exit 1
   end
@@ -359,4 +370,4 @@ def local_version
   return
 end
 
-VERSION_SIGN="0.0.20"
+VERSION_SIGN="0.0.25"

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.20
+  version: 0.0.25
 platform: ruby
 authors:
 - Julio C Hegedus
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-22 00:00:00.000000000 Z
+date: 2020-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yaml