aspera-cli 4.1.0 → 4.2.0

data/lib/aspera/cli/main.rb

@@ -10,6 +10,7 @@ require 'aspera/persistency_folder'
 require 'aspera/log'
 require 'aspera/rest'
 require 'aspera/nagios'
+require 'aspera/secrets'
 
 module Aspera
   module Cli
@@ -65,6 +66,8 @@ module Aspera
         Rest.user_agent=PROGRAM_NAME
         # must override help methods before parser called (in other constructors)
         init_global_options()
+        # secret manager
+        @plugin_env[:secret]=Aspera::Secrets.new
         # the Config plugin adds the @preset parser
         @plugin_env[:config]=Plugins::Config.new(@plugin_env,PROGRAM_NAME,@help_url,Aspera::Cli::VERSION,app_main_folder)
         # the TransferAgent plugin may use the @preset parser
@@ -229,16 +232,6 @@ module Aspera
           # load global default options and process
           @plugin_env[:config].add_plugin_default_preset(Plugins::Config::CONF_GLOBAL_SYM)
           @opt_mgr.parse_options!
-          # dual execution locking
-          lock_port=@opt_mgr.get_option(:lock_port,:optional)
-          if !lock_port.nil?
-            begin
-              # no need to close later, will be freed on process exit. must save in member else it is garbage collected
-              @tcp_server=TCPServer.new('127.0.0.1',lock_port.to_i)
-            rescue => e
-              raise CliError,"Another instance is already running (lock port=#{lock_port})."
-            end
-          end
           @plugin_env[:config].periodic_check_newer_gem_version
           if @option_show_config and @opt_mgr.command_or_arg_empty?
             command_sym=Plugins::Config::CONF_PLUGIN_SYM
@@ -263,6 +256,17 @@ module Aspera
             @plugin_env[:formater].display_results({:type=>:single_object,:data=>@opt_mgr.declared_options(false)})
             Process.exit(0)
           end
+          # locking for singkle execution (only after "per plugin" option, in case lock port is there)
+          lock_port=@opt_mgr.get_option(:lock_port,:optional)
+          if !lock_port.nil?
+            begin
+              # no need to close later, will be freed on process exit. must save in member else it is garbage collected
+              Log.log.debug("Opening lock port #{lock_port.to_i}")
+              @tcp_server=TCPServer.new('127.0.0.1',lock_port.to_i)
+            rescue => e
+              raise CliError,"Another instance is already running (#{e.message})."
+            end
+          end
           # execute and display
           @plugin_env[:formater].display_results(command_plugin.execute_action)
           # finish
@@ -270,11 +274,11 @@ module Aspera
         rescue CliBadArgument => e;          exception_info=[e,'Argument',:usage]
         rescue CliNoSuchId => e;             exception_info=[e,'Identifier']
         rescue CliError => e;                exception_info=[e,'Tool',:usage]
-        rescue Fasp::Error => e;             exception_info=[e,"FASP(ascp]"]
-        rescue Aspera::RestCallError => e; exception_info=[e,"Rest"]
-        rescue SocketError => e;             exception_info=[e,"Network"]
-        rescue StandardError => e;           exception_info=[e,"Other",:debug]
-        rescue Interrupt => e;               exception_info=[e,"Interruption",:debug]
+        rescue Fasp::Error => e;             exception_info=[e,'FASP(ascp)']
+        rescue Aspera::RestCallError => e;   exception_info=[e,'Rest']
+        rescue SocketError => e;             exception_info=[e,'Network']
+        rescue StandardError => e;           exception_info=[e,'Other',:debug]
+        rescue Interrupt => e;               exception_info=[e,'Interruption',:debug]
         end
         # cleanup file list files
         TempFileManager.instance.cleanup

data/lib/aspera/cli/plugins/aoc.rb

@@ -15,7 +15,6 @@ module Aspera
       class Aoc < BasicAuthPlugin
         # special value for package id
         VAL_ALL='ALL'
-        attr_reader :api_aoc
         def initialize(env)
           super(env)
           @default_workspace_id=nil
@@ -26,19 +25,20 @@ module Aspera
           @api_aoc=nil
           @url_token_data=nil
           @user_info=nil
-          self.options.add_opt_list(:auth,Oauth.auth_types,'type of Oauth authentication')
+          @api_aoc=nil
+          self.options.add_opt_list(:auth,Oauth.auth_types,'OAuth type of authentication')
           self.options.add_opt_list(:operation,[:push,:pull],'client operation for transfers')
-          self.options.add_opt_simple(:client_id,'API client identifier in application')
-          self.options.add_opt_simple(:client_secret,'API client passcode')
-          self.options.add_opt_simple(:redirect_uri,'API client redirect URI')
-          self.options.add_opt_simple(:private_key,'RSA private key PEM value for JWT (prefix file path with @val:@file:)')
+          self.options.add_opt_simple(:client_id,'OAuth API client identifier in application')
+          self.options.add_opt_simple(:client_secret,'OAuth API client passcode')
+          self.options.add_opt_simple(:redirect_uri,'OAuth API client redirect URI')
+          self.options.add_opt_simple(:private_key,'OAuth JWT RSA private key PEM value (prefix file path with @val:@file:)')
           self.options.add_opt_simple(:workspace,'name of workspace')
           self.options.add_opt_simple(:name,'resource name')
           self.options.add_opt_simple(:path,'file or folder path')
           self.options.add_opt_simple(:link,'public link to shared resource')
           self.options.add_opt_simple(:new_user_option,'new user creation option')
           self.options.add_opt_simple(:from_folder,'share to share source folder')
-          self.options.add_opt_simple(:scope,'scope for AoC API calls')
+          self.options.add_opt_simple(:scope,'OAuth scope for AoC API calls')
           self.options.add_opt_simple(:notify,'notify users that file was received')
           self.options.add_opt_boolean(:bulk,'bulk operation')
           self.options.add_opt_boolean(:default_ports,'use standard FASP ports or get from node api')
@@ -52,19 +52,15 @@ module Aspera
           self.options.parse_options!
           AoC.set_use_default_ports(self.options.get_option(:default_ports))
           return if env[:man_only]
-          @api_aoc=AoC.new(aoc_params('api/v1'))
-          # add access key secrets
-          @api_aoc.add_secrets(self.config.get_secrets)
         end
 
-        # call this to populate single AK secret in AoC API object, from options
-        # make sure secret is available
-        def find_ak_secret(ak,mandatory=true)
-          # secret hash is already provisioned
-          # optionally override with specific secret
-          @api_aoc.add_secrets({ak=>self.config.get_secret(ak,mandatory)})
-          # check that secret was provided as single value or dictionary
-          raise CliBadArgument,"Please provide option secret or entry in option secrets for: #{ak}" unless @api_aoc.has_secret(ak) or !mandatory
+        def get_api
+          if @api_aoc.nil?
+            @api_aoc=AoC.new(aoc_params(AoC::API_V1))
+            # add keychain for access key secrets
+            @api_aoc.key_chain=@agents[:secret]
+          end
+          return @api_aoc
         end
 
         # cached user information
@@ -111,14 +107,8 @@ module Aspera
             return {:type=>:object_list,:data=>items,:fields=>['name','type','recursive_size','size','modified_time','access_level']}
           when :find
             thepath=self.options.get_next_argument('path')
-            exec_prefix='exec:'
-            expression=self.options.get_option(:value,:optional)||"#{exec_prefix}true"
             node_file=@api_aoc.resolve_node_file(top_node_file,thepath)
-            if expression.start_with?(exec_prefix)
-              test_block=eval "lambda{|f|#{expression[exec_prefix.length..-1]}}"
-            else
-              test_block=lambda{|f|f['name'].match(/#{expression}/)}
-            end
+            test_block=Aspera::Node.file_matcher(self.options.get_option(:value,:optional))
             return {:type=>:object_list,:data=>@api_aoc.find_files(node_file,test_block),:fields=>['path']}
           when :mkdir
             thepath=self.options.get_next_argument('path')
@@ -646,7 +636,6 @@ module Aspera
               return Main.result_success
             when :v3,:v4
               res_data=@api_aoc.read(resource_instance_path)[:data]
-              find_ak_secret(res_data['access_key'])
               api_node=@api_aoc.get_node_api(res_data)
               return Node.new(@agents.merge(skip_basic_auth_options: true, node_api: api_node)).execute_action if command.eql?(:v3)
               ak_data=api_node.call({:operation=>'GET',:subpath=>"access_keys/#{res_data['access_key']}",:headers=>{'Accept'=>'application/json'}})[:data]
@@ -704,16 +693,17 @@ module Aspera
         end
 
         # must be public
-        ACTIONS=[ :apiinfo, :bearer_token, :organization, :tier_restrictions, :user, :workspace, :packages, :files, :gateway, :admin, :automation, :servers]
+        ACTIONS=[ :reminder, :bearer_token, :organization, :tier_restrictions, :user, :workspace, :packages, :files, :gateway, :admin, :automation, :servers]
 
         def execute_action
           command=self.options.get_next_command(ACTIONS)
+          get_api unless [:reminder,:servers].include?(command)
           case command
-          when :apiinfo
-            api_info={}
-            num=1
-            Resolv::DNS.open{|dns|dns.each_address('api.ibmaspera.com'){|a| api_info["api.#{num}"]=a;num+=1}}
-            return {:type=>:single_object,:data=>api_info}
+          when :reminder
+            # send an email reminder with list of orgs
+            user_email=options.get_option(:username,:mandatory)
+            Rest.new(base_url: "#{AoC.api_base_url}/#{AoC::API_V1}").create('organization_reminders',{email: user_email})[:data]
+            return Main.result_status("List of organizations user is member of, has been sent by e-mail to #{user_email}")
           when :bearer_token
             return {:type=>:text,:data=>@api_aoc.oauth_token}
           when :organization
@@ -847,7 +837,6 @@ module Aspera
             # get workspace related information
             set_workspace_info
             set_home_node_file
-            find_ak_secret(@home_node_file[:node_info]['access_key'],false)
             command_repo=self.options.get_next_command(NODE4_COMMANDS.clone.concat([:short_link]))
             case command_repo
             when *NODE4_COMMANDS; return execute_node_gen4_command(command_repo,@home_node_file)
@@ -957,17 +946,14 @@ module Aspera
           when :admin
             return execute_admin_action
           when :servers
-            self.format.display_status("Beta feature: #{@api_aoc.params[:base_url]}")
-            server_api=Rest.new(base_url: @api_aoc.params[:base_url])
-            servers=server_api.read('servers')[:data]
-            return {:type=>:object_list,:data=>servers}
+            return {:type=>:object_list,:data=>Rest.new(base_url: "#{AoC.api_base_url}/#{AoC::API_V1}").read('servers')[:data]}
           else
             raise "internal error: #{command}"
           end # action
           raise RuntimeError, "internal error: command shall return"
         end
 
-        private :find_ak_secret,:c_user_info,:aoc_params,:set_workspace_info,:set_home_node_file,:do_bulk_operation,:resolve_package_recipients,:option_url_query,:assert_public_link_types,:execute_admin_action
+        private :c_user_info,:aoc_params,:set_workspace_info,:set_home_node_file,:do_bulk_operation,:resolve_package_recipients,:option_url_query,:assert_public_link_types,:execute_admin_action
         private_constant :VAL_ALL,:NODE4_COMMANDS
 
       end # AoC

data/lib/aspera/cli/plugins/ats.rb

@@ -107,7 +107,7 @@ module Aspera
               :auth     => {
               :type     => :basic,
               :username => access_key_id,
-              :password => self.config.get_secret(access_key_id)}})
+              :password => @agents[:secret].get_secret(access_key_id)}})
             command=self.options.get_next_command(Node::COMMON_ACTIONS)
             return Node.new(@agents.merge(skip_basic_auth_options: true, node_api: api_node)).execute_action(command)
           when :cluster
@@ -116,7 +116,7 @@ module Aspera
               :auth     => {
               :type     => :basic,
               :username => access_key_id,
-              :password => self.config.get_secret(access_key_id)
+              :password => @agents[:secret].get_secret(access_key_id)
               }}
             api_ak_auth=Rest.new(rest_params)
             return {:type=>:single_object, :data=>api_ak_auth.read("servers")[:data]}

data/lib/aspera/cli/plugins/config.rb

@@ -27,6 +27,7 @@ module Aspera
         CONF_PRESET_CONFIG='config'
         CONF_PRESET_VERSION='version'
         CONF_PRESET_DEFAULT='default'
+        CONF_PRESET_GLOBAL='global_common_defaults'
         CONF_PLUGIN_SYM = :config # Plugins::Config.name.split('::').last.downcase.to_sym
         CONF_GLOBAL_SYM = :config
         # old tool name
@@ -45,6 +46,7 @@ module Aspera
         CONNECT_VERSIONS = 'connectversions.js'
         TRANSFER_SDK_ARCHIVE_URL = 'https://ibm.biz/aspera_sdk'
         DEMO='demo'
+        DEMO_SERVER_PRESET='demoserver'
         AOC_PATH_API_CLIENTS='admin/api-clients'
         def option_preset; nil; end
 
@@ -52,13 +54,11 @@ module Aspera
           self.options.add_option_preset(preset_by_name(value))
         end
 
-        private_constant :DEFAULT_CONFIG_FILENAME,:CONF_PRESET_CONFIG,:CONF_PRESET_VERSION,:CONF_PRESET_DEFAULT,:PROGRAM_NAME_V1,:PROGRAM_NAME_V2,:DEFAULT_REDIRECT,:ASPERA_PLUGINS_FOLDERNAME,:RUBY_FILE_EXT,:AOC_COMMAND_V1,:AOC_COMMAND_V2,:AOC_COMMAND_V3,:AOC_COMMAND_CURRENT,:DEMO,:TRANSFER_SDK_ARCHIVE_URL,:AOC_PATH_API_CLIENTS
-        attr_accessor :option_ak_secret,:option_secrets
+        private_constant :DEFAULT_CONFIG_FILENAME,:CONF_PRESET_CONFIG,:CONF_PRESET_VERSION,:CONF_PRESET_DEFAULT,:CONF_PRESET_GLOBAL,:PROGRAM_NAME_V1,:PROGRAM_NAME_V2,:DEFAULT_REDIRECT,:ASPERA_PLUGINS_FOLDERNAME,:RUBY_FILE_EXT,:AOC_COMMAND_V1,:AOC_COMMAND_V2,:AOC_COMMAND_V3,:AOC_COMMAND_CURRENT,:DEMO,:TRANSFER_SDK_ARCHIVE_URL,:AOC_PATH_API_CLIENTS,:DEMO_SERVER_PRESET
 
         def initialize(env,tool_name,help_url,version,main_folder)
           super(env)
-          @option_ak_secret=nil
-          @option_secrets={}
+          raise 'missing secret manager' if @agents[:secret].nil?
           @plugins={}
           @plugin_lookup_folders=[]
           @use_plugin_defaults=true
@@ -87,52 +87,43 @@ module Aspera
           self.options.set_obj_attr(:ascp_path,self,:option_ascp_path)
           self.options.set_obj_attr(:use_product,self,:option_use_product)
           self.options.set_obj_attr(:preset,self,:option_preset)
-          self.options.set_obj_attr(:secret,self,:option_ak_secret)
-          self.options.set_obj_attr(:secrets,self,:option_secrets)
-          self.options.add_opt_boolean(:override,"override existing value")
-          self.options.add_opt_switch(:no_default,"-N","do not load default configuration for plugin") { @use_plugin_defaults=false }
+          self.options.set_obj_attr(:secret,@agents[:secret],:default_secret)
+          self.options.set_obj_attr(:secrets,@agents[:secret],:all_secrets)
+          self.options.add_opt_boolean(:override,'override existing value')
+          self.options.add_opt_switch(:no_default,'-N','do not load default configuration for plugin') { @use_plugin_defaults=false }
           self.options.add_opt_boolean(:use_generic_client,'wizard: AoC: use global or org specific jwt client id')
-          self.options.add_opt_simple(:pkeypath,"path to private key for JWT (wizard)")
-          self.options.add_opt_simple(:ascp_path,"path to ascp")
-          self.options.add_opt_simple(:use_product,"use ascp from specified product")
-          self.options.add_opt_simple(:smtp,"smtp configuration (extended value: hash)")
-          self.options.add_opt_simple(:fpac,"proxy auto configuration URL")
-          self.options.add_opt_simple(:preset,"-PVALUE","load the named option preset from current config file")
-          self.options.add_opt_simple(:default,"set as default configuration for specified plugin")
-          self.options.add_opt_simple(:secret,"access key secret for node")
-          self.options.add_opt_simple(:secrets,"access key secret for node")
-          self.options.add_opt_simple(:sdk_url,"URL to get SDK")
-          self.options.add_opt_simple(:sdk_folder,"SDK folder location")
-          self.options.add_opt_boolean(:test_mode,"skip user validation in wizard mode")
-          self.options.add_opt_simple(:version_check_days,Integer,"period to check neew version in days (zero to disable)")
+          self.options.add_opt_simple(:pkeypath,'path to private key for JWT (wizard)')
+          self.options.add_opt_simple(:ascp_path,'path to ascp')
+          self.options.add_opt_simple(:use_product,'use ascp from specified product')
+          self.options.add_opt_simple(:smtp,'smtp configuration (extended value: hash)')
+          self.options.add_opt_simple(:fpac,'proxy auto configuration URL')
+          self.options.add_opt_simple(:preset,'-PVALUE','load the named option preset from current config file')
+          self.options.add_opt_simple(:default,'set as default configuration for specified plugin')
+          self.options.add_opt_simple(:secret,'default secret')
+          self.options.add_opt_simple(:secrets,'secret repository (Hash)')
+          self.options.add_opt_simple(:sdk_url,'URL to get SDK')
+          self.options.add_opt_simple(:sdk_folder,'SDK folder location')
+          self.options.add_opt_boolean(:test_mode,'skip user validation in wizard mode')
+          self.options.add_opt_simple(:version_check_days,Integer,'period to check neew version in days (zero to disable)')
           self.options.set_option(:use_generic_client,true)
           self.options.set_option(:test_mode,false)
           self.options.set_option(:version_check_days,7)
           self.options.set_option(:sdk_url,TRANSFER_SDK_ARCHIVE_URL)
           self.options.set_option(:sdk_folder,File.join(@main_folder,'sdk'))
           self.options.parse_options!
-          raise CliBadArgument,"secrets shall be Hash" unless @option_secrets.is_a?(Hash)
+          raise CliBadArgument,'secrets shall be Hash' unless @agents[:secret].all_secrets.is_a?(Hash)
           Fasp::Installation.instance.folder=self.options.get_option(:sdk_folder,:mandatory)
         end
 
-        def get_secret(id=nil,mandatory=true)
-          secret=self.options.get_option(:secret,:optional) || @option_secrets[id]
-          raise "please provide secret for #{id}" if secret.nil? and mandatory
-          return secret
-        end
-
-        def get_secrets
-          return @option_secrets
-        end
-
         def check_gem_version
           this_gem_name=File.basename(File.dirname(self.class.gem_root)).gsub(/-[0-9].*$/,'')
           latest_version=begin
-            Rest.new(base_url: "https://rubygems.org/api/v1").read("versions/#{this_gem_name}/latest.json")[:data]['version']
+            Rest.new(base_url: 'https://rubygems.org/api/v1').read("versions/#{this_gem_name}/latest.json")[:data]['version']
           rescue
-            nil
+            Log.log.warn('Could not retrieve latest gem version on rubygems.')
+            '0'
           end
-          return {name: this_gem_name,current: Aspera::Cli::VERSION, latest: latest_version, need_update: Gem::Version.new(Aspera::Cli::VERSION) < Gem::Version.new(latest_version)}
+          return {name: this_gem_name, current: Aspera::Cli::VERSION, latest: latest_version, need_update: Gem::Version.new(Aspera::Cli::VERSION) < Gem::Version.new(latest_version)}
         end
 
         def periodic_check_newer_gem_version
@@ -149,19 +140,18 @@ module Aspera
             ids:     ['version_last_check'])
             # get persisted date or nil
             last_check_date = begin
-              Date.strptime(last_check_array.first, "%Y/%m/%d")
+              Date.strptime(last_check_array.first, '%Y/%m/%d')
             rescue
               nil
             end
             current_date=Date.today
-            Log.log.info("last check: #{last_check_date.class}")
+            Log.log.debug("days elapsed: #{last_check_date.is_a?(Date) ? current_date - last_check_date : last_check_date.class.name}")
             if last_check_date.nil? or (current_date - last_check_date) > delay_days
-              Log.log.info("days elapsed #{last_check_date.is_a?(Date) ? current_date - last_check_date : last_check_date.class.name}")
-              last_check_array[0]=current_date.strftime("%Y/%m/%d")
+              last_check_array[0]=current_date.strftime('%Y/%m/%d')
               check_date_persist.save
               check_data=check_gem_version
               if check_data[:need_update]
-                Log.log.warn("A new version is available: #{check_data[:latest]}. You have #{check_data[:current]}. Upgrade with: gem update #{check_data[:nname]}")
+                Log.log.warn("A new version is available: #{check_data[:latest]}. You have #{check_data[:current]}. Upgrade with: gem update #{check_data[:name]}")
               end
             end
           end
@@ -200,7 +190,7 @@ module Aspera
           require 'openssl'
           priv_key = OpenSSL::PKey::RSA.new(4096)
           File.write(private_key_path,priv_key.to_s)
-          File.write(private_key_path+".pub",priv_key.public_key.to_s)
+          File.write(private_key_path+'.pub',priv_key.public_key.to_s)
           nil
         end
 
@@ -226,7 +216,7 @@ module Aspera
           r=[]
           t.each do |k,v|
             v.each do |kk,vv|
-              r.push({"config"=>k,"parameter"=>kk,"value"=>vv})
+              r.push({'config'=>k,'parameter'=>kk,'value'=>vv})
             end
           end
           return r
@@ -236,12 +226,12 @@ module Aspera
         # creates one if none already created
         # @return preset that contains global default
         def set_global_default(key,value)
-          global_default_preset_name=get_plugin_default_config_name(CONF_GLOBAL_SYM)
-          if global_default_preset_name.nil?
-            global_default_preset_name='global_common_defaults'
-            @config_presets[global_default_preset_name]={}
-          end
+          # get default preset if it exists
+          global_default_preset_name=get_plugin_default_config_name(CONF_GLOBAL_SYM) || CONF_PRESET_GLOBAL
+          @config_presets[global_default_preset_name]||={}
           @config_presets[global_default_preset_name][key.to_s]=value
+          self.format.display_status("Updated: #{global_default_preset_name}: #{key} <- #{value}")
+          save_presets_to_config_file
           return global_default_preset_name
         end
 
@@ -260,7 +250,7 @@ module Aspera
         # @return the hash from name (also expands possible includes)
         def preset_by_name(config_name, include_path=[])
           raise CliError,"no such config preset: #{config_name}" unless @config_presets.has_key?(config_name)
-          raise CliError,"loop in include" if include_path.include?(config_name)
+          raise CliError,'loop in include' if include_path.include?(config_name)
           return expanded_with_preset_includes(@config_presets[config_name],include_path.clone.push(config_name))
         end
 
@@ -295,7 +285,7 @@ module Aspera
         end
 
         def option_use_product
-          "write-only value"
+          'write-only value'
         end
 
         def convert_preset_path(old_name,new_name,files_to_copy)
@@ -339,22 +329,21 @@ module Aspera
             # if no file found, create default config
             if conf_file_to_load.nil?
               Log.log.warn("No config file found. Creating empty configuration file: #{@option_config_file}")
-              @config_presets={CONF_PRESET_CONFIG=>{CONF_PRESET_VERSION=>@program_version},CONF_PRESET_DEFAULT=>{'server'=>'demoserver'},
-                'demoserver'=>{'url'=>'ssh://'+DEMO+'.asperasoft.com:33001','username'=>AOC_COMMAND_V2,'ssAP'.downcase.reverse+'drow'.reverse=>DEMO+AOC_COMMAND_V2}}
+              @config_presets={CONF_PRESET_CONFIG=>{CONF_PRESET_VERSION=>@program_version}}
             else
               Log.log.debug "loading #{@option_config_file}"
               @config_presets=YAML.load_file(conf_file_to_load)
             end
             files_to_copy=[]
             Log.log.debug "Available_presets: #{@config_presets}"
-            raise "Expecting YAML Hash" unless @config_presets.is_a?(Hash)
+            raise 'Expecting YAML Hash' unless @config_presets.is_a?(Hash)
             # check there is at least the config section
             if !@config_presets.has_key?(CONF_PRESET_CONFIG)
               raise "Cannot find key: #{CONF_PRESET_CONFIG}"
             end
             version=@config_presets[CONF_PRESET_CONFIG][CONF_PRESET_VERSION]
             if version.nil?
-              raise "No version found in config section."
+              raise 'No version found in config section.'
             end
             # oldest compatible conf file format, update to latest version when an incompatible change is made
             # check compatibility of version of conf file
@@ -383,24 +372,24 @@ module Aspera
             end
             # Place new compatibility code here
             if save_required
-              Log.log.warn("Saving automatic conversion.")
+              Log.log.warn('Saving automatic conversion.')
               @config_presets[CONF_PRESET_CONFIG][CONF_PRESET_VERSION]=@program_version
               save_presets_to_config_file
-              Log.log.warn("Copying referenced files")
+              Log.log.warn('Copying referenced files')
               files_to_copy.each do |file|
                 FileUtils.cp(file,@main_folder)
                 Log.log.warn("..#{file} -> #{@main_folder}")
               end
             end
           rescue Psych::SyntaxError => e
-            Log.log.error("YAML error in config file")
+            Log.log.error('YAML error in config file')
             raise e
           rescue => e
             Log.log.debug("-> #{e}")
             new_name="#{@option_config_file}.pre#{@program_version}.manual_conversion_needed"
             File.rename(@option_config_file,new_name)
             Log.log.warn("Renamed config file to #{new_name}.")
-            Log.log.warn("Manual Conversion is required. Next time, a new empty file will be created.")
+            Log.log.warn('Manual Conversion is required. Next time, a new empty file will be created.')
             raise CliError,e.to_s
           end
         end
@@ -465,10 +454,10 @@ module Aspera
                   fileurl = one_link['href']
                   filename=fileurl.gsub(%r{.*/},'')
                   api_connect_cdn.call({:operation=>'GET',:subpath=>fileurl,:save_to_file=>File.join(folder_dest,filename)})
-                  return Main.result_status("downloaded: #{filename}")
+                  return Main.result_status("Downloaded: #{filename}")
                 when :open #
                   OpenApplication.instance.uri(one_link['href'])
-                  return Main.result_status("opened: #{one_link['href']}")
+                  return Main.result_status("Opened: #{one_link['href']}")
                 end
               end
             end
@@ -481,18 +470,16 @@ module Aspera
           when :connect
             return execute_connect_action
           when :use
-            default_ascp=self.options.get_next_argument('path to ascp')
-            raise "file name must be ascp" unless File.basename(default_ascp).eql?('ascp')
-            raise "no such file: #{default_ascp}" unless File.exist?(default_ascp)
-            raise "not executable: #{default_ascp}" unless File.executable?(default_ascp)
-            preset_name=set_global_default(:ascp_path,default_ascp)
-            save_presets_to_config_file
-            return {:type=>:status, :data=>"saved to default global preset #{preset_name}"}
+            ascp_path=self.options.get_next_argument('path to ascp')
+            ascp_version=Fasp::Installation.instance.get_ascp_version(ascp_path)
+            self.format.display_status("ascp version: #{ascp_version}")
+            preset_name=set_global_default(:ascp_path,ascp_path)
+            return Main.result_status("Saved to default global preset #{preset_name}")
           when :show # shows files used
             return {:type=>:status, :data=>Fasp::Installation.instance.path(:ascp)}
           when :info # shows files used
             data=Fasp::Installation::FILES.inject({}) do |m,v|
-              m[v.to_s]=Fasp::Installation.instance.path(v) rescue "Not Found"
+              m[v.to_s]=Fasp::Installation.instance.path(v) rescue 'Not Found'
               m
             end
             # read PATHs from ascp directly, and pvcl modules as well
@@ -524,17 +511,16 @@ module Aspera
               default_product=self.options.get_next_argument('product name')
               Fasp::Installation.instance.use_ascp_from_product(default_product)
               preset_name=set_global_default(:ascp_path,Fasp::Installation.instance.path(:ascp))
-              save_presets_to_config_file
-              return {:type=>:status, :data=>"saved to default global preset #{preset_name}"}
+              return Main.result_status("Saved to default global preset #{preset_name}")
             end
           when :install
             v=Fasp::Installation.instance.install_sdk(self.options.get_option(:sdk_url,:mandatory))
-            return {:type=>:status, :data=>"Installed version #{v}"}
+            return Main.result_status("Installed version #{v}")
           end
           raise "unexpected case: #{command}"
         end
 
-        ACTIONS=[:gem_path, :genkey,:plugins,:flush_tokens,:list,:overview,:open,:echo,:id,:documentation,:wizard,:export_to_cli,:detect,:coffee,:ascp,:email_test,:smtp_settings,:proxy_check,:folder,:file,:check_update]
+        ACTIONS=[:gem_path, :genkey,:plugins,:flush_tokens,:list,:overview,:open,:echo,:id,:documentation,:wizard,:export_to_cli,:detect,:coffee,:ascp,:email_test,:smtp_settings,:proxy_check,:folder,:file,:check_update,:initdemo]
 
         # "config" plugin
         def execute_action
@@ -553,7 +539,7 @@ module Aspera
             when :delete
               @config_presets.delete(config_name)
               save_presets_to_config_file
-              return Main.result_status("deleted: #{config_name}")
+              return Main.result_status("Deleted: #{config_name}")
             when :get
               param_name=self.options.get_next_argument('parameter name')
               value=selected_preset[param_name]
@@ -566,7 +552,7 @@ module Aspera
               param_name=self.options.get_next_argument('parameter name')
               selected_preset.delete(param_name)
               save_presets_to_config_file
-              return Main.result_status("removed: #{config_name}: #{param_name}")
+              return Main.result_status("Removed: #{config_name}: #{param_name}")
             when :set
               param_name=self.options.get_next_argument('parameter name')
               param_value=self.options.get_next_argument('parameter value')
@@ -579,7 +565,7 @@ module Aspera
               end
               selected_preset[param_name]=param_value
               save_presets_to_config_file
-              return Main.result_status("updated: #{config_name}: #{param_name} <- #{param_value}")
+              return Main.result_status("Updated: #{config_name}: #{param_name} <- #{param_value}")
             when :initialize
               config_value=self.options.get_next_argument('extended value (Hash)')
               if @config_presets.has_key?(config_name)
@@ -587,7 +573,7 @@ module Aspera
               end
               @config_presets[config_name]=config_value
               save_presets_to_config_file
-              return Main.result_status("modified: #{@option_config_file}")
+              return Main.result_status("Modified: #{@option_config_file}")
             when :update
               default_for_plugin=self.options.get_option(:default,:optional)
               #  get unprocessed options
@@ -600,7 +586,7 @@ module Aspera
                 @config_presets[CONF_PRESET_DEFAULT][default_for_plugin]=config_name
               end
               save_presets_to_config_file
-              return Main.result_status("updated: #{config_name}")
+              return Main.result_status("Updated: #{config_name}")
             when :ask
               self.options.ask_missing_mandatory=:yes
               @config_presets[config_name]||={}
@@ -609,7 +595,7 @@ module Aspera
                 @config_presets[config_name][optionname]=option_value
               end
               save_presets_to_config_file
