phoseum-cli 0.0.8 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64322b7d05911b8e332b53a9c71e802ba0328a3f566f510a4c987eaab30447ad
-  data.tar.gz: 7f44480404aa5d42533deef77414997b9cf459d215726ce4723aeb37055ed9b9
+  metadata.gz: 052beefab210d213c09986b11dfe93e499d328f6523f7f3cba71ecb2502ead53
+  data.tar.gz: 75fd5b65b74758d1517c61e65f69295ca445e70ba37e32ae57863da0ddb825d9
 SHA512:
-  metadata.gz: eb7348f7bbac6a5f225be5e19a633fb46a57eb33122392dcbff9735eeca51c154acb4a2a7a269642c4145e8c26843620c6f9e3a7483db15fa3dc68ad650cd0fb
-  data.tar.gz: 27739486308f80512d929123d46a46b809e1ec930c5b63ff1f227654e9bf42aba183b823646b8a71eddc7f392b8b231e9a84a39b7b66f46ccf773b9529054d3e
+  metadata.gz: 44173a8f4ed5893c0fdd6b5a9ef2b4ab463b091ed4c35f237be7f3ad369044a281d9067edbf7bd9d72670c45973827d9428fc015a6071f4eff5e1ff1ffd55c5f
+  data.tar.gz: 68c50ae1d3cc2c35e4d369bc02bbba99236a07a1a3f3e314f73ff411bab7e3ee27965507afbb22b44220df36a411ee10a84586ad5109be62e4e2bf974cba7f95

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}"
@@ -108,6 +115,7 @@ def upload(album)
         else
           puts "\n#{msg_resp['error']}".red
           error += 1
+          break
         end
       rescue
         puts "\nThe server sent out an Error:".red
@@ -153,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"
@@ -232,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
@@ -263,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",
@@ -322,38 +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 Album #{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)
+      puts "Login Failed".red
+      exit 1
     end
-    list = JSON.parse(response.body)
-    # missing begin test result
-    puts list
   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
 
@@ -374,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
@@ -388,13 +402,70 @@ case options
     if options[:album]
       value=check_string_sanity(options[:album])
       what='album'
+      if value == "/" or value == '' or value.nil?
+        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])
+        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 value == "/" or value == '' or value.nil?
-      puts "It is Not possible to delete base album".red
+    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 Album #{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)
@@ -404,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)
@@ -96,15 +123,13 @@ class String
 end
 
 def client_checks
-
   if $config['SERVERURL'] == ''
-     puts "I could not find a valid SERVERURL configuration. CFG is empty.".red
-     exit 1
+    puts "I could not find a valid SERVERURL configuration. CFG is empty.".red
+    exit 1
   elsif $config['SERVERURL'] !~ /\A#{URI::regexp(['https', 'http'])}\z/
     puts "I could not find a valid SERVERURL configuration. Contains: #{$config['SERVERURL']}".red
     exit 1
   end
-
   if !$config['DEFAULT_SECRET']
     puts "I could not find the DEFAULT_SECRET from Phoseum config, this will limit our actions.".red
     exit 1
@@ -132,19 +157,43 @@ def clean_html(msg)
   return msg
 end
 
-def search_image(sign)
-  headers = {}
-  if $config['TOKEN']
-    headers={ "bearer" => "#{$config['TOKEN']}" }
+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
+  album = fpath.clone
+  album.gsub!(/#{filename}/,'')
+
+  if ffile = search_image(filename,album)
+    return ffile
   else
+    return false
+  end
+  exit 0
+end
+
+def search_image(sign,album='')
+  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="?signature=#{sign}"
+  some_uri= album == '' ? "?signature=#{sign}" : "?signature=#{sign}&inside_album=#{album}"
   base = URI.parse("#{$config['SERVERURL']}#{some_uri}")
   request = Net::HTTP::Get.new(base,headers)
   response = Net::HTTP.start(base.hostname, $config['PORT'],
@@ -158,6 +207,7 @@ def search_image(sign)
   begin
     list = JSON.parse(response.body)
     if list['warning']
+      # puts list['warning']
       return list['warning']
     end
     if list['success']
@@ -169,3 +219,69 @@ def search_image(sign)
     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.8
+  version: 0.0.13
 platform: ruby
 authors:
 - Julio C Hegedus
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-07 00:00:00.000000000 Z
+date: 2020-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yaml