aspera-cli 4.0.0.pre1 → 4.0.0.pre2

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

@@ -93,7 +93,7 @@ module Aspera
             return Main.result_status('modified')
           when :entitlement
             ak=ats_api_pub_v1.read("access_keys/#{access_key_id}")[:data]
-            api_bss=OnCloud.metering_api(ak['license']['entitlement_id'],ak['license']['customer_id'])
+            api_bss=AoC.metering_api(ak['license']['entitlement_id'],ak['license']['customer_id'])
             return {:type=>:single_object, :data=>api_bss.read('entitlement')[:data]}
           when :delete
             res=ats_api_pub_v1.delete("access_keys/#{access_key_id}")

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

@@ -3,9 +3,10 @@ require 'aspera/cli/extended_value'
 require 'aspera/fasp/installation'
 require 'aspera/api_detector'
 require 'aspera/open_application'
-require 'aspera/on_cloud'
+require 'aspera/aoc'
 require 'aspera/proxy_auto_config'
 require 'aspera/uri_reader'
+require 'aspera/rest'
 require 'xmlsimple'
 require 'base64'
 require 'net/smtp'
@@ -38,7 +39,8 @@ module Aspera
         RUBY_FILE_EXT='.rb'
         AOC_COMMAND_V1='files'
         AOC_COMMAND_V2='aspera'
-        AOC_COMMAND_V3='oncloud'
+        AOC_COMMAND_V3='aoc'
+        AOC_COMMAND_CURRENT=AOC_COMMAND_V3
         CONNECT_WEB_URL = 'https://d3gcli72yxqn2z.cloudfront.net/connect'
         CONNECT_VERSIONS = 'connectversions.js'
         DEMO='demo'
@@ -48,7 +50,7 @@ module Aspera
           self.options.add_option_preset(preset_by_name(value))
         end
 
-        private_constant :ASPERA_HOME_FOLDER_NAME,:DEFAULT_CONFIG_FILENAME,:CONF_PRESET_CONFIG,:CONF_PRESET_VERSION,:CONF_PRESET_DEFAULT,:PROGRAM_NAME_V1,:PROGRAM_NAME_V2,:DEFAULT_REDIRECT,:ASPERA_PLUGINS_FOLDERNAME,:GEM_PLUGINS_FOLDER,:RUBY_FILE_EXT,:AOC_COMMAND_V1,:AOC_COMMAND_V2,:AOC_COMMAND_V3,:DEMO
+        private_constant :ASPERA_HOME_FOLDER_NAME,:DEFAULT_CONFIG_FILENAME,:CONF_PRESET_CONFIG,:CONF_PRESET_VERSION,:CONF_PRESET_DEFAULT,:PROGRAM_NAME_V1,:PROGRAM_NAME_V2,:DEFAULT_REDIRECT,:ASPERA_PLUGINS_FOLDERNAME,:GEM_PLUGINS_FOLDER,:RUBY_FILE_EXT,:AOC_COMMAND_V1,:AOC_COMMAND_V2,:AOC_COMMAND_V3,:AOC_COMMAND_CURRENT,:DEMO
         attr_accessor :option_ak_secret,:option_secrets
 
         def initialize(env,tool_name,help_url,version)
@@ -67,7 +69,8 @@ module Aspera
           @option_config_file=@conf_file_default
           @connect_versions=nil
           # set folder where generated FASP files are
-          Fasp::Installation.instance.config_folder=@main_folder
+          Fasp::Installation.instance.folder=File.join(@main_folder,'sdk')
+          FileUtils.mkdir_p(Fasp::Installation.instance.folder)
           add_plugin_lookup_folder(File.join(@main_folder,ASPERA_PLUGINS_FOLDERNAME))
           add_plugin_lookup_folder(File.join(Main.gem_root,GEM_PLUGINS_FOLDER))
           # do file parameter first
@@ -405,7 +408,7 @@ module Aspera
         end
 
         def execute_action_ascp
-          command=self.options.get_next_command([:connect,:use,:show,:products,:info])
+          command=self.options.get_next_command([:connect,:use,:show,:products,:info,:install])
           case command
           when :connect
             return execute_connect_action
@@ -429,12 +432,15 @@ module Aspera
               while line=stderr.gets do
                 line.chomp!
                 case line
-                when /^DBG Path ([^ ]+) (dir|file) +: (.*)$/;data[$1]=$3
-                when /^DBG Added module group:"([^"]+)" name:"([^"]+)", version:"([^"]+)" interface:"([^"]+)"$/;data[$2]=$4
+                when %r{^DBG Path ([^ ]+) (dir|file) +: (.*)$};data[$1]=$3
+                when %r{^DBG Added module group:"([^"]+)" name:"([^"]+)", version:"([^"]+)" interface:"([^"]+)"$};data[$2]=$4
+                when %r{^DBG License result \(/license/(\S+)\): (.+)$};data[$1]=$2
+                when %r{^LOG (.+) version ([0-9.]+)$};data['product_name']=$1;data['product_version']=$2
+                when %r{^LOG Initializing FASP version ([^,]+),};data['ascp_version']=$1
                 end
               end
             end
-            data['keypass']=Fasp::Installation.instance.bypass_keys.shift
+            data['keypass']=Fasp::Installation.instance.bypass_pass
             return {:type=>:single_object, :data=>data}
           when :products
             command=self.options.get_next_command([:list,:use])
@@ -448,7 +454,11 @@ module Aspera
               save_presets_to_config_file
               return {:type=>:status, :data=>"saved to default global preset #{preset_name}"}
             end
+          when :install
+            v=Fasp::Installation.instance.install_sdk
+            return {:type=>:status, :data=>"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]
@@ -562,7 +572,7 @@ module Aspera
             case appli[:product]
             when :aoc
               self.format.display_status("Detected: Aspera on Cloud".bold)
-              organization,instance_domain=OnCloud.parse_url(instance_url)
+              organization,instance_domain=AoC.parse_url(instance_url)
               aspera_preset_name='aoc_'+organization
               self.format.display_status("Preparing preset: #{aspera_preset_name}")
               # init defaults if necessary
@@ -580,7 +590,7 @@ module Aspera
               end
               # else generate path
               if private_key_path.empty?
-                private_key_path=File.join(@main_folder,'aspera_on_cloud_key')
+                private_key_path=File.join(@main_folder,'aspera_aoc_key')
               end
               if File.exist?(private_key_path)
                 self.format.display_status("Using existing key:")
@@ -592,7 +602,7 @@ module Aspera
               self.format.display_status("#{private_key_path}")
               pub_key_pem=OpenSSL::PKey::RSA.new(File.read(private_key_path)).public_key.to_s
               # define options
-              require 'aspera/cli/plugins/oncloud'
+              require 'aspera/cli/plugins/aoc'
               # make username mandatory for jwt, this triggers interactive input
               self.options.get_option(:username,:mandatory)
               files_plugin=Plugins::Oncloud.new(@agents.merge({skip_basic_auth_options: true, private_key_path: private_key_path}))
@@ -634,7 +644,7 @@ module Aspera
                 self.options.set_option(:redirect_uri,DEFAULT_REDIRECT)
                 auto_set_pub_key=true
                 auto_set_jwt=true
-                self.options.set_option(:scope,OnCloud::SCOPE_FILES_ADMIN)
+                self.options.set_option(:scope,AoC::SCOPE_FILES_ADMIN)
               end
               files_plugin.update_aoc_api
               myself=files_plugin.api_aoc.read('self')[:data]
@@ -663,20 +673,20 @@ module Aspera
               @config_presets[CONF_PRESET_DEFAULT][AOC_COMMAND_V2]=aspera_preset_name
               self.format.display_status("saving config file")
               save_presets_to_config_file
-              return Main.result_status("Done.\nYou can test with:\n#{@tool_name} aspera user info show")
+              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")
-            require 'aspera/cli/plugins/oncloud'
+            require 'aspera/cli/plugins/aoc'
             # need url / username
             add_plugin_default_preset(AOC_COMMAND_V3.to_sym)
             files_plugin=Plugins::Oncloud.new(@agents) # TODO: is this line needed ?
             url=self.options.get_option(:url,:mandatory)
             cli_conf_file=Fasp::Installation.instance.cli_conf_file
             data=JSON.parse(File.read(cli_conf_file))
-            organization,instance_domain=OnCloud.parse_url(url)
+            organization,instance_domain=AoC.parse_url(url)
             key_basename='org_'+organization+'.pem'
             key_file=File.join(File.dirname(File.dirname(cli_conf_file)),'etc',key_basename)
             File.write(key_file,self.options.get_option(:private_key,:mandatory))
@@ -686,7 +696,11 @@ module Aspera
               'privateKeyFilename' => key_basename,
               'username'           => self.options.get_option(:username,:mandatory)
             }
-            new_conf['clientId'],new_conf['clientSecret']=OnCloud.get_client_ids(self.options.get_option(:client_id,:optional),self.options.get_option(:client_secret,:optional))
+            new_conf['clientId']=self.options.get_option(:client_id,:optional)
+            new_conf['clientSecret']=self.options.get_option(:client_secret,:optional)
+            if new_conf['clientId'].nil?
+              new_conf['clientId'],new_conf['clientSecret']=AoC.get_client_info()
+            end
             entry=data['AoCAccounts'].select{|i|i['organization'].eql?(organization)}.first
             if entry.nil?
               data['AoCAccounts'].push(new_conf)
@@ -775,7 +789,7 @@ END_OF_MESSAGE
 
         def save_presets_to_config_file
           raise "no configuration loaded" if @config_presets.nil?
-          FileUtils::mkdir_p(@main_folder) unless Dir.exist?(@main_folder)
+          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)
         end

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

@@ -1,14 +1,11 @@
-require 'aspera/cli/plugins/node'
 require 'aspera/cli/plugin'
-require 'xmlsimple'
+require 'aspera/cli/plugins/node'
+require 'aspera/cos_node'
 
 module Aspera
   module Cli
     module Plugins
       class Cos < Plugin
-        # IBM Cloud authentication : + token
-        IBM_CLOUD_OAUTH_URL='https://iam.cloud.ibm.com/identity'
-        private_constant :IBM_CLOUD_OAUTH_URL
         def initialize(env)
           super(env)
           @service_creds=nil
@@ -34,7 +31,7 @@ module Aspera
             raise "one of: endpoint or service_credentials is required" if service_credentials.nil? and storage_endpoint.nil?
             raise "endpoint and service_credentials are mutually exclusive" unless service_credentials.nil? or storage_endpoint.nil?
             if service_credentials.nil?
-              serv_cred_storage_api_key = self.options.get_option(:apikey,:mandatory)
+              service_api_key = self.options.get_option(:apikey,:mandatory)
               instance_id = self.options.get_option(:crn,:mandatory)
             else
               # check necessary contents
@@ -46,57 +43,20 @@ module Aspera
               # get options
               bucket_region=self.options.get_option(:region,:mandatory)
               # get API key from service credentials
-              serv_cred_storage_api_key=service_credentials['apikey']
+              service_api_key=service_credentials['apikey']
               instance_id=service_credentials['resource_instance_id']
               # read endpoints from service provided in service credentials
               endpoints=Aspera::Rest.new({:base_url=>service_credentials['endpoints']}).read('')[:data]
               Aspera::Log.dump('endpoints',endpoints)
-              storage_endpoint='https://'+endpoints['service-endpoints']['regional'][bucket_region]['public'][bucket_region]
+              storage_endpoint=endpoints.dig('service-endpoints','regional',bucket_region,'public',bucket_region)
+              raise "no such region: #{bucket_region}" if storage_endpoint.nil?
+              storage_endpoint='https://'+storage_endpoint
             end
-
-            s3_api=Aspera::Rest.new({
-              :base_url => storage_endpoint,
-              :not_auth_codes => ['401','403'],
-              :headers  => {'ibm-service-instance-id' => instance_id},
-              :auth     => {
-              :type       => :oauth2,
-              :base_url   => IBM_CLOUD_OAUTH_URL,
-              :grant      => :ibm_apikey,
-              :api_key    => serv_cred_storage_api_key
-              }})
-            # read FASP connection information for bucket
-            xml_result_text=s3_api.call({:operation=>'GET',:subpath=>bucket_name,:headers=>{'Accept'=>'application/xml'},:url_params=>{'faspConnectionInfo'=>nil}})[:http].body
-            ats_info=XmlSimple.xml_in(xml_result_text, {'ForceArray' => false})
-            Aspera::Log.dump('ats_info',ats_info)
-            # get delegated token
-            delegated_oauth=Oauth.new({
-              :type       => :oauth2,
-              :base_url   => IBM_CLOUD_OAUTH_URL,
-              :grant      => :delegated_refresh,
-              :api_key    => serv_cred_storage_api_key,
-              :token_field=> 'delegated_refresh_token'
-            })
-            # to be placed in rest call header and in transfer tags
-            aspera_storage_credentials={
-              'type'  => 'token',
-              'token' => {'delegated_refresh_token'=>delegated_oauth.get_authorization().gsub(/^Bearer /,'')}
-            }
-            # transfer spec addition
-            add_ts={'tags'=>{'aspera'=>{'node'=>{'storage_credentials'=>aspera_storage_credentials}}}}
-            # set a general addon to transfer spec
-            # here we choose to use the add_request_param
-            #self.transfer.option_transfer_spec_deep_merge(add_ts)
-            api_node=Rest.new({
-              :base_url => ats_info['ATSEndpoint'],
-              :headers  => {'X-Aspera-Storage-Credentials'=>JSON.generate(aspera_storage_credentials)},
-              :auth     => {
-              :type     => :basic,
-              :username => ats_info['AccessKey']['Id'],
-              :password => ats_info['AccessKey']['Secret']}})
+            api_node=CosNode.new(bucket_name,storage_endpoint,instance_id,service_api_key)
             #command=self.options.get_next_command(Node::ACTIONS)
             #command=self.options.get_next_command(Node::COMMON_ACTIONS)
             command=self.options.get_next_command([:upload,:download,:info,:access_key,:api_details])
-            node_plugin=Node.new(@agents.merge(skip_basic_auth_options: true, node_api: api_node, add_request_param: add_ts))
+            node_plugin=Node.new(@agents.merge(skip_basic_auth_options: true, node_api: api_node, add_request_param: api_node.add_ts))
             return node_plugin.execute_action(command)
           end
         end

data/lib/aspera/cli/version.rb

@@ -1,5 +1,5 @@
 module Aspera
   module Cli
-    VERSION = "4.0.0.pre1"
+    VERSION = "4.0.0.pre2"
   end
 end

data/lib/aspera/cos_node.rb

@@ -0,0 +1,50 @@
+require 'aspera/log'
+require 'aspera/rest'
+require 'xmlsimple'
+
+module Aspera
+  class CosNode < Rest
+    attr_reader :add_ts
+    def initialize(bucket_name,storage_endpoint,instance_id,api_key,auth_url='https://iam.cloud.ibm.com/identity')
+      s3_api=Aspera::Rest.new({
+        :base_url => storage_endpoint,
+        :not_auth_codes => ['401','403'],
+        :headers  => {'ibm-service-instance-id' => instance_id},
+        :auth     => {
+        :type       => :oauth2,
+        :base_url   => auth_url,
+        :grant      => :ibm_apikey,
+        :api_key    => api_key
+        }})
+      # read FASP connection information for bucket
+      xml_result_text=s3_api.call({:operation=>'GET',:subpath=>bucket_name,:headers=>{'Accept'=>'application/xml'},:url_params=>{'faspConnectionInfo'=>nil}})[:http].body
+      ats_info=XmlSimple.xml_in(xml_result_text, {'ForceArray' => false})
+      Aspera::Log.dump('ats_info',ats_info)
+      # get delegated token
+      delegated_oauth=Oauth.new({
+        :type       => :oauth2,
+        :base_url   => auth_url,
+        :grant      => :delegated_refresh,
+        :api_key    => api_key,
+        :token_field=> 'delegated_refresh_token'
+      })
+      # to be placed in rest call header and in transfer tags
+      aspera_storage_credentials={
+        'type'  => 'token',
+        'token' => {'delegated_refresh_token'=>delegated_oauth.get_authorization().gsub(/^Bearer /,'')}
+      }
+      # transfer spec addition
+      @add_ts={'tags'=>{'aspera'=>{'node'=>{'storage_credentials'=>aspera_storage_credentials}}}}
+      # set a general addon to transfer spec
+      # here we choose to use the add_request_param
+      #self.transfer.option_transfer_spec_deep_merge(@add_ts)
+      super({
+        :base_url => ats_info['ATSEndpoint'],
+        :headers  => {'X-Aspera-Storage-Credentials'=>JSON.generate(aspera_storage_credentials)},
+        :auth     => {
+        :type     => :basic,
+        :username => ats_info['AccessKey']['Id'],
+        :password => ats_info['AccessKey']['Secret']}})
+    end
+  end
+end

data/lib/aspera/data/3

@@ -0,0 +1 @@
+t1(�;�E��F�)P

data/lib/aspera/data/4

@@ -0,0 +1,2 @@
+~�f��h���q
+I��8VZs����y�0����S�	r�t���j�*����{��y�%�<Z���

data/lib/aspera/data/5

@@ -0,0 +1 @@
+Q�3Cr�l�m���
v���L�����]aj��8���3@���<RĖ�_���~mӽ�Nl=u~�7��}-��{
u

data/lib/aspera/data/6

@@ -0,0 +1,2 @@
+x�}R�N�0�#�����Ƥ����5J���:%?0ޞ,S;�n���	�z�>�y��)����
)���M���R>����T@&�"���d�5���"hV�#98��
+u��դʬ�>��X�jZf�t�~Z��k^M���ÀN�Ԑ�2@M��W�h���}�E#I��:��h^�%�G*e#_/xu>g&~Dʒ��
al���W�qhKi	@�1�S�i�ll�6h`����<�:;O�!Y�a�4��j/<��3�MA�蜍�q��x��4���N:�	ӃŴș�*���>�At��7x^�G����O�����

data/lib/aspera/data_repository.rb

@@ -0,0 +1,13 @@
+require 'aspera/log'
+require 'singleton'
+
+module Aspera
+  # a simple binary data repository
+  class DataRepository
+    include Singleton
+    # get binary value from data repository
+    def get_bin(id)
+      File.read(File.join(File.expand_path(File.dirname(__FILE__)),'data',id.to_s),mode: 'rb')
+    end
+  end
+end

data/lib/aspera/environment.rb

@@ -0,0 +1,55 @@
+require 'aspera/log'
+
+module Aspera
+  # a simple binary data repository
+  class Environment
+    OS_WINDOWS = :windows
+    OS_X = :osx
+    OS_LINUX = :linux
+    OS_AIX = :aix
+    OS_LIST=[OS_WINDOWS,OS_X,OS_LINUX,OS_AIX]
+
+    def self.os
+      case RbConfig::CONFIG['host_os']
+      when /mswin/,/msys/,/mingw/,/cygwin/,/bccwin/,/wince/,/emc/
+        return OS_WINDOWS
+      when /darwin/,/mac os/
+        return OS_X
+      when /linux/
+        return OS_LINUX
+      when /aix/
+        return OS_AIX
+      else
+        raise "Unknown: #{RbConfig::CONFIG['host_os']}"
+      end
+    end
+    CPU_X86_64=:x86_64
+    CPU_PPC64=:ppc64
+    CPU_PPC64LE=:ppc64le
+    CPU_S390=:s390
+    CPU_LIST=[CPU_X86_64,CPU_PPC64,CPU_PPC64LE,CPU_S390]
+
+    def self.cpu
+      case RbConfig::CONFIG['host_cpu']
+      when /x86_64/
+        return :x86_64
+      when /powerpc/
+        return :ppc64le if os.eql?(OS_LINUX)
+        return :ppc64
+      when /s390/
+        return :s390
+      else # other
+        raise "Unknown: #{RbConfig::CONFIG['host_cpu']}"
+      end
+    end
+
+    def self.architecture
+      return "#{os}-#{cpu}"
+    end
+
+    def self.exe_extension
+      return '.exe' if os.eql?(OS_WINDOWS)
+      return ''
+    end
+  end
+end

data/lib/aspera/fasp/aoc.rb

@@ -1,17 +1,17 @@
 require 'aspera/fasp/node'
 require 'aspera/log'
-require 'aspera/on_cloud.rb'
+require 'aspera/aoc.rb'
 
 module Aspera
   module Fasp
     class Aoc < Node
-      def initialize(on_cloud_options)
-        @app=on_cloud_options[:app] || OnCloud::FILES_APP
-        @api_oncloud=OnCloud.new(on_cloud_options)
+      def initialize(aoc_options)
+        @app=aoc_options[:app] || AoC::FILES_APP
+        @api_aoc=AoC.new(aoc_options)
         Log.log.warn("Under Development")
-        server_node_file = @api_oncloud.resolve_node_file(server_home_node_file,server_folder)
+        server_node_file = @api_aoc.resolve_node_file(server_home_node_file,server_folder)
         # force node as transfer agent
-        node_api=Fasp::Node.new(@api_oncloud.get_node_api(client_node_file[:node_info],OnCloud::SCOPE_NODE_USER))
+        node_api=Fasp::Node.new(@api_aoc.get_node_api(client_node_file[:node_info],AoC::SCOPE_NODE_USER))
         super(node_api)
         # additional node to node TS info
         @add_ts={

data/lib/aspera/fasp/installation.rb

@@ -1,7 +1,7 @@
 require 'singleton'
 require 'aspera/log'
-require 'aspera/open_application' # current_os_type
-
+require 'aspera/environment'
+require 'aspera/data_repository'
 require 'xmlsimple'
 require 'zlib'
 require 'base64'
@@ -14,13 +14,17 @@ module Aspera
     # but the user can specify ascp location by calling:
     # Installation.instance.use_ascp_from_product(product_name)
     # or
-    # Installation.instance.ascp_path=ascp_path
+    # Installation.instance.ascp_path=""
     class Installation
       include Singleton
       # currently used ascp executable
       attr_accessor :ascp_path
-      # where key files are generated and used
-      attr_accessor :config_folder
+      # location of SDK files
+      attr_accessor :folder
+      PRODUCT_CONNECT='Aspera Connect'
+      PRODUCT_CLI_V1='Aspera CLI'
+      PRODUCT_DRIVE='Aspera Drive'
+      PRODUCT_ENTSRV='Enterprise Server'
       # find ascp in named product (use value : FIRST_FOUND='FIRST' to just use first one)
       # or select one from installed_products()
       def use_ascp_from_product(product_name)
@@ -38,12 +42,18 @@ module Aspera
       # @return the list of installed products in format of product_locations
       def installed_products
         if @found_products.nil?
-          @found_products=product_locations.select do |pl|
+          @found_products=product_locations
+          # add sdk as first search path
+          @found_products.unshift({# SDK
+            :expected =>'SDK',
+            :app_root =>@folder,
+            :sub_bin =>''
+          })
+          @found_products.select! do |pl|
             next false unless Dir.exist?(pl[:app_root])
             Log.log.debug("found #{pl[:app_root]}")
             sub_bin = pl[:sub_bin] || BIN_SUBFOLDER
-            exec_ext = OpenApplication.current_os_type.eql?(:windows) ? '.exe' : ''
-            pl[:ascp_path]=File.join(pl[:app_root],sub_bin,'ascp')+exec_ext
+            pl[:ascp_path]=File.join(pl[:app_root],sub_bin,'ascp'+Environment.exe_extension)
             next false unless File.exist?(pl[:ascp_path])
             product_info_file="#{pl[:app_root]}/#{PRODUCT_INFO}"
             if File.exist?(product_info_file)
@@ -59,7 +69,7 @@ module Aspera
         return @found_products
       end
 
-      FILES=[:ascp,:ascp4,:ssh_bypass_key_dsa,:ssh_bypass_key_rsa,:fallback_cert,:fallback_key]
+      FILES=[:ascp,:ascp4,:ssh_bypass_key_dsa,:ssh_bypass_key_rsa,:aspera_license,:aspera_conf,:fallback_cert,:fallback_key]
 
       # get path of one resource file of currently activated product
       # keys and certs are generated locally... (they are well known values, arch. independant)
@@ -71,19 +81,42 @@ module Aspera
           # note that there might be a .exe at the end
           file=file.gsub('ascp','ascp4') if k.eql?(:ascp4)
         when :ssh_bypass_key_dsa
-          file=File.join(@config_folder,'aspera_bypass_dsa.pem')
-          File.write(file,Zlib::Inflate.inflate(Base64.decode64(SSH_BYPASS_DSA))) unless File.exist?(file)
+          file=File.join(@folder,'aspera_bypass_dsa.pem')
+          File.write(file,get_key('dsa',1)) unless File.exist?(file)
           File.chmod(0400,file)
         when :ssh_bypass_key_rsa
-          file=File.join(@config_folder,'aspera_bypass_rsa.pem')
-          File.write(file,Zlib::Inflate.inflate(Base64.decode64(SSH_BYPASS_RSA))) unless File.exist?(file)
+          file=File.join(@folder,'aspera_bypass_rsa.pem')
+          File.write(file,get_key('rsa',2)) unless File.exist?(file)
+          File.chmod(0400,file)
+        when :aspera_license
+          file=File.join(@folder,'aspera-license')
+          File.write(file,Base64.strict_encode64("#{Zlib::Inflate.inflate(DataRepository.instance.get_bin(6))}==SIGNATURE==\n#{Base64.strict_encode64(DataRepository.instance.get_bin(7))}")) unless File.exist?(file)
+          File.chmod(0400,file)
+        when :aspera_conf
+          file=File.join(@folder,'aspera.conf')
+          File.write(file,%Q{<?xml version='1.0' encoding='UTF-8'?>
+<CONF version="2">
+<default>
+    <file_system>
+        <storage_rc>
+            <adaptive>
+                true
+            </adaptive>
+        </storage_rc>
+        <resume_suffix>.aspera-ckpt</resume_suffix>
+        <partial_file_suffix>.partial</partial_file_suffix>
+        <replace_illegal_chars>_</replace_illegal_chars>
+    </file_system>
+</default>
+</CONF>
+}) unless File.exist?(file)
           File.chmod(0400,file)
         when :fallback_cert,:fallback_key
-          file_key=File.join(@config_folder,'aspera_fallback_key.pem')
-          file_cert=File.join(@config_folder,'aspera_fallback_cert.pem')
+          file_key=File.join(@folder,'aspera_fallback_key.pem')
+          file_cert=File.join(@folder,'aspera_fallback_cert.pem')
           if !File.exist?(file_key) or !File.exist?(file_cert)
             require 'openssl'
-            # create new self signed certificate forhttp fallback
+            # create new self signed certificate for http fallback
             private_key = OpenSSL::PKey::RSA.new(1024)
             cert = OpenSSL::X509::Certificate.new
             cert.subject = cert.issuer = OpenSSL::X509::Name.parse("/C=US/ST=California/L=Emeryville/O=Aspera Inc./OU=Corporate/CN=Aspera Inc./emailAddress=info@asperasoft.com")
@@ -108,7 +141,7 @@ module Aspera
 
       # @returns the file path of local connect where API's URI can be read
       def connect_uri
-        connect=get_product_folders('Aspera Connect')
+        connect=get_product_folders(PRODUCT_CONNECT)
         folder=File.join(connect[:run_root],VARRUN_SUBFOLDER)
         ['','s'].each do |ext|
           uri_file=File.join(folder,"http#{ext}.uri")
@@ -122,30 +155,51 @@ module Aspera
 
       # @ return path to configuration file of aspera CLI
       def cli_conf_file
-        connect=get_product_folders('Aspera CLI')
+        connect=get_product_folders(PRODUCT_CLI_V1)
         return File.join(connect[:app_root],BIN_SUBFOLDER,'.aspera_cli_conf')
       end
 
-      # add Aspera private keys for web access, token based authorization
-      def bypass_keys
-        return [ "%08x-%04x-%04x-%04x-%04x%08x" % "t1(\xBF;\xF3E\xB5\xAB\x14F\x02\xC6\x7F)P".unpack("NnnnnN"),
-          Installation.instance.path(:ssh_bypass_key_dsa),
-          Installation.instance.path(:ssh_bypass_key_rsa) ]
+      # default bypass key phrase
+      def bypass_pass
+        return "%08x-%04x-%04x-%04x-%04x%08x" % DataRepository.instance.get_bin(3).unpack("NnnnnN")
       end
 
-      # DEPRECATED ZONE
-
-      def activated;Log.log.warn("deprecated, use ascp_path accessor");nil;end
-
-      def activated=(product_name);Log.log.warn("deprecated, use method use_ascp_from_product");use_ascp_from_product(product_name);end
-
-      def paths;Log.log.warn("deprecated, no replacement");raise "deprecated";end
+      def bypass_keys
+        return [:ssh_bypass_key_dsa,:ssh_bypass_key_rsa].map{|i|Installation.instance.path(i)}
+      end
 
-      def paths=(res_paths)
-        raise "must be a hash" unless res_paths.is_a?(Hash)
-        raise "must have :ascp key" unless res_paths.has_key?(:ascp)
-        Log.log.warn("deprecated, use method: ascp_path=")
-        @ascp_path=res_paths[:ascp]
+      def install_sdk
+        require 'zip'
+        sdk_zip_path=File.join(Dir.tmpdir,'sdk.zip')
+        Aspera::Rest.new(base_url: SDK_URL).call(operation: 'GET',save_to_file: sdk_zip_path)
+        filter="/#{Environment.architecture}/"
+        ascp_path=nil
+        # first ensure license file is here so that ascp invokation for version works
+        self.path(:aspera_license)
+        self.path(:aspera_conf)
+        Zip::File.open(sdk_zip_path) do |zip_file|
+          zip_file.each do |entry|
+            if entry.name.include?(filter) and !entry.name.end_with?('/')
+              archive_file=File.join(@folder,File.basename(entry.name))
+              File.open(archive_file, 'wb') do |output_stream|
+                IO.copy_stream(entry.get_input_stream, output_stream)
+              end
+              if entry.name.include?('ascp')
+                FileUtils.chmod(0755,archive_file)
+                ascp_path=archive_file
+              end
+            end
+          end
+        end
+        File.unlink(sdk_zip_path) rescue nil # Windows may give error
+        ascp_version='n/a'
+        if !ascp_path.nil?
+          # get version from ascp, only after full extract, as windows requires SSL/TLS DLLs
+          m=%x{#{ascp_path} -A}.match(/ascp version (.*)/)
+          ascp_version=m[1] unless m.nil?
+          File.write(File.join(@folder,PRODUCT_INFO),"<product><name>IBM Aspera SDK</name><version>#{ascp_version}</version></product>")
+        end
+        return ascp_version
       end
 
       private
@@ -157,8 +211,9 @@ module Aspera
       PRODUCT_INFO='product-info.mf'
       # policy for product selection
       FIRST_FOUND='FIRST'
+      SDK_URL='https://eudemo.asperademo.com/aspera/faspex/sdk.zip'
 
-      private_constant :BIN_SUBFOLDER,:ETC_SUBFOLDER,:VARRUN_SUBFOLDER,:PRODUCT_INFO
+      private_constant :BIN_SUBFOLDER,:ETC_SUBFOLDER,:VARRUN_SUBFOLDER,:PRODUCT_INFO,:SDK_URL
 
       # get some specific folder from specific applications: Connect or CLI
       def get_product_folders(name)
@@ -169,72 +224,73 @@ module Aspera
 
       def initialize
         @ascp_path=nil
-        @config_folder='.'
+        @folder='.'
         @found_products=nil
       end
 
       # returns product folders depending on OS
       # fields
       # :expected  M app name is taken from the manifest if present, else defaults to this value
-      # :app_root  M main forlder for the application
+      # :app_root  M main folder for the application
       # :log_root  O location of log files (Linux uses syslog)
       # :run_root  O only for Connect Client, location of http port file
       # :sub_bin   O subfolder with executables, default : bin
       def product_locations
-        case OpenApplication.current_os_type
-        when :windows; return [{
-            :expected =>'Aspera Connect',
+        case Aspera::Environment.os
+        when Aspera::Environment::OS_WINDOWS; return [{
+            :expected =>PRODUCT_CONNECT,
             :app_root =>File.join(ENV['LOCALAPPDATA'],'Programs','Aspera','Aspera Connect'),
             :log_root =>File.join(ENV['LOCALAPPDATA'],'Aspera','Aspera Connect','var','log'),
             :run_root =>File.join(ENV['LOCALAPPDATA'],'Aspera','Aspera Connect')
             },{
-            :expected =>'Aspera CLI',
+            :expected =>PRODUCT_CLI_V1,
             :app_root =>File.join('C:','Program Files','Aspera','cli'),
             :log_root =>File.join('C:','Program Files','Aspera','cli','var','log'),
             },{
-            :expected =>'Enterprise Server',
+            :expected =>PRODUCT_ENTSRV,
             :app_root =>File.join('C:','Program Files','Aspera','Enterprise Server'),
             :log_root =>File.join('C:','Program Files','Aspera','Enterprise Server','var','log'),
             }]
-        when :mac; return [{
-            :expected =>'Aspera Connect',
+        when Aspera::Environment::OS_X; return [{
+            :expected =>PRODUCT_CONNECT,
             :app_root =>File.join(Dir.home,'Applications','Aspera Connect.app'),
             :log_root =>File.join(Dir.home,'Library','Logs','Aspera_Connect'),
             :run_root =>File.join(Dir.home,'Library','Application Support','Aspera','Aspera Connect'),
             :sub_bin  =>File.join('Contents','Resources'),
             },{
-            :expected =>'Aspera CLI',
+            :expected =>PRODUCT_CLI_V1,
             :app_root =>File.join(Dir.home,'Applications','Aspera CLI'),
             :log_root =>File.join(Dir.home,'Library','Logs','Aspera')
             },{
-            :expected =>'Enterprise Server',
+            :expected =>PRODUCT_ENTSRV,
             :app_root =>File.join('','Library','Aspera'),
             :log_root =>File.join(Dir.home,'Library','Logs','Aspera'),
             },{
-            :expected =>'Aspera Drive',
+            :expected =>PRODUCT_DRIVE,
             :app_root =>File.join('','Applications','Aspera Drive.app'),
             :log_root =>File.join(Dir.home,'Library','Logs','Aspera_Drive'),
             :sub_bin  =>File.join('Contents','Resources'),
             }]
         else; return [{  # other: Linux and unix family
-            :expected =>'Aspera Connect',
+            :expected =>PRODUCT_CONNECT,
             :app_root =>File.join(Dir.home,'.aspera','connect'),
             :run_root =>File.join(Dir.home,'.aspera','connect')
             },{
-            :expected =>'Aspera CLI',
+            :expected =>PRODUCT_CLI_V1,
             :app_root =>File.join(Dir.home,'.aspera','cli'),
             },{
-            :expected =>'Enterprise Server',
+            :expected =>PRODUCT_ENTSRV,
             :app_root =>File.join('','opt','aspera'),
             }]
         end
       end
 
-      # not pass protected
-      SSH_BYPASS_DSA='eJxtksuSojAAAO98xdypKYFggGOA8HQ0ICBywwiooARRIH79zu55+9qnrurv719M7PrbL3uPvkjsZyjBXyE+/hXfwo/vm+/ZNxEKzSay2zDybHhXub80t7HikDy4Ckta5DgeA4+vVbYyh9znxzbboRYzIWymBAxJsr3z9nCY1X7aEVm0rzJdKQ470q6jCbu0B7rXO6TdJFm5p7iieTnlN0JcSbiC13p6mfqy4QC0EaiMyVht5ou00Lh+l9J5ndbO3DPTR/kUoCcw4bNkoy5GvymbeRR4NYwLwH1nlVaWB7UIZVoFjKHeRaQnL0xU/vFcJX/Rxarz8qS+jQ+GM/moFQlekpAmD1Cn0yO6B4l2lcLMip+gUTxlV/wcHFnh0i0d9Mh8F8rYA8urKu0gZ3d0Pm01Z6GiQHlmPDD8pPGASsJfygmLz+ZHZgRuovS4NDZYwvMkF67Y2r6Na5iC/nGj4emOIG0XIYFuOfXIao4Y9aeS2dOaKXXvidRdh5I2+o5tPKXY1t5h8OiG2xHlH4fqqQbnPGzeUDjkb6aUVLJ6MX4UTPPG0nBFLF4DyHrfYLtY0vPkTDqucjvdbPeJSuaufp72TmI42UX4tIea7SaUUr1uI3QphmlFMMwuTqTPEih0lw35op3AdjJjEdf+AqAe9paDed1JkyckpdbAuzv7P/nznESRXhej8O8xvLX//94fHTzUbwo='
-      # pass protected (but not fips compliant)
-      SSH_BYPASS_RSA='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'
-      private_constant :SSH_BYPASS_DSA,:SSH_BYPASS_RSA
+      def get_key(type,id)
+        hf=['begin','end'].map{|t|"-----#{t} #{type} private key-----".upcase}
+        bin=Base64.strict_encode64(DataRepository.instance.get_bin(id))
+        hf.insert(1,bin).join("\n")
+      end
+
     end # Installation
   end
 end