blobs 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95fb83597fc2fa8e6aa7697afe9e4382567bf4b0
-  data.tar.gz: 87e9c4fee33667503ed9bbfc1377869264c6d940
+  metadata.gz: 9239dbb94d2fbc57e472c5305f5e8cdd3516c647
+  data.tar.gz: 7b8d34bc71691d89e2dac419261d4c07a34878d7
 SHA512:
-  metadata.gz: f6756952be28d39aa7b728a6b603ee8407c6d0a99b81714c0c24bcb27420c538ca76062ebd68acc1965665c3a7443f2e18dec2a473abea9d05c5470c0a306483
-  data.tar.gz: 9a71066718c58035869de344b593f2655f9d48a3f7502a3be3245ef68ab53f7d9daf50218d78cef103150ea281c0deaa9b352e58a1267b61e4fb94bc46e11f2f
+  metadata.gz: 9548525b231d3442372092c0dae225c61a63c1cfe25e44584c2b296813fee54af0c43d05e6ed5f2bb4c6cacc2fe2ee37d5b73c194ba29594b550d9cc07331234
+  data.tar.gz: 1eb56940949b69a4458c2aa43bc69b81c9736b16be994472d44516513aecd00a5665013ff789fc59e9cfcb9b9c3e8abf4268767652e9075f48bdfd487bcb674e

data/blobs.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.14"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "httparty", "~> 0.13.7"
+  spec.add_dependency "bundler", "~> 1.14"
+  spec.add_dependency "rake", "~> 10.0"
+  spec.add_dependency "httparty", "~> 0.13.7"
 end

data/lib/blobs.rb

@@ -4,6 +4,10 @@ require 'openssl'
 require 'base64'
 require 'securerandom'
 require 'cgi'
+require 'yaml'
+
+# ENV['BLOB_STORE_API_BASE_URL'] = 'http://localhost'
+# ENV['MASTER_ACCESS_TOKEN'] = '6CU3xfUOtvvVBRPPOe5ShlCOAZ0Ht5k9'
 
 module Blobs
   DEBUG = false
@@ -89,6 +93,14 @@ module Blobs
       response.parsed_response
     end
 
+    def user_token
+      Base64.decode64(self.current_user['userToken'])
+    end
+
+    def export_key_file(key_file = "#{ENV['HOME']}/.blobs.key")
+      decrypt_file("#{key_file}.enc", key_file)
+    end
+
     private
     def sha256(str)
       Base64.encode64(Digest::SHA256.digest(str)).strip
@@ -110,41 +122,36 @@ module Blobs
       decipher.update(Base64.decode64(enc_str).strip) + decipher.final
     end
 
-    def user_token
-      Base64.decode64(self.current_user['userToken'])
-    end
-
     def encryption_key
       return @encryption_key if @encryption_key
 
-      cipher = OpenSSL::Cipher::AES256.new :CBC
       key_file = "#{ENV['HOME']}/.blobs.key"
-      if File.file?(key_file)
-        enc_str = File.read(key_file)
-        cipher.decrypt
-        cipher.key = user_token
-        if (json_str = cipher.update(Base64.strict_decode64(enc_str).strip) + cipher.final)
-          json = JSON.parse(json_str)
-          if json['key'] and json['iv']
-            @iv = Base64.decode64(json['iv']).strip
-            @encryption_key = Base64.decode64(json['key']).strip
+      if File.file?("#{key_file}.enc")
+        if decrypt_file("#{key_file}.enc", key_file)
+          key_file_contents = File.read(key_file)
+          key_file_yml = YAML.load(Base64.strict_decode64(key_file_contents))
+          if key_file_yml[:key] and key_file_yml[:iv]
+            @iv = key_file_yml[:iv]
+            @encryption_key = key_file_yml[:key]
+            File.delete(key_file)
             return @encryption_key
           else
             raise "Key file is corrupt!"
           end
         else
-          raise "Can't read key file!"
+          raise "Key file couldn't be decrypted!"
         end
       else
-        @encryption_key = Digest::SHA256.digest(rand(32**32).to_s(32))
-        @iv = cipher.random_iv
-        key_file_json = { key: Base64.encode64(@encryption_key).strip, iv: Base64.encode64(@iv).strip }
-        File.open(key_file,"w") do |f|
-          cipher.encrypt
-          cipher.key = user_token
-          enc_json = Base64.strict_encode64(cipher.update(key_file_json.to_json) + cipher.final).strip
-          f.write(enc_json)
+        cipher = OpenSSL::Cipher::AES256.new :CBC
+        @encryption_key = Digest::SHA256.hexdigest(cipher.random_key)[0..31]
+        @iv = Digest::SHA256.hexdigest(cipher.random_iv)[0..15]
+        key_file_yml = { key: @encryption_key, iv: @iv }
+        File.open(key_file, 'wb') do |f|
+          enc = Base64.strict_encode64(key_file_yml.to_yaml)
+          f.write(enc)
+          f.close
         end
+        File.delete(key_file) if encrypt_file(key_file)
       end
       @encryption_key
     end
@@ -152,5 +159,43 @@ module Blobs
     def get_iv
       @iv
     end
+
+    def encrypt_file(file_path)
+      raise 'No user token!' unless self.user_token
+
+      cipher = OpenSSL::Cipher::AES256.new :CBC
+      cipher.encrypt
+      cipher.key = self.user_token
+
+      buf = ""
+      File.open("#{file_path}.enc", 'wb') do |outf|
+        File.open(file_path, 'rb') do |inf|
+          while inf.read(4096, buf)
+            outf << cipher.update(buf)
+          end
+          outf << cipher.final
+        end
+      end
+      true
+    end
+
+    def decrypt_file(file_path, dec_file_path)
+      raise 'No user token!' unless self.user_token
+
+      cipher = OpenSSL::Cipher::AES256.new :CBC
+      cipher.decrypt
+      cipher.key = self.user_token
+
+      buf = ""
+      File.open(dec_file_path, 'wb') do |outf|
+        File.open(file_path, 'rb') do |inf|
+          while inf.read(4096, buf)
+            outf << cipher.update(buf)
+          end
+          outf << cipher.final
+        end
+      end
+      true
+    end
   end
 end

data/lib/blobs/version.rb

@@ -1,3 +1,3 @@
 module Blobs
-  VERSION = "0.2.1"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blobs
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Oliver Kiessler
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-22 00:00:00.000000000 Z
+date: 2017-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -17,7 +17,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.14'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -31,7 +31,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -45,7 +45,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.13.7
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements: