phoseum-cli 0.0.9 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7282f4986b7a9f813c002c354d5fae25c6b0e29fd6274c4cd8ee5fa2a75cc89b
-  data.tar.gz: 3e22b900db8134c6a90b9cd54c55d672ddef8af86195c0148f7458fe924d47c0
+  metadata.gz: 102e4fe0316e79e37507ece6aa7119cdf23f8f2029d27e97d7211dae8aedcc08
+  data.tar.gz: bfe78eca818f6e7d9ef1b015c76aecd03d52db5521424cc3d835739322232b4b
 SHA512:
-  metadata.gz: 6f23596ae34b88ba0bbb537672304490c2e065e448dfbb9b434052f73dc73080c0dbe89cbbf9b2b149c844b8a5695be19472f669e91fbeaf90e6a89cbe5d773c
-  data.tar.gz: c044c7b0922aacc1f0830e0592f6b7357266664f9c4ecbc5418a69ad2e86cb0f20cec3067708aa0e3321e76c2b8f5d0c096bdf494717813866e55007eda83ce0
+  metadata.gz: 6f3bbe28c768e6924090fa64cd3ff35d9125fe10a4fed80f495bb52d5d8576176d6cb9fc48cd577ac3f2a17a9f698b1eecd0e14e3f2070300e8da11815f7c0ed
+  data.tar.gz: 7710d08185a06695a4f461aca529a68219710051c48fcc43b356ab155970a7618fa72320a6f519393caf46cf2c0adb04aabb9a2561f9cf580876ab8df03fc4e6

data/bin/phoseum-cli

@@ -23,17 +23,17 @@ $MULTI = options[:multiple] ? true : false
 
 client_checks
 
-def upload(album)
-
-  if $config['TOKEN']
-    headers={ "bearer" => "#{$config['TOKEN']}" }
-  else
+def upload(album,syn_name='',description='')
+  headers = {}
+  if !validate_token($config['TOKEN'])
     if token = user_login()
       headers = { "bearer" => token }
     else
       puts "Login Failed".red
       exit 1
     end
+  else
+    headers={ "bearer" => "#{$config['TOKEN']}" }
   end
 
   list=Dir.entries("./")
@@ -65,7 +65,8 @@ def upload(album)
       # last resort solution for accents and unrecognizable characters
       # but then will need to remove extension, pass the filter, then add extension again.
       # human_name = check_string_sanity(filename)
-      human_name = filename
+      human_name = filename.dup
+      human_name = human_name.gsub!(/(.*)\.JPG|JPEG|PNG|GIF$/i,'\1')
 
       somefound = search_image(image.signature)
       if somefound
@@ -84,6 +85,12 @@ def upload(album)
       post_body << "\r\n--#{BOUNDARY}--\r\n"
       http = Net::HTTP.new(uri.host, uri.port)
       headers = headers.merge({ "filename" => "#{image.signature}.#{image.type}", "album" => "#{album}", "name" => human_name })
+      if ! syn_name.nil?
+        headers = headers.merge({ "album_name" => syn_name })
+      end
+      if ! description.nil?
+        headers = headers.merge({ "description" => description })
+      end
       request = Net::HTTP::Post.new(uri, headers)
       request.body = post_body.join
       request["Content-Type"] = "multipart/form-data, boundary=#{BOUNDARY}"
@@ -154,15 +161,16 @@ end
 
 def health(what='',name='')
   headers = {}
-  if $config['TOKEN']
-    headers={ "bearer" => "#{$config['TOKEN']}" }
-  else
+
+  if !validate_token($config['TOKEN']) || !$config['TOKEN']
     if token = user_login()
       headers = { "bearer" => token }
     else
       puts "Login Failed".red
       exit 1
     end
+  else
+    headers={ "bearer" => "#{$config['TOKEN']}" }
   end
   some_uri=''
   if what == "album"
@@ -233,6 +241,10 @@ 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
@@ -264,29 +276,28 @@ def user_mgmt(action,user,pass='',role='')
   exit 0
 end
 
-def user_login()
+def user_login(puser='',ppass='')
   post_body={}
-  user=''
-  pass=''
+  user= !puser ? '' : puser
+  pass= !ppass ? '' : ppass
   if $config['USER']
     user=$config['USER']
   else
     print "Username: "
-    user=STDIN.noecho(&:gets).chomp
+    user=STDIN.gets.chomp
   end
   if $config['PASS']
     pass=$config['PASS']
-    puts "Keeping your password on the configuration file is UNSAFE".red
+    puts "\nKeeping your password on the configuration file is UNSAFE".red
   else
-    print "\nPassword: "
-    pass=STDIN.noecho(&:gets).chomp
+    pass=STDIN.getpass('Password: ')
   end
   post_body=JSON.generate({"action" => "user-login", "user" => "#{user}", "password" => "#{pass}"})
   base = URI.parse("#{$config['SERVERURL']}")
   puts "\nLogging to: #{$config['SERVERURL']}".yellow if !$QUIET
   request = Net::HTTP::Post.new(base)
   request.body = post_body
-  request.basic_auth("auth", $config['DEFAULT_SECRET'])
+  request.basic_auth("cli", "loginNOauth")
   response = Net::HTTP.start(base.hostname, $config['PORT'],
                              :timeout => $config['CALL_TIMEOUT'],
                              :use_ssl => base.scheme == "https",
@@ -323,50 +334,40 @@ end
 
 
 def delete(what='',path='')
-  puts "You must write 'YES' to confirm, otherwise NO is assumed".yellow
-  print "Are you sure you want to delete the #{what} #{path} :[YES/NO]: "
-  confirm=STDIN.gets.chomp
-
-  if confirm == "YES"
-    headers={}
-    if $config['TOKEN']
-      headers={ "bearer" => "#{$config['TOKEN']}" }
+  if !validate_token($config['TOKEN'])
+    if token = user_login()
+      headers = { "bearer" => token }
     else
-      if token = user_login()
-        headers = { "bearer" => token }
-      else
-        puts "Login Failed".red
-        exit 1
-      end
-    end
-
-    base = URI.parse("#{$config['SERVERURL']}/#{path}")
-    puts "Connecting to: #{$config['SERVERURL']}".yellow if !$QUIET
-    request = Net::HTTP::Delete.new(base,headers)
-    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
-      else
-        puts list['success'].green
-        exit 0
-      end
-    rescue
-      puts "\nThe server sent out an Error:".red
-      puts clean_html(response.body)
+      puts "Login Failed".red
       exit 1
     end
   else
-    puts "Deleting cancelled.".green
+    headers={ "bearer" => "#{$config['TOKEN']}" }
+  end
+  base = URI.parse("#{$config['SERVERURL']}/#{path}")
+  puts "Connecting to: #{$config['SERVERURL']}".yellow if !$QUIET
+  request = Net::HTTP::Delete.new(base,headers)
+  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
+    else
+      puts list['success'].green
+      exit 0
+    end
+  rescue
+    puts "\nThe server sent out an Error:".red
+    puts clean_html(response.body)
+    exit 1
   end
 end
 
@@ -387,10 +388,10 @@ case options
         puts "You need to select one of the valid Roles".red
         exit 1
       else
-        print "Please type the password twice for user #{value}.\n\tPassword: "
-        new_password=STDIN.noecho(&:gets).chomp
-        print "\n\tConfirm: "
-        confirm=STDIN.noecho(&:gets).chomp
+        print "Please type the password twice for user #{value}.\n\t"
+        new_password=STDIN.getpass('Password: ')
+        print "\t"
+        confirm=STDIN.getpass('Confirm: ')
         if new_password == confirm
           user_mgmt(what,value,new_password,options[:role])
         end
@@ -405,19 +406,66 @@ case options
         puts "It is Not possible to delete base album".red
         exit 1
       end
+      if !confirm_action("Are you sure you want to delete the #{what} #{value}")
+        puts "Deleting #{what} cancelled.".green
+      end
     end
     if options[:image]
       if _found = check_image_exists(options[:image])
-        img_data = JSON.parse(_found)
-        value="#{img_data['web_path']}/#{img_data['image']}"
+        if _found =~ /^Signature Found at \[\"(.*)\"\]/
+          capt = _found.match(/^Signature Found at \[\"(.*)\"\]/).captures
+          capt_part = capt[0].match(/.*(Albums.*)$/).captures
+          value = capt_part[0]
+        else
+          img_data = JSON.parse(_found)
+          value="#{img_data['web_path']}/#{img_data['image']}"
+        end
         what='image'
       else
         puts "Image not found on server".red
         exit 1
       end
+      if confirm_action("Are you sure you want to delete the #{what} #{value}")
+        puts "Deleting #{what} #{value}".green if !$QUIET
+        delete(what,value)
+      else
+        puts "Deleting #{what} cancelled.".green
+      end
+    end
+    if options[:user]
+      what='user'
+      value=options[:user]
+      if confirm_action("Are you sure you want to delete the #{what} #{value}")
+        puts "Deleting #{what} #{value}".green if !$QUIET
+        if delete_user(value)
+          puts "#{value} successfully deleted.".green
+        else
+          puts "#{value} failed to be deleted.".red
+        end
+      else
+        puts "Deleting #{what} cancelled.".green
+      end
+    end
+    if !what
+      puts "Got no object to delete. Exiting.".red
+      exit 1
+    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
+        exit 1
+      end
+    else
+    # if !what
+      puts "Got no user to work with. Exiting.".red
+      exit 1
     end
-    puts "Deleting #{what} #{value}".green if !$QUIET
-    delete(what,value)
   when -> (u) { u[:upload] }
     puts "Preparing to upload images to API server".green if !$QUIET
     if !options.key?(:album)
@@ -427,8 +475,27 @@ case options
       exit 1
     else
       album_clean=check_string_sanity(options[:album])
-      puts "Using Album destination: #{album_clean}".light_blue if !$QUIET
-      upload(album_clean)
+      usable_name= options[:name] ? options[:name].dup : ''
+      usable_desc= options[:description] ? options[:description].dup : ''
+      if usable_name.length > 255 || usable_desc.length > 255
+        if usable_name.length > 255
+          puts "Synthetic name has #{usable_name.length} characters!!".red
+        end
+        if usable_desc.length > 255
+          puts "SHORT Description has #{usable_desc.length} characters!!".red
+        end
+        puts "This is a huge-ass string mate, what are you doing?".red
+        puts "We should limit this to 255 chars. Keep it short. Aborting.".red
+        exit 1
+      end
+      if options[:name]
+        usable_name = clean_name(options[:name])
+        usable_desc = clean_name(options[:description])
+        puts "Using Album destination: #{album_clean} --> Named as '#{usable_name}'".light_blue if !$QUIET
+      else
+        puts "Using Album destination: #{album_clean}".light_blue if !$QUIET
+      end
+      upload(album_clean,usable_name,usable_desc)
     end
   when -> (l) { l[:login] }
     puts "Start login process".green if !$QUIET

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

@@ -20,6 +20,10 @@ def option_parser(opts)
       options[:delete] = d
     end
 
+    opts.on("-D", "--description 'SHORTDESC'", "Add album description (up to 255 chars). Use with: [album-path]") do |ds|
+      options[:description] = ds
+    end
+
     opts.on("-f", "--file-cfg FILENAME", "Use alternative configuration file") do |f|
       options[:filecfg] = f
     end
@@ -36,6 +40,10 @@ def option_parser(opts)
       options[:multiple] = m
     end
 
+    opts.on("-N", "--name 'REALNAME'", "Set Album's synthetic name. Use with: [album-path]") do |n|
+      options[:name] = n
+    end
+
     opts.on("-v", "--verbose", "Run verbosely (DEBUG mode)") do |v|
       options[:verbose] = v
     end
@@ -44,6 +52,10 @@ def option_parser(opts)
       options[:role] = r
     end
 
+    opts.on("-o", "--options", "Update options from object. Use with: [user]") do |o|
+      options[:options] = o
+    end
+
     opts.on("-q", "--quiet", "Avoid regular info, useful for JSON output") do |q|
       options[:quiet] = q
     end
@@ -56,6 +68,10 @@ def option_parser(opts)
       options[:upload] = u
     end
 
+    opts.on("-U", "--User USERNAME", "Username for delete or change password / role. Use with: [delete, options]") do |usr|
+      options[:user] = usr
+    end
+
     opts.on("-h", "-h", "That is this...") do |h|
       options[:help] = h
     end
@@ -64,6 +80,17 @@ def option_parser(opts)
   return options
 end
 
+def confirm_action(msg)
+  puts "You must write 'YES' to confirm, otherwise NO is assumed".yellow
+  print "#{msg} :[YES/NO]: "
+  confirm=STDIN.gets.chomp
+  if confirm == "YES"
+    return true
+  else
+    return false
+  end
+end
+
 class String
   # colorization
   def colorize(color_code)
@@ -130,6 +157,17 @@ def clean_html(msg)
   return msg
 end
 
+def clean_name(nameval)
+  name_words = nameval.split(' ')
+  name = ''
+  name_words.each do |word|
+    cword = check_string_sanity(word)
+    name = name.nil? ? cword : [name,cword].join(' ')
+  end
+  name.gsub!(/^\ /,'')
+  return name
+end
+
 def check_image_exists(fpath)
   flocal = fpath.split('/')
   filename = flocal.last
@@ -145,16 +183,15 @@ def check_image_exists(fpath)
 end
 
 def search_image(sign,album='')
-  headers = {}
-  if $config['TOKEN']
-    headers={ "bearer" => "#{$config['TOKEN']}" }
-  else
+  if !validate_token($config['TOKEN'])
     if token = user_login()
       headers = { "bearer" => token }
     else
       puts "Login Failed".red
       exit 1
     end
+  else
+    headers={ "bearer" => "#{$config['TOKEN']}" }
   end
   some_uri= album == '' ? "?signature=#{sign}" : "?signature=#{sign}&inside_album=#{album}"
   base = URI.parse("#{$config['SERVERURL']}#{some_uri}")
@@ -182,3 +219,69 @@ def search_image(sign,album='')
     exit 1
   end
 end
+
+def validate_token(token)
+  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({"action" => "check-token" })
+  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']
+      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']
+    headers={ "bearer" => "#{$config['TOKEN']}" }
+  else
+    return false
+  end
+  base = URI.parse("#{$config['SERVERURL']}")
+  request = Net::HTTP::Post.new(base,headers)
+  request.body = JSON.generate({"action" => "delete-user", "username" => username })
+  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']
+      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

metadata

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