dtk-client 0.12.2 → 0.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42bebff35a619d489e4ad704b1782e3d6cf17c9ffa3750f4461ab0da5125efa3
-  data.tar.gz: 8dd31d44f79e12576c85f32535c6f62b008a78f92e58a8e79bad3795e4535143
+  metadata.gz: ce708c08b83b191a7a19bfe1616eb930a9245b6ddfce6fbebe97ab536feff9eb
+  data.tar.gz: 423bea8f930d5cf107cbcf794b9678d7aaa3440163091f4b59cd896bc29bea5c
 SHA512:
-  metadata.gz: a0ea576d32dfeeb527c87dc7b863bcc8f44a6d56998994349943643dd05b570a3a62dac340b9168f77b7ab1d8912e6fc76f23a38092e6f6f4a1d85a50cf1058f
-  data.tar.gz: 730004649953bdf45399fd1b7a14a5f47208904fe8ea920ce4ee1fc9ee21efe1dc0069ccbb2ec2da6c98f629698cf7db10a3010af52ba4eb19a0c9b44bb29d0f
+  metadata.gz: 63beb7bd18dfcbe9e94ef455a3ef71dea3cf86efb19a12a978bca07100706abcfa3af825cb6beaa343fcf77dd031eddc148fe849e1548c07375f8efe8d376a38
+  data.tar.gz: 5493f43e020d443251eb00843c3f90fdfdeb2d9717ea3f4879e69a7e51bb954bc5f7d0bf79ba2631502953144680779cefb0a16842866fd0332fc21e0f344bdd

data/dtk-client.gemspec

@@ -25,5 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'hirb', '0.7.3'
   spec.add_dependency 'mime-types', '~> 2.99.3'
   spec.add_dependency 'dtk-dsl', '~> 1.1.4'
-  spec.add_dependency 'dtk-network-client', '1.0.4'
+  spec.add_dependency 'dtk-network-client', '1.0.5'
 end

data/lib/cli/command/module/install.rb

@@ -151,7 +151,16 @@ module DTK::Client
               repo_dir:  file_obj.parent_dir
             }
             parsed_module   = file_obj.parse_content(:common_module_summary)
-            dependency_tree = Operation::DtkNetworkDependencyTree.get_or_create(module_info, { format: :hash, parsed_module: parsed_module, save_to_file: true, update_lock_file: @update_lock_file })
+
+            # response = Operation::Module.rest_get "modules/get_modules_versions_with_dependencies"
+            # server_dependencies = response.data || []
+
+            dependency_tree = Operation::DtkNetworkDependencyTree.get_or_create(module_info, {
+              format: :hash,
+              parsed_module: parsed_module,
+              save_to_file: true,
+              update_lock_file: @update_lock_file
+            })
 
             dependency_tree.each do |dependency|
               dep_module_ref = module_ref_object_from_options_or_context(module_ref: "#{dependency[:namespace]}/#{dependency[:name]}", version: dependency[:version])

data/lib/cli/command/service/set_attribute.rb

@@ -23,6 +23,7 @@ module DTK::Client; module CLI
         c.arg Token::Arg.attribute_value, :optional => true
         command_body c, 'set-attribute',  'Set attribute value(s).' do |sc|
           sc.switch Token.u
+          sc.switch Token.encrypt
           sc.flag Token.directory_path
           sc.flag Token.param_file
           sc.action do |_global_options, options, args|
@@ -53,7 +54,7 @@ module DTK::Client; module CLI
                     args[1] || raise(Error::Usage, "Either argument VALUE or -f option must be given to specify a value")
                   end
                 end
-              helper.set_single_attribute(attribute_name, attribute_value)
+              helper.set_single_attribute(attribute_name, attribute_value, encrypt: options[:encrypt])
             end
           end
         end
@@ -65,10 +66,13 @@ module DTK::Client; module CLI
           @service_instance_dir = service_instance_dir
         end
 
-        def set_single_attribute(attribute_name, attribute_value)
+        # opts can haev keys
+        #  :encrypt
+        def set_single_attribute(attribute_name, attribute_value, opts = {})
           Operation::Service.set_attribute(
             :attribute_name   => attribute_name,
             :attribute_value  => attribute_value,
+            :encrypt          => opts[:encrypt],
             :service_instance => self.service_instance,
             :service_instance_dir => self.service_instance_dir
           )

data/lib/cli/command/token.rb

@@ -73,6 +73,7 @@ module DTK::Client
         :unlink       => Switch.new([:u, :unlink], 'unlink'),
         :dependencies => Switch.new(:deps, 'Dependencies'),
         :u            => Switch.new([:u, :unset], 'Unset attribute'),
+        :encrypt      => Switch.new(:encrypt, 'Encrypt attribute value'),
         :recursive    => Switch.new(:r, 'Recursive'),
         :update_deps  => Switch.new('update-deps', "Skip prompt and update all dependencies or skip prompt and don't update all dependencies  (on master)", :negatable => true, :default_value => 'prompt'),
         :skip_server  => Switch.new('skip-server', 'Do not install module on server'),

data/lib/cli/version.rb

@@ -18,7 +18,7 @@
 module DTK
   module Client
     module CLI
-      VERSION="0.12.2"
+      VERSION="0.12.3"
     end
   end
 end

data/lib/client/operation/module/install_from_catalog.rb

@@ -52,6 +52,10 @@ module DTK::Client
           explicit_path: @directory_path,
           repo_dir:      @directory_path || @target_repo_dir
         }
+
+        # response = rest_get "modules/get_modules_versions_with_dependencies"
+        # server_dependencies = response.data || []
+
         installed_modules = DtkNetworkClient::Install.run(module_info, type: @type, download_if_fail: @download_if_fail )
 
         { :installed_modules => installed_modules }

data/lib/client/operation/module/push.rb

@@ -53,6 +53,9 @@ module DTK::Client
             repo_dir:  @file_obj.parent_dir
           }
 
+          # response = Operation::Module.rest_get "modules/get_modules_versions_with_dependencies"
+          # server_dependencies = response.data || []
+
           repoman_client_opts = {
             format: :hash,
             save_to_file: true,

data/lib/client/operation/service/set_attribute.rb

@@ -23,7 +23,16 @@ module DTK::Client
           service_instance = args.required(:service_instance)
           attribute_name   = args[:attribute_name]
           attribute_value  = args[:attribute_value]
-      
+          encrypt = args[:encrypt]
+          if encrypt
+            hash = {
+              :name => "encryption_public_key"
+            }
+            response = rest_get "#{BaseRoute}/#{service_instance}/get_attribute", QueryStringHash.new(hash)
+            raise Error::Usage, "There is no encryption_public_key attribute in this component, or its' value is not set." if response.data.empty?
+            public_key = response.data
+            attribute_value = DTK::Client::SecurityUtil.encrypt(public_key, attribute_value) 
+          end
           query_string_hash = QueryStringHash.new(
             :pattern?  => attribute_name,
             :value?    => attribute_value

data/lib/client/util.rb

@@ -19,6 +19,7 @@ module DTK
   require_relative('util/auxiliary')
   # auxiliary must be loaded first
   require_relative('util/os_util')
+  require_relative('util/security_util')
   require_relative('util/ssh_util')
   require_relative('util/console')
   require_relative('util/dtk_path')

data/lib/client/util/security_util.rb

@@ -0,0 +1,31 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+module DTK::Client
+  class SecurityUtil
+    require 'openssl'
+    require 'base64'
+    def self.encrypt(public_key_string, attribute_value)
+      key = OpenSSL::PKey::RSA.new(::Base64.decode64(public_key_string))
+      encrypted = key.public_encrypt(attribute_value)
+      encoded = ::Base64.encode64(encrypted) 
+    end
+    
+  end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-client
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.12.3
 platform: ruby
 authors:
 - Reactor8
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-08 00:00:00.000000000 Z
+date: 2019-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dtk-common-core
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: 1.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: 1.0.5
 description: Command line tool to interact with a DTK Server and DTK Service Catalog.
 email: support@reactor8.com
 executables:
@@ -401,6 +401,7 @@ files:
 - lib/client/util/post_body.rb
 - lib/client/util/query_string_hash.rb
 - lib/client/util/remote_dependency.rb
+- lib/client/util/security_util.rb
 - lib/client/util/ssh_util.rb
 - lib/client/util/validation.rb
 - lib/dtk_cli.rb