blobs 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 667df47d57c698adeaaed050c61675329bc2549c
-  data.tar.gz: 1c5c0a0a0f04e171146cc0d25d29e83015b53950
+  metadata.gz: d12169aaa7aaf23ec941b9014ac639457b33e307
+  data.tar.gz: 4608a496c30c7d94771828030ecc066279fb1b8d
 SHA512:
-  metadata.gz: 0a74900d5c8d0cbb5391a4419ef8c35bf39622094a9e86bf9daf7a217766f44720e401d294ea9b1d15554db2eb59b8083cc621f83eba4efa5b5bb4741bd42a43
-  data.tar.gz: aa8fc74cb68ad86104a014084f0d86bd39b2ba68ac5950cff0874522dce3991ddf3f633cea66cd8098c1ee5f9600984e130edfb10302612b8841617a6c72722c
+  metadata.gz: c2afbdac3858b631be282f5cef4372e7c00c06e1782fbc4cf00eb699552db4b44e5e11a4fceeeb2e22ed21bb50e076df55e71c0eb8ceb31d5019c594d007d6cd
+  data.tar.gz: 0cb9a8525e0b5217c90dd1c0bebc9f8cd65b1b670ffe2e0c6af13315857eb37956a320324d403c784d29175f9aad535ad9a496cea032d0ebd68db36d68268a31

data/lib/blobs/version.rb

@@ -1,3 +1,3 @@
 module Blobs
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/lib/blobs.rb

@@ -5,6 +5,7 @@ require 'base64'
 require 'securerandom'
 require 'cgi'
 require 'yaml'
+require 'securerandom'
 
 # ENV['BLOB_STORE_API_BASE_URL'] = 'http://45.76.84.129'
 # ENV['MASTER_KEY'] = '6CU3xfUOtvvVBRPPOe5ShlCOAZ0Ht5k9'
@@ -36,6 +37,8 @@ module Blobs
         log "#{response.parsed_response.inspect}"
         self.current_user = response.parsed_response['user']
         self.token = response.parsed_response['token']
+        encryption_key
+        self.token
       else
         nil
       end
@@ -97,8 +100,10 @@ module Blobs
       Base64.decode64(self.current_user['userToken'])
     end
 
-    def export_key_file(key_file = "#{ENV['HOME']}/.blobs.key")
-      decrypt_file("#{key_file}.enc", key_file)
+    def export_key_file(key_file = "#{ENV['HOME']}/.blobs.key.enc")
+      export_file = "#{ENV['HOME']}/blobs.key-#{Time.now.to_i}"
+      decrypt_file(key_file, export_file)
+      export_file
     end
 
     private
@@ -125,15 +130,16 @@ module Blobs
     def encryption_key
       return @encryption_key if @encryption_key
 
-      key_file = "#{ENV['HOME']}/.blobs.key"
-      if File.file?("#{key_file}.enc")
-        if decrypt_file("#{key_file}.enc", key_file)
-          key_file_contents = File.read(key_file)
+      key_file = "#{ENV['HOME']}/.blobs.key.enc"
+      decrypted_key_file = "#{key_file.gsub('.enc', '')}-#{SecureRandom.hex(4)}#{Time.now.to_i}"
+      if File.file?(key_file)
+        if decrypt_file(key_file, decrypted_key_file)
+          key_file_contents = File.read(decrypted_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)
+            File.delete(decrypted_key_file)
             return @encryption_key
           else
             raise "Key file is corrupt!"
@@ -146,12 +152,12 @@ module Blobs
         @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|
+        File.open(decrypted_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)
+        File.delete(decrypted_key_file) if encrypt_file(decrypted_key_file, key_file)
       end
       @encryption_key
     end
@@ -160,7 +166,7 @@ module Blobs
       @iv
     end
 
-    def encrypt_file(file_path)
+    def encrypt_file(file_path, enc_file_path)
       raise 'No user token!' unless self.user_token
 
       cipher = OpenSSL::Cipher::AES256.new :CBC
@@ -168,7 +174,7 @@ module Blobs
       cipher.key = self.user_token
 
       buf = ""
-      File.open("#{file_path}.enc", 'wb') do |outf|
+      File.open(enc_file_path, 'wb') do |outf|
         File.open(file_path, 'rb') do |inf|
           while inf.read(4096, buf)
             outf << cipher.update(buf)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blobs
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Oliver Kiessler
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-24 00:00:00.000000000 Z
+date: 2017-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler