minke 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 6d1dc1a86b9004df15f273a829757420c900f13b
-  data.tar.gz: 06d5adacf584e0f40b2a298490000fbef34ba8cf
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OGY3YmUxMmI5MTEyOTE3NWRjZTNmZTE5YzI4ZTdlMDQ2Y2Y3NmNiYw==
+  data.tar.gz: !binary |-
+    MWQwNDAyZTc5Zjk3ZmNiYTFmZmZhMTgxMTg4NjI2ZmRjZjcxOGFhZg==
 SHA512:
-  metadata.gz: d8e1c35bf066f3ccc99e0ef883d9b22b59077838e9de61b27bb3df73103152150f72e70ed2605bcf9b91434792f567075acb143cc8d1dc75151ad2afc427900d
-  data.tar.gz: 16ba95214420926a90059b0bc12e04576ee069b9b7f2407078e3b68af0cdc9b97e30695a4484ec6377dceca490f5a9233b7cd0533b0ded3bfd923e394790b441
+  metadata.gz: !binary |-
+    OWU2NGZlYTk2MmRjZjZjZGIxM2NhNjkwOTIzNmIzZDdmYjA0ZGM4OGI0ZDFi
+    YTY3NzliYzU5NTQ3Y2E0ZTU0MzYwYTUxZTQ4ZWQzNTA0YzMxYWYwOWUxZWFj
+    YmUzYmJhZjI3NWEzNDczYWYxNzM3ZDBhMTMwNzBhYzQyOGU3M2M=
+  data.tar.gz: !binary |-
+    NzE1N2FiZWQ2MzMyMjM4ODA1NTMyZmU2MTE1MjJiZWE4NDZjNTk0Nzk5OTRh
+    ZjY2NTJjOWRjNWVhMWIwNzcxNWMzNGFmZDZhZjA1MDJlODBiZmM5ZTkzNmE2
+    NjhkZmZiZDkwOWIxYTMxZDI1YjU0N2YyNTJjY2FmZGFhYmU2N2Y=

data/bin/minke

@@ -21,8 +21,10 @@ puts ""
 
 options = {}
 OptionParser.new do |opts|
-  opts.banner = "Usage: example.rb [options]"
+  opts.banner = "Usage: minke [options]"
 
+  opts.on('-e', '--encrypt STRING', 'Encrypt a string') { |v| options[:encrypt] = v }
+  opts.on('-k', '--key STRING', 'Private key to use for encryption') { |v| options[:key] = v }
   opts.on('-g', '--generator GENERATOR', 'Generator plugin to use') { |v| options[:generator] = v }
   opts.on('-o', '--output OUTPUT', 'Output folder') { |v| options[:output] = v }
   opts.on('-a', '--application_name NAME', 'Application name') { |v| options[:name] = v }
@@ -39,6 +41,17 @@ end
 processor = Minke::Generators::Processor.new variables, Minke::Docker::DockerRunner.new
 processor.load_generators
 
+if options[:encrypt] != nil
+  puts "Please specify a key to use for encryption using -k [path to file]" if options[:key] == nil
+
+  encrypt = Minke::Encryption::Encryption.new options[:key]
+  puts 'secure:'
+  puts "  fingerprint: #{encrypt.fingerprint}"
+  puts '  value: >'
+  encrypt.encrypt_string(options[:encrypt]).split("\n").each { |l| puts "    #{l}"}
+
+  exit 0
+end
 
 if options[:generator] == nil || options[:output] == nil || options[:name] == nil || options[:namespace] == nil
   puts "Please specify options use: minke --help for help on command line options"

data/lib/minke/config/reader.rb

@@ -30,11 +30,11 @@ module Minke
 
       def read_docker_registry section
         DockerRegistrySettings.new.tap do |d|
-          d.url       = section['url']
-          d.user      = section['user']
-          d.password  = section['password']
-          d.email     = section['email']
-          d.namespace = section['namespace']
+          d.url       = section['url'].is_a?(Hash) ? read_secure(section['url']) : section['url']
+          d.user      = section['user'].is_a?(Hash) ? read_secure(section['user']) : section['user']
+          d.password  = section['password'].is_a?(Hash) ? read_secure(section['password']) : section['password']
+          d.email     = section['email'].is_a?(Hash) ? read_secure(section['email']) : section['email']
+          d.namespace = section['namespace'].is_a?(Hash) ? read_secure(section['namespace']) : section['namespace']
         end
       end
 
@@ -90,6 +90,17 @@ module Minke
         end
       end
 
+      def read_secure hash
+        fingerprint = hash['secure']['fingerprint']
+        value = hash['secure']['value']
+
+        locator = Minke::Encryption::KeyLocator.new ENV['SSL_KEY_PATH']
+        key_path = locator.locate_key fingerprint
+
+        encrypt = Minke::Encryption::Encryption.new key_path
+        encrypt.decrypt_string value
+      end
+
     end
   end
 end

data/lib/minke/encryption/encryption.rb

@@ -0,0 +1,22 @@
+module Minke
+  module Encryption
+    class Encryption
+      def initialize(private_key_file)
+        @key_file = private_key_file
+        @key = OpenSSL::PKey::RSA.new File.read private_key_file
+      end
+
+      def encrypt_string(string)
+        Base64.encode64(@key.public_encrypt(string))
+      end
+
+      def decrypt_string(string)
+        @key.private_decrypt(Base64.decode64(string))
+      end
+
+      def fingerprint
+        SSHKey.new(File.read(@key_file)).md5_fingerprint
+      end
+    end
+  end
+end

data/lib/minke/encryption/key_locator.rb

@@ -0,0 +1,22 @@
+module Minke
+  module Encryption
+    class KeyLocator
+      def initialize(key_store_path)
+        @key_store_path = key_store_path
+      end
+
+      def locate_key fingerprint
+        Dir.entries(@key_store_path).each do |f|
+          begin
+            full_path = "#{@key_store_path}/#{f}"
+            key = SSHKey.new(File.read(full_path))
+
+            return full_path if key.fingerprint == fingerprint
+          rescue
+            puts "failed to read #{f}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/minke/version.rb

@@ -1,3 +1,3 @@
 module Minke
-  VERSION = "1.4.0"
+  VERSION = "1.5.0"
 end

data/lib/minke.rb

@@ -10,6 +10,9 @@ require 'rubygems'
 require 'yaml'
 require 'colorize'
 require 'multi_json'
+require 'openssl'
+require 'base64'
+require 'sshkey'
 
 require 'minke/version'
 
@@ -37,3 +40,6 @@ require 'minke/generators/config_processor'
 require 'minke/generators/config_variables'
 require 'minke/generators/processor'
 require 'minke/generators/register'
+
+require 'minke/encryption/encryption'
+require 'minke/encryption/key_locator'

data/minke.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'guard'
   spec.add_development_dependency 'guard-rspec'
 
+  spec.add_runtime_dependency 'sshkey'
   spec.add_runtime_dependency 'colorize'
   spec.add_runtime_dependency 'cucumber'
   spec.add_runtime_dependency 'rake', '~> 10.0'

metadata

@@ -1,167 +1,181 @@
 --- !ruby/object:Gem::Specification
 name: minke
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Nic Jackson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-24 00:00:00.000000000 Z
+date: 2016-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sshkey
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: docker-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
   name: consul_loader
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -172,12 +186,12 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".codeclimate.yml"
-- ".gitignore"
-- ".rspec"
-- ".ruby-gemset"
-- ".ruby-version"
-- ".travis.yml"
+- .codeclimate.yml
+- .gitignore
+- .rspec
+- .ruby-gemset
+- .ruby-version
+- .travis.yml
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Guardfile
@@ -196,6 +210,8 @@ files:
 - lib/minke/docker/docker_runner.rb
 - lib/minke/docker/service_discovery.rb
 - lib/minke/docker/system_runner.rb
+- lib/minke/encryption/encryption.rb
+- lib/minke/encryption/key_locator.rb
 - lib/minke/generators/config.rb
 - lib/minke/generators/config_processor.rb
 - lib/minke/generators/config_variables.rb
@@ -225,17 +241,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Minke is a suite of rake tasks for building and testing microservices with