-              return Main.result_status("updated: #{config_name}")
+              return Main.result_status("Updated: #{config_name}")
             end
           when :documentation
             section=options.get_next_argument('private key file path',:single,:optional)
@@ -622,9 +608,9 @@ module Aspera
           when :genkey # generate new rsa key
             private_key_path=self.options.get_next_argument('private key file path')
             generate_new_key(private_key_path)
-            return Main.result_status('generated key: '+private_key_path)
+            return Main.result_status('Generated key: '+private_key_path)
           when :echo # display the content of a value given on command line
-            result={:type=>:other_struct, :data=>self.options.get_next_argument("value")}
+            result={:type=>:other_struct, :data=>self.options.get_next_argument('value')}
             # special for csv
             result[:type]=:object_list if result[:data].is_a?(Array) and result[:data].first.is_a?(Hash)
             return result
@@ -645,7 +631,7 @@ module Aspera
             appli=ApiDetector.discover_product(instance_url)
             case appli[:product]
             when :aoc
-              self.format.display_status("Detected: Aspera on Cloud".bold)
+              self.format.display_status('Detected: Aspera on Cloud'.bold)
               organization,instance_domain=AoC.parse_url(instance_url)
               aspera_preset_name='aoc_'+organization
               self.format.display_status("Preparing preset: #{aspera_preset_name}")
@@ -659,7 +645,7 @@ module Aspera
               private_key_path=self.options.get_option(:pkeypath,:optional)
               # give a chance to provide
               if private_key_path.nil?
-                self.format.display_status("Please provide path to your private RSA key, or empty to generate one:")
+                self.format.display_status('Please provide path to your private RSA key, or empty to generate one:')
                 private_key_path=self.options.get_option(:pkeypath,:mandatory).to_s
               end
               # else generate path
@@ -667,11 +653,11 @@ module Aspera
                 private_key_path=File.join(@main_folder,'aspera_aoc_key')
               end
               if File.exist?(private_key_path)
-                self.format.display_status("Using existing key:")
+                self.format.display_status('Using existing key:')
               else
-                self.format.display_status("Generating key...")
+                self.format.display_status('Generating key...')
                 generate_new_key(private_key_path)
-                self.format.display_status("Created:")
+                self.format.display_status('Created:')
               end
               self.format.display_status("#{private_key_path}")
               pub_key_pem=OpenSSL::PKey::RSA.new(File.read(private_key_path)).public_key.to_s
@@ -681,32 +667,32 @@ module Aspera
               self.options.get_option(:username,:mandatory)
               # instanciate AoC plugin, so that command line options are known
               files_plugin=self.class.plugin_new(AOC_COMMAND_CURRENT,@agents.merge({skip_basic_auth_options: true, private_key_path: private_key_path}))
-              aoc_api=files_plugin.api_aoc
+              aoc_api=files_plugin.get_api
               auto_set_pub_key=false
               auto_set_jwt=false
               use_browser_authentication=false
               if self.options.get_option(:use_generic_client)
-                self.format.display_status("Using global client_id.")
-                self.format.display_status("Please Login to your Aspera on Cloud instance.".red)
-                self.format.display_status("Navigate to your \"Account Settings\"".red)
-                self.format.display_status("Check or update the value of \"Public Key\" to be:".red.blink)
+                self.format.display_status('Using global client_id.')
+                self.format.display_status('Please Login to your Aspera on Cloud instance.'.red)
+                self.format.display_status('Navigate to your "Account Settings"'.red)
+                self.format.display_status('Check or update the value of "Public Key" to be:'.red.blink)
                 self.format.display_status("#{pub_key_pem}")
                 if ! self.options.get_option(:test_mode)
-                  self.format.display_status("Once updated or validated, press enter.")
+                  self.format.display_status('Once updated or validated, press enter.')
                   OpenApplication.instance.uri(instance_url)
                   STDIN.gets
                 end
               else
-                self.format.display_status("Using organization specific client_id.")
+                self.format.display_status('Using organization specific client_id.')
                 if self.options.get_option(:client_id,:optional).nil? or self.options.get_option(:client_secret,:optional).nil?
-                  self.format.display_status("Please login to your Aspera on Cloud instance.".red)
-                  self.format.display_status("Go to: Apps->Admin->Organization->Integrations")
-                  self.format.display_status("Create or check if there is an existing integration named:")
+                  self.format.display_status('Please login to your Aspera on Cloud instance.'.red)
+                  self.format.display_status('Go to: Apps->Admin->Organization->Integrations')
+                  self.format.display_status('Create or check if there is an existing integration named:')
                   self.format.display_status("- name: #{@tool_name}")
                   self.format.display_status("- redirect uri: #{DEFAULT_REDIRECT}")
-                  self.format.display_status("- origin: localhost")
-                  self.format.display_status("Once created or identified,")
-                  self.format.display_status("Please enter:".red)
+                  self.format.display_status('- origin: localhost')
+                  self.format.display_status('Once created or identified,')
+                  self.format.display_status('Please enter:'.red)
                 end
                 OpenApplication.instance.uri("#{instance_url}/#{AOC_PATH_API_CLIENTS}")
                 self.options.get_option(:client_id,:mandatory)
@@ -714,7 +700,7 @@ module Aspera
                 use_browser_authentication=true
               end
               if use_browser_authentication
-                self.format.display_status("We will use web authentication to bootstrap.")
+                self.format.display_status('We will use web authentication to bootstrap.')
                 auto_set_pub_key=true
                 auto_set_jwt=true
                 @api_aoc.oauth.params[:auth]=:web
@@ -728,7 +714,7 @@ module Aspera
                 aoc_api.update("users/#{myself['id']}",{'public_key'=>pub_key_pem})
               end
               if auto_set_jwt
-                self.format.display_status("Enabling JWT for client")
+                self.format.display_status('Enabling JWT for client')
                 aoc_api.update("clients/#{self.options.get_option(:client_id)}",{'jwt_grant_enabled'=>true,'explicit_authorization_required'=>false})
               end
               self.format.display_status("creating new config preset: #{aspera_preset_name}")
@@ -745,14 +731,14 @@ module Aspera
               end
               self.format.display_status("Setting config preset as default for #{AOC_COMMAND_CURRENT}")
               @config_presets[CONF_PRESET_DEFAULT][AOC_COMMAND_CURRENT]=aspera_preset_name
-              self.format.display_status("saving config file")
+              self.format.display_status('saving config file')
               save_presets_to_config_file
               return Main.result_status("Done.\nYou can test with:\n#{@tool_name} #{AOC_COMMAND_CURRENT} user info show")
             else
               raise CliBadArgument,"Supports only: aoc. Detected: #{appli}"
             end
           when :export_to_cli
-            self.format.display_status("Exporting: Aspera on Cloud")
+            self.format.display_status('Exporting: Aspera on Cloud')
             require 'aspera/cli/plugins/aoc'
             # need url / username
             add_plugin_default_preset(AOC_COMMAND_V3.to_sym)
@@ -785,11 +771,11 @@ module Aspera
               entry.merge!(new_conf)
             end
             File.write(cli_conf_file,JSON.pretty_generate(data))
-            return Main.result_status("updated: #{cli_conf_file}")
+            return Main.result_status("Updated: #{cli_conf_file}")
           when :detect
             # need url / username
             BasicAuthPlugin.new(@agents)
-            return Main.result_status("found: #{ApiDetector.discover_product(self.options.get_option(:url,:mandatory))}")
+            return Main.result_status("Found: #{ApiDetector.discover_product(self.options.get_option(:url,:mandatory))}")
           when :coffee
             OpenApplication.instance.uri('https://enjoyjava.com/wp-content/uploads/2018/01/How-to-make-strong-coffee.jpg')
             return Main.result_nothing
@@ -802,7 +788,7 @@ module Aspera
           when :file
             return Main.result_status(@option_config_file)
           when :email_test
-            dest_email=self.options.get_next_argument("destination email")
+            dest_email=self.options.get_next_argument('destination email')
             send_email({
               to:         dest_email,
               subject:    'Amelia email test',
@@ -813,11 +799,28 @@ module Aspera
             return {:type=>:single_object,:data=>email_settings}
           when :proxy_check
             pac_url=self.options.get_option(:fpac,:mandatory)
-            server_url=self.options.get_next_argument("server url")
+            server_url=self.options.get_next_argument('server url')
             return Main.result_status(Aspera::ProxyAutoConfig.new(UriReader.read(pac_url)).get_proxy(server_url))
           when :check_update
             return {:type=>:single_object, :data=>check_gem_version}
-          else raise "error"
+          when :initdemo
+            if @config_presets.has_key?(DEMO_SERVER_PRESET)
+              Log.log.warn("Demo server preset already present: #{DEMO_SERVER_PRESET}")
+            else
+              Log.log.info("Creating Demo server preset: #{DEMO_SERVER_PRESET}")
+              @config_presets[DEMO_SERVER_PRESET]={'url'=>'ssh://'+DEMO+'.asperasoft.com:33001','username'=>AOC_COMMAND_V2,'ssAP'.downcase.reverse+'drow'.reverse=>DEMO+AOC_COMMAND_V2}
+            end
+            @config_presets[CONF_PRESET_DEFAULT]||={}
+            if @config_presets[CONF_PRESET_DEFAULT].has_key?('server')
+              Log.log.warn("server default preset already set to: #{@config_presets[CONF_PRESET_DEFAULT]['server']}")
+              Log.log.warn("use #{DEMO_SERVER_PRESET} for demo: -P#{DEMO_SERVER_PRESET}") unless DEMO_SERVER_PRESET.eql?(@config_presets[CONF_PRESET_DEFAULT]['server'])
+            else
+              @config_presets[CONF_PRESET_DEFAULT]['server']=DEMO_SERVER_PRESET
+              Log.log.info("setting server default preset to : #{DEMO_SERVER_PRESET}")
+            end
+            save_presets_to_config_file
+            return Main.result_status("Done")
+          else raise 'error'
           end
         end
 
@@ -865,7 +868,7 @@ END_OF_MESSAGE
         end
 
         def save_presets_to_config_file
-          raise "no configuration loaded" if @config_presets.nil?
+          raise 'no configuration loaded' if @config_presets.nil?
           FileUtils.mkdir_p(@main_folder) unless Dir.exist?(@main_folder)
           Log.log.debug "writing #{@option_config_file}"
           File.write(@option_config_file,@config_presets.to_yaml)
@@ -876,7 +879,7 @@ END_OF_MESSAGE
         def get_plugin_default_config_name(plugin_sym)
           raise "internal error: config_presets shall be defined" if @config_presets.nil?
           if !@use_plugin_defaults
-            Log.log.debug("skip default config")
+            Log.log.debug('skip default config')
             return nil
           end
           if @config_presets.has_key?(CONF_PRESET_DEFAULT) and