canzea 0.1.35 → 0.1.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0359469554bf74e4bd0f49da18e91fdabf7a0574
-  data.tar.gz: 96c5b165b2747774ed948cb4f2363a260f6c97c2
+  metadata.gz: 5030adbff33693ff30ed168720e7ad3a2d9b5640
+  data.tar.gz: c340d70b8c103d1fe1251097a9d3c8f349ca2d90
 SHA512:
-  metadata.gz: 76853ea471c1afcf111ab0093681cc4165988823493202246cff65935720e9ac38ff2141b7ffa35d0b60177552cc03e9702e5a26dbe19cf326b23a969db37b9e
-  data.tar.gz: bb3f2e612b73ccbb70a5692769e36cf65329d9d50b52d8696a820e93e6a9bcdf20c287951c41434b68dd17087d1b6284b7a82c562ef9c98a3acf7cadca7255e1
+  metadata.gz: 7f4fccf38a1b4d29b32f67c697de1107c87c77cd96019910278897a649d6ba9ddd1b2efe3b83f484aa2e5fdc326eaf8608d90912cc4202456ff324b026e7cf51
+  data.tar.gz: c669cf776d17fa056a5c249bb72ff53f4410e68f3aef5fb2fc790fc33da93546facfa191dc2792d858ad647fea03d1e4be4e6f4a28658b638735b837550c433d

data/lib/canzea/config.rb

@@ -10,7 +10,12 @@ module Canzea
               :catalog_branch => "develop",
               :git_repo => "/opt/cloud-profile",
               :logging_root => Dir.home,
-              :pwd => Dir.pwd
+              :pwd => Dir.pwd,
+              :consul_tls_ca_file => "/etc/consul.d/ssl/ca.cert",
+              :consul_tls_cert_file => "/etc/consul.d/ssl/consul.cert",
+              :consul_tls_key_file => "/etc/consul.d/ssl/consul.key",
+              :vault_tls_cert_file => "/etc/consul.d/ssl/vault.cert",
+              :vault_tls_key_file => "/etc/consul.d/ssl/vault.key"
             }
   @valid_config_keys = @config.keys
 

data/lib/canzea/version.rb

@@ -1,3 +1,3 @@
 module Canzea
-  VERSION = "0.1.35"
+  VERSION = "0.1.36"
 end

data/lib/prepare-environment.rb

@@ -41,8 +41,21 @@ class PrepareEnvironment
 
           puts "-- Looking up...#{svc['name']}"
 
-          url = ENV["CONSUL_URL"] + '/v1/catalog/service/' + svc['name']
-          resp = Net::HTTP.get_response(URI.parse(url))
+          pemCert = File.read(Canzea::config[:consul_tls_cert_file])
+          pemKey = File.read(Canzea::config[:consul_tls_key_file])
+
+          uri = URI.parse(ENV["CONSUL_URL"] + '/v1/catalog/service/' + svc['name'])
+          http = Net::HTTP.new(uri.host, uri.port)
+          http.use_ssl = true
+          http.ca_file = Canzea::config[:consul_tls_ca_file]
+          http.cert = OpenSSL::X509::Certificate.new(pemCert)
+          http.key = OpenSSL::PKey::RSA.new(pemKey)
+          http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+          http.set_debug_output($stdout)
+          http.ssl_version = :SSLv23
+          request = Net::HTTP::Get.new(uri.request_uri)
+          resp = http.request(request)
+
           services = JSON.parse(resp.body)
 
           if (services.nil? == false)
@@ -76,15 +89,25 @@ class PrepareEnvironment
 
           puts "-- Looking up secret...#{svc['name']}"
 
-          url = URI(ENV['VAULT_URL'] + '/v1/secret/' + svc['name'])
+          pemCert = File.read(Canzea::config[:vault_tls_cert_file])
+          pemKey = File.read(Canzea::config[:vault_tls_key_file])
+
+          uri = URI.parse(ENV["VAULT_URL"] + '/v1/secret/' + svc['name'])
+          http = Net::HTTP.new(uri.host, uri.port)
+          http.use_ssl = true
+          http.ca_file = Canzea::config[:consul_tls_ca_file]
+          http.cert = OpenSSL::X509::Certificate.new(pemCert)
+          http.key = OpenSSL::PKey::RSA.new(pemKey)
+          http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+          http.set_debug_output($stdout)
+          http.ssl_version = :SSLv23
+          request = Net::HTTP::Get.new(uri.request_uri)
+
+          request['X-Vault-Token'] = ENV["VAULT_TOKEN"]
+          request['Content-type'] = 'application/json'
 
-          req = Net::HTTP::Get.new(url)
-          req['X-Vault-Token'] = ENV["VAULT_TOKEN"]
-          req['Content-type'] = 'application/json'
+          resp = http.request(request)
 
-          resp = Net::HTTP.start(url.hostname, url.port) {|http|
-             http.request(req)
-          }
           # puts resp.body
 
           if (Integer(resp.code) == 200)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canzea
 version: !ruby/object:Gem::Version
-  version: 0.1.35
+  version: 0.1.36
 platform: ruby
 authors:
 - Canzea Technologies
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-07 00:00:00.000000000 Z
+date: 2016-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler