navi_client 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8ad1b2f71e2ce6666a1b6798c7ea5bc6b1034e18
-  data.tar.gz: cfc612247a9b42e83e4de845473d4898f03fb904
+SHA256:
+  metadata.gz: 3116d34f98600e972aa8a6ab86ef58356b0648ff0fe4a9b88e38f055f46056e0
+  data.tar.gz: 98932290774c44e338428536cf5e339e114e0d8422ff90ef7335bdf7ba0a359f
 SHA512:
-  metadata.gz: b42b354676ff099692d86746858892457fc64aa902d6690edcf64673f3d76d9b3f2a9da18b15dbab5a27978db55d18127f86d54208cc6644ddac25200eba7e01
-  data.tar.gz: eb90a4f3c202333059fa7062a9b18ad6f24cf71498d9410970a983e9b91540ff22658cf7e7d3994715e72a0f230f0d156a80e24ab0742780a1ac88d6fd570c4f
+  metadata.gz: bb9bd09aa8e872670e369b89644469608587e735b1fac13318592e6915450149c5865d9c8ca51f69af753d33840257d62c826294303b439ede29199ac6071b62
+  data.tar.gz: d0a2478694fda87c9e4db31e7cda0f27c8b3995dd101caee333bf58e0a20deb18e66b2e5e85b94c7135944b966279ca48ff6073385d54f13539c3952ec3e461d

data/lib/client.rb

@@ -10,6 +10,7 @@ require "logger"
 
 require "httparty"
 require "http_service/naviai"
+require 'openssl'
 
 module Client
   def logger
@@ -115,7 +116,31 @@ module Client
   end
 
   def encrypt(data)
-    Base64.encode64(data)
+    cipher = OpenSSL::Cipher::AES.new(256, :CFB)
+    cipher.encrypt
+
+    yml_config = config
+
+    key_iv_exists = (yml_config['key'] && yml_config['iv']) ? (!yml_config['key'].empty? && !yml_config['iv'].empty? ) : false
+
+    if key_iv_exists
+      # this condition must be true for cloud version
+      cipher.key = Base64.decode64(File.read(yml_config['key']))
+      cipher.iv = Base64.decode64(File.read(yml_config['iv']))
+    else
+      cipher.key = key = cipher.random_key
+      cipher.iv = iv = cipher.random_iv
+
+      key_path, iv_path = save_aes_key_iv(key, iv)
+
+      yml_config['key'] = key_path
+      yml_config['iv'] = iv_path
+
+      update_config(yml_config)
+    end
+
+    encrypted = cipher.update(data)
+    Base64.encode64(encrypted)
   end
 
   def time_now

data/lib/cloud/navi_cloud_client.rb

@@ -22,6 +22,9 @@ module NaviClient
 
       # client_type
       @client_type = "cloud"
+
+      # set email_address of current_user for s3 folder name
+      @current_user_email = nil
     end
 
     def override_logger(logger)
@@ -37,9 +40,13 @@ module NaviClient
       @token = session_token
     end
 
+    def set_current_user_email(email)
+      @current_user_email = email
+    end
+
     def send_request(in_filenames = [])
       unless in_filenames.blank?
-        download_path = config['s3_download_folder']
+        download_path = config['s3_download_folder'] + "/" + @current_user_email
         filepath = download_path + "/inputs/" + (Time.now.to_f * 1000).to_s
         filename = upload_to_s3(filepath, in_filenames.join("\n"))
 
@@ -48,7 +55,7 @@ module NaviClient
     end
 
     def download(message, custom_uid)
-      download_path = config[:s3_download_folder]
+      download_path = config[:s3_download_folder] + "/" + @current_user_email
       if ['text/plain', 'text/html'].include? message.mime_type
 
         h = Hash.new
@@ -63,7 +70,7 @@ module NaviClient
     end
 
     def save(data={}, filename)
-      download_path = config[:s3_download_folder]
+      download_path = config[:s3_download_folder] + "/" + @current_user_email
       filepath = download_path + "/" + filename + ".yml"
 
       return upload_to_s3(filepath, data.to_yaml)

data/lib/local/navi_local_client.rb

@@ -3,6 +3,8 @@ require_relative '../client'
 module NaviClient
   class Local
     include Client
+    CONFIG_PATH = File.join(ENV['HOME'], '/.navi/config.yml')
+
     def initialize(sso_web_url = 'http://localhost:3008')
       # flag to print Ruby library debug info (very detailed)
       @net_imap_debug = false
@@ -147,7 +149,20 @@ module NaviClient
     end
 
     def config
-      YAML.load_file(ENV['HOME'] + '/.navi/config.yml')
+      YAML.load_file(CONFIG_PATH)
+    end
+
+    def save_aes_key_iv(key, iv)
+      aes_key_path = File.join(ENV['HOME'] + '/.navi/.aes.key')
+      iv_path = File.join(ENV['HOME'] + '/.navi/.aes.iv')
+
+      File.open(aes_key_path, "w") { |f| f.write(Base64.encode64(key)) }
+      File.open(iv_path, "w") { |f| f.write(Base64.encode64(iv)) }
+      return aes_key_path, iv_path
+    end
+
+    def update_config(data)
+      File.write(CONFIG_PATH, YAML.dump(data))
     end
   end
 end

data/lib/navi_client/version.rb

@@ -1,3 +1,3 @@
 module NaviClient
-  VERSION = "1.2.3"
+  VERSION = "1.2.4"
 end

data/navi_client.gemspec

@@ -6,8 +6,8 @@ require 'navi_client/version'
 Gem::Specification.new do |spec|
   spec.name          = "navi_client"
   spec.version       = NaviClient::VERSION
-  spec.authors       = ["Surya"]
-  spec.email         = ["surya@whitehatengineering.com"]
+  spec.authors       = ["Surya", "Saroj"]
+  spec.email         = ["surya@whitehatengineering.com", "saroj@whitehatengineering.com"]
 
   spec.summary       = %q{ Write a short summary, because Rubygems requires one.}
   spec.description   = %q{ Write a longer description or delete this line.}

metadata

@@ -1,80 +1,81 @@
 --- !ruby/object:Gem::Specification
 name: navi_client
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Surya
-autorequire: 
+- Saroj
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-01-03 00:00:00.000000000 Z
+date: 2018-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.11'
-  type: :development
+  name: bundler
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.11'
 - !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-  type: :development
+  name: rake
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-  type: :development
+  name: rspec
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  name: httparty
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mail
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  name: mail
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -83,6 +84,7 @@ dependencies:
 description: " Write a longer description or delete this line."
 email:
 - surya@whitehatengineering.com
+- saroj@whitehatengineering.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -109,7 +111,7 @@ homepage: http://navihq.com
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -124,9 +126,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.6.11
+signing_key:
 specification_version: 4
 summary: Write a short summary, because Rubygems requires one.
 test_files: []