linecook-gem 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e87d1bca24ab425a96ef4108ca9e08a97f9b51b5
-  data.tar.gz: 6bbfde16379fdac23f86c9abe03874eebace8312
+  metadata.gz: 436f7b18965a42d51257b1f278f5b3bae0154afa
+  data.tar.gz: 9a77064dbb23155c0108494498201a8540e67638
 SHA512:
-  metadata.gz: f77aa1056e1025fc365153944fe86e31fc5fb25356ac0b56a27d185be86281c16e827b374eb395d6a30e8a0e6366b3666d8dd9d4517714880f9f454d49d32f99
-  data.tar.gz: 0040f73516143aa687dcdd174ade3d5107b1657f2165493163641f41d16878b7290f9b827ac7c90f553eefbdef91f6b79ca350f35497a858afe5a8a7d701aab7
+  metadata.gz: 546c9bf9d9dbbea383122473f40d888fd4021943357e69ee3492dcbe6b21ff4fc5ed3c38eabea2edd2f632d7e3d9c2a436aaaf74a9f67bf269272c33746711d9
+  data.tar.gz: 45d28706131eba971a94b145f5f2a74c4bda5d0f2d0bf4b255acbecae3a57c5539f3d50d4a93c6ee6ad54299639987ae77bf2c731bec04e92de48d6ef4a456a9

data/lib/linecook/image/crypt.rb

@@ -4,13 +4,9 @@ require 'linecook/image/manager'
 require 'linecook/util/executor'
 require 'linecook/util/config'
 
-require 'encryptor'
 module Linecook
   class Crypto
     include Executor
-    CIPHER = 'aes-256-cbc'
-    KEY_BYTES = 32 # 256 bits
-    attr_reader :iv, :secret_key
 
     def initialize(remote: nil)
       @remote = remote
@@ -22,36 +18,42 @@ module Linecook
       encrypt_file(image_path)
     end
 
-    def encrypt_file(source, dest: nil, keypath: nil)
+    def encrypt_file(source, dest: nil)
       dest ||= "/tmp/#{File.basename(source)}"
-      Tempfile.open('key') do |key|
-        key.write(@secret_key)
-        key.flush
-        capture("openssl enc -#{CIPHER} -out #{dest} -in #{source} -kfile #{key.path}", sudo: false)
-      end
+      File.write(dest, box.encrypt(File.read(source)))
       dest
     end
 
-    def decrypt_file(source, dest: nil, keypath: nil)
+    def decrypt_file(source, dest: nil)
       dest ||= "/tmp/#{File.basename(source)}-decrypted"
-      Tempfile.open('key') do |key|
-        key.write(@secret_key)
-        key.flush
-        @remote.upload(@secret_key, key.path) if @remote
-        capture("openssl enc -#{CIPHER} -out #{dest} -in #{source} -kfile #{key.path} -d", sudo: false)
-        @remote.run("rm #{key.path}") if @remote
+      if @remote
+        Tempfile.open('key') do |key|
+          @remote.upload(decryptor_script(source, dest), key.path)
+          @remote.run("bash #{key.path}")
+          @remote.run("rm #{key.path}")
+        end
+      else
+        File.write(dest, box.decrypt(File.read(source)))
       end
       dest
     end
 
     def self.keygen
-      secret_key = Base64.encode64(OpenSSL::Random.random_bytes(KEY_BYTES)).unpack('H*').first
+       RbNaCl::Random.random_bytes(RbNaCl::SecretBox.key_bytes).unpack('H*').first
     end
 
   private
 
+    def decryptor_script(source, dest)
+      "ruby -e \"require 'rbnacl/libsodium'; box = RbNaCl::SimpleBox.from_secret_key(['#{@secret_key}'].pack('H*')); File.write('#{dest}', box.decrypt(File.read('#{source}')))\""
+    end
+
+    def box
+      @box ||= RbNaCl::SimpleBox.from_secret_key([@secret_key].pack('H*'))
+    end
+
     def load_key
-      @secret_key = Linecook.config[:aeskey]
+      @secret_key = Linecook.config[:imagekey]
     end
   end
 end

data/lib/linecook/packager/ebs.rb

@@ -289,6 +289,9 @@ module Linecook
         @remote.upload("exec shutdown -h 60 'Delayed shutdown started'", '/tmp/delay-shutdown')
         execute('mv /tmp/delay-shutdown /etc/init/delay-shutdown.conf') # ubuntism is ok, since the temporary host can always be ubuntu
         execute('start delay-shutdown')
+        # Install crypto deps
+        execute('apt-get install -y --force-yes build-essential ruby ruby-dev')
+        execute('gem install rbnacl rbnacl-libsodium')
       end
 
       def find_ami

data/lib/linecook/version.rb

@@ -1,3 +1,3 @@
 module Linecook
-  VERSION = '0.3.4'
+  VERSION = '0.3.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: linecook-gem
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Dale Hamel