sambot 0.1.111 → 0.1.112

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04cf2aa5575db3b8d682df8834ee8219bfbf7ebf
-  data.tar.gz: e664f1bfdb6988720af8966aa6bf9af92277502d
+  metadata.gz: 0de72fb94d33394f6a22bc622e7bb25bc006fad5
+  data.tar.gz: 2b9c9c892cf49945ef7fe560c4b018df0a59ff45
 SHA512:
-  metadata.gz: 71f8344676808ea81f690b06891fb80820de093e37635b937613b8102e2f6b236d4f97b28d89d10ce5af5d6433340fd4a51d808d1c94e806cf97136f00244142
-  data.tar.gz: a4a9d08a9e08102507cddc15f060a2cb398752067481dbc823e53fc023703a39966235a1b50dab517984e900e5c49c36d5f6edd585a2a3296595f702e5df8082
+  metadata.gz: 6752fc68229ee431c8c4d831d61ba300a2b35736f6c376457b344eb99c7f02b19fb8de1e7cc1d114c940148c77c0b212e3f0782077c2bd3e234e7f608cdea156
+  data.tar.gz: 745daed4cc978fe0c7eccf6c6623f7d8a1357965534efefa4d6d8dd09abab5e5fd92a5bd56a6e354e3d98deba0ab29e664ea2d58b0b052b7415e688218bbac15

data/lib/sambot/developer_workflow/proxy.rb

@@ -4,6 +4,8 @@ module Sambot
   module DeveloperWorkflow
     class Proxy
 
+      CONFIG_PATH = '/tmp/haproxy.conf'
+
       def self.start(forwards)
         template_path = FileManagement::TemplateProvider.get_path('haproxy.conf.erb')
         input = File.read(template_path)
@@ -20,13 +22,12 @@ module Sambot
           UI.debug("Proxying #{service[:name]}.brighter.io:#{service[:local_port]} to #{service[:ip]}:#{service[:tunnel_port]}")
         end
         contents = eruby.evaluate({services: services})
-        temp_config = Tempfile.new
-        File.write(temp_config.path, contents)
-        Runtime.sudo("haproxy -f #{temp_config.path}")
+        File.write(CONFIG_PATH, contents)
+        Runtime.sudo("haproxy -f #{CONFIG_PATH}")
       end
 
       def self.stop
-
+        Runtime.sudo("killall haproxy")
       end
 
     end

data/lib/sambot/developer_workflow/session.rb

@@ -23,7 +23,7 @@ module Sambot
         'teamcity.brighter.io': { ip: '127.0.0.14', port: 443, local_port: 9014 },
         'splunk.brighter.io': { ip: '127.0.0.15', port: 443, local_port: 9015 },
         'jenkins.brighter.io': { ip: '127.0.0.16', port: 443, local_port: 9016 },
-        'vault.brighter.io': { ip: '127.0.0.17', port: 8200, local_port: 9017 }
+        'vault.brighter.io': { ip: '127.0.0.1', port: 8200, local_port: 9017 }
       }
 
       def start(username, password, sudo_password)
@@ -36,13 +36,14 @@ module Sambot
         Proxy.start(FORWARDS)
         Networking.configure(FORWARDS)
         Tunnels.start(username, password, BASTION_HOST_IP, FORWARDS)
-        #setup_secrets_management(username, password)
+        setup_secrets_management(username, password)
         UI.info("Your session has now started - run `sambot session stop` to close it")
       end
 
       def stop
         Tunnels.stop
         DNS.reset_hosts(FORWARDS)
+        Proxy.stop
       end
 
       private
@@ -65,11 +66,11 @@ module Sambot
       end
 
       def setup_secrets_management(username, password)
-        unless Vault.has_environment_variables?('/etc/profile.d/')
+        unless Vault.has_environment_variables?
           UI.info("You have either not configured your workstation or you have not opened up a new shell to pick up the changes applied during configuration")
         end
         UI.debug "Authenticating with Hashicorp Vault in Rackspace DEV/QE"
-        token = Vault.authenticate(username, password)
+        token = Vault.authenticate(username, password, FORWARDS)
         UI.debug "Saving your Vault authentication token to ~/.vault-token"
         Vault.save_token(token)
       end

data/lib/sambot/developer_workflow/vault.rb

@@ -7,34 +7,46 @@ module Sambot
   module DeveloperWorkflow
     class Vault
 
-      TARGET = "https://vault.brighter.io:8200"
+      def self.authenticate(username, password, forwards)
+        secret = get_user_token(username, password, forwards)
+        secret.auth.client_token
+      end
 
-      def self.authenticate(username, password)
-        secret = nil
+      def self.get_user_token(username, password, forwards)
         ::Vault.configure do |config|
           sleep(3)
-          config.address = TARGET
+          config.address = build_vault_address(forwards)
           config.ssl_verify = false
-          secret = ::Vault.auth.ldap(username, password)
+          return ::Vault.auth.ldap(username, password)
         end
-        secret.auth.client_token
       end
 
-      def self.setup_environment(root = '/etc/profile.d/')
-        save_environment_variable('VAULT_SKIP_VERIFY', true)
-        save_environment_variable('VAULT_ADDR', TARGET)
+      def self.setup_environment(forwards, target = '~/.bash_profile')
+        save_environment_variable('VAULT_SKIP_VERIFY', true, target)
+        save_environment_variable('VAULT_ADDR', build_vault_address(forwards), target)
       end
 
-      def self.save_environment_variable(key, value, path = '/etc/profile.d/')
-        path = File.join(path, "#{key}.sh")
-        file = Tempfile.new('foo')
-        file.write("export #{key}=#{value}")
-        Runtime.sudo("cp #{file.path} #{path}")
+      def self.build_vault_address(forwards)
+        "https://vault.brighter.io:#{forwards[:'vault.brighter.io'][:local_port]}"
+      end
+
+      def self.save_environment_variable(key, value, target = '~/.bash_profile')
+        contents = File.read(target)
+        contents = contents.gsub(/export #{key}=#{value}/, '') if has_environment_variable?(key, value, target)
+        contents << "export #{key}=#{value.to_s}\n"
+        File.write(target, contents)
         ENV[key] = value.to_s
       end
 
-      def self.has_environment_variables?(path)
-        File.exist?(File.join(path, "VAULT_SKIP_VERIFY.sh")) && File.exist?(File.join(path, "VAULT_ADDR.sh"))
+      def self.has_environment_variables?(forwards, target = '~/.bash_profile')
+        has_vault_skip_verify = has_environment_variable?('VAULT_SKIP_VERIFY', true, target)
+        has_vault_addr = has_environment_variable?('VAULT_ADDR', build_vault_address(forwards), target)
+        (has_vault_addr != nil) && (has_vault_skip_verify != nil)
+      end
+
+      def self.has_environment_variable?(key, value, target = '~/.bash_profile')
+        contents = File.read(target)
+        contents.match(/export #{key}=#{value}/)
       end
 
       def self.save_token(token, home_directory = '~')

data/lib/sambot/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sambot
-  VERSION = '0.1.111'.freeze
+  VERSION = '0.1.112'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sambot
 version: !ruby/object:Gem::Version
-  version: 0.1.111
+  version: 0.1.112
 platform: ruby
 authors:
 - Olivier Kouame