app-rb 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8058d7410253117a512ac4aaaa078c2f82c8499
-  data.tar.gz: afc3acbf56448540887b2a6f52c12568c48f0bac
+  metadata.gz: e711d636dadff50ef85e9a5d2d064966b3effc49
+  data.tar.gz: b73199db204a95a85669ed40c690449f152923c2
 SHA512:
-  metadata.gz: d0d030ecece01d4ae12096134054c0bc77d174ae1842d437ed5bba2ffeadf7b3751f3d7463404f0bc3824cb54f9725a0aa615564f698a11f44d2e895a19ed7c8
-  data.tar.gz: e235501568640bcdc2f5f61b1c87b74c939fd04706112565f9c4def9fbc3df10f95dac4e1e09f8e737aa63b8a4e515a76599beea2540c4c9db596d0848a31177
+  metadata.gz: 691263ddcd9e2bebdb6076bc2dfda71a7aab9cd9dbf978da5cb5b16808fa345b6b08ef5d99573ea4503c90f55388283c4c1997cfe6d7dda36edf7d13e6cc48ac
+  data.tar.gz: 4c0b4ca076d63fca41eec03907b13f26a1ad0475ffbe62a69ea153c8cd37a56e4cf3ec37b983e2e8a9ba44c37d994a2b8d13aa06ef767fffeba5e6bfd6708bde

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## App-rb 0.7.0 (April 13, 2017) ##
+
+* Support crypting of sensitive information using vault file as key.
+
 ## App-rb 0.6.0 (April 10, 2017) ##
 
 * Add kind and name labels to each docker image.

data/lib/app-rb/cli.rb

@@ -1,4 +1,5 @@
 require 'yaml'
+require 'openssl'
 
 module AppRb
   class Cli
@@ -12,17 +13,30 @@ module AppRb
         usage
         exit
       end
-      config = Config.new(YAML.load(File.read(@args[0])))
-      command = @args[1]
+      if File.exists?(@args[0])
+        config_path = @args.shift
+      end
+
+      if @args[0] == "--vault" && File.exists?(@args[1])
+        @args.shift
+        @vault_file = @args.shift
+      elsif File.exists?(File.join(Dir.pwd, "vault.key"))
+        @vault_file = File.join(Dir.pwd, "vault.key")
+      else
+        @vault_file = nil
+      end
+
+      command = @args.shift
+      config = Config.new(read_yaml(config_path)) if config_path
 
-      if AppRb::Util.compare_versions(config.tool_version, AppRb::VERSION) > 0
+      if config && AppRb::Util.compare_versions(config.tool_version, AppRb::VERSION) > 0
         puts "FATAL: need at least '#{config.tool_version}' tool version but current version is '#{AppRb::VERSION}'"
         exit -1
       end
 
-      if command == "deploy" || command == "d"
+      if %w[deploy d].index(command)
         Command.new(config).deploy(@args[2])
-      elsif command == "status" || command == "s"
+      elsif %w[status s].index(command)
         Command.new(config).status
       elsif command == "redeploy"
         Command.new(config).redeploy
@@ -30,10 +44,14 @@ module AppRb
         Command.new(config).clean
       elsif command == "stop"
         Command.new(config).stop
-      elsif command == "run" || command == "r"
+      elsif %w[run r].index(command)
         Command.new(config).run(@args[2..-1].join(" "))
       elsif command == "cd"
         Command.new(config).cd
+      elsif %w[encrypt en e].index(command)
+        puts encrypt(@args.shift)
+      elsif %w[decrypt de].index(command)
+        puts decrypt(@args.shift)
       else
         puts "FATAL: unknown command '#{command}'"
         exit -1
@@ -41,21 +59,79 @@ module AppRb
     end
 
   private
+    MARKER = "__VAULT:"
+
+    def read_yaml(file)
+      unvault = proc { |o|
+        if o.is_a?(Array)
+          o.map { |i| unvault.call(i) }
+        elsif o.is_a?(Hash)
+          o.map { |k, v| [k, unvault.call(v)] }.to_h
+        elsif o.is_a?(String) && o.index(MARKER) == 0
+          decrypt(o)
+        else
+          o
+        end
+      }
+      unvault.call(YAML.load(File.read(file)))
+    end
+
+    def die(msg = nil)
+      if msg
+        puts "FATAL: #{msg}"
+      else
+        puts "exit with status code -1"
+      end
+      exit -1
+    end
+
+    def bin_to_hex(s)
+      s.unpack('H*').first
+    end
+
+    def hex_to_bin(s)
+      s.scan(/../).map { |x| x.hex }.pack('c*')
+    end
+
+    def encrypt(string)
+      die "missed vault file" unless @vault_file
+      die "string encrypted yet" if string.index(MARKER) == 0
+      cipher = OpenSSL::Cipher::AES256.new :CBC
+      cipher.encrypt
+      iv = cipher.random_iv
+      cipher.key = Digest::SHA256.digest(File.read(@vault_file).strip)
+      MARKER + bin_to_hex(cipher.update(string) + cipher.final) + ":" + bin_to_hex(iv)
+    end
+
+    def decrypt(string)
+      die "missed vault file" unless @vault_file
+      die "string not encrypted" unless string.index(MARKER) == 0
+      cipher = OpenSSL::Cipher::AES256.new :CBC
+      cipher.decrypt
+      cipher.iv = hex_to_bin(string.sub(MARKER, "").split(":")[1])
+      cipher.key = Digest::SHA256.digest(File.read(@vault_file).strip)
+      cipher.update(hex_to_bin(string.sub(MARKER, "").split(":")[0])) + cipher.final
+    end
 
     def usage
       puts "Just deploy your apps with docker and consul. Nothing else."
       puts "Version: #{AppRb::VERSION}"
       puts ""
-      puts "  app-rb <yml> <command>"
+      puts "  app-rb <yml> [options] <command>"
+      puts ""
+      puts "Options:"
+      puts "  --vault <vault-file>    - vault file (<pwd>/vault.key by default)"
       puts ""
-      puts "Usage:"
+      puts "Commands:"
       puts "  deploy [hash]      - deploy new version of app"
       puts "  status             - status of app"
-      puts "  stop               - stop app"
+      puts "  stop               - stop app completely"
       puts "  run <cmd> [args]   - one time command"
       puts "  cd                 - go to run node"
+      puts "  encrypt <string>   - encrypt script using vault-file"
+      puts "  decrypt <string>   - decrypt script using vault-file"
       puts ""
-      puts "Advanced:"
+      puts "Advanced commands:"
       puts "  redeploy           - redeploy app"
       puts "  clean              - stop and remove not current containers"
     end

data/lib/app-rb/version.rb

@@ -1,3 +1,3 @@
 module AppRb
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: app-rb
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Alexey Vakhov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-10 00:00:00.000000000 Z
+date: 2017-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler