blobs 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e351ed49242cbc67c67592565f1b9fe8d032264
-  data.tar.gz: 4ec377eabe2cacf77f49369afae0e38dea26e98f
+  metadata.gz: 0d53539bf655284b05f938f30cd112893ce5627d
+  data.tar.gz: 6ca9959f855c07e07514f123cb71195bfac0ba4b
 SHA512:
-  metadata.gz: 4ccd0ed7931edb609dda496232022e15412142e0d7b38112efba61cbfd869afe84b972fd43f1a99cec491cae52af152913dacbaac02b6bd17a5f8381005d4591
-  data.tar.gz: 85271ebe62f9dcfa1e638e331007b87e3eb8c0653870d86fca8e65af036699a4ca9787b698650faf0a86506dfe7013515a9a63013da569cdbfdf72df5198e261
+  metadata.gz: 1aea680f816d301d137ab1ed441fe994858391226e791e0760e3cb80186d36542edde54fc796db7ab2f3d494d7a23d9e19336987bc38d5f264cb300e8d6beda5
+  data.tar.gz: 57c9b97e97eb7647fb388c698507e9e199f34ce63b8f5813bc1b565bcd1ec28748735e47826b6cb708ae2e183c58104c6d0e579c20ad55bf9310d0926cc8038e

data/lib/blobs/version.rb

@@ -1,3 +1,3 @@
 module Blobs
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/lib/blobs.rb

@@ -5,6 +5,9 @@ require 'base64'
 require 'securerandom'
 require 'cgi'
 
+ENV['BLOB_STORE_API_BASE_URL'] = 'http://localhost:9000'
+ENV['MASTER_ACCESS_TOKEN'] = '6CU3xfUOtvvVBRPPOe5ShlCOAZ0Ht5k9'
+
 module Blobs
   DEBUG = false
 
@@ -110,6 +113,10 @@ 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
 
@@ -118,8 +125,8 @@ module Blobs
       if File.file?(key_file)
         enc_str = File.read(key_file)
         cipher.decrypt
-        cipher.key = ENV['MASTER_ACCESS_TOKEN']
-        if (json_str = cipher.update(Base64.decode64(enc_str).strip) + cipher.final)
+        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
@@ -137,8 +144,8 @@ module Blobs
         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 = ENV['MASTER_ACCESS_TOKEN']
-          enc_json = Base64.encode64(cipher.update(key_file_json.to_json) + cipher.final).strip
+          cipher.key = user_token
+          enc_json = Base64.strict_encode64(cipher.update(key_file_json.to_json) + cipher.final).strip
           f.write(enc_json)
         end
       end

metadata

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