ops_team 0.5.0 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5f3cafd5c8ea4f19149954f50d8f7cb9985ec6b8032497bfcb20865be3ca49a
-  data.tar.gz: 2dc0e829aec00d936b497a47a44053ae54deab3158a900cdbe709496e323dbbf
+  metadata.gz: 8c91d50eeddf170724b335ec23089f3f5a452507f034e1edb8d9bce7fe419976
+  data.tar.gz: 9fa1b82f605e2342cfe01e6127849c41bae745ff68464afcb294f0796e5b9b82
 SHA512:
-  metadata.gz: 8f9a772c8a2828b471c094d183e05f7d30421d809c6771a143bc758d2752f8d8677ff8ddcfceeef78b3356a4342701df2a6691a25309541c68e6b034eeda258b
-  data.tar.gz: 98139f2f8b632891f8669719aae49aa71c71c2d2c71993b5311eba0a1a882ca4168d28e0a9e273cb5d86c9ec56a26739026d2eb8a2093a4661b9a420b035b374
+  metadata.gz: b1e9b52dcbcc50975dd2dd9e5369d4e1134822a7837a1132994c296fe32021c339d1457a1d9e92bbb6fdc5daa0581b761a13ce0f04ba92138821e41161f45209
+  data.tar.gz: 7b94c375bb4a1614aff89cbe83a530864b9c9aff8d597a0945fb499629833ff8dd099eb986df610d458a3a009d6ea00ac1eaf6c9c92e063892c15ee0290810d5

data/Gemfile

@@ -4,7 +4,10 @@ source "https://rubygems.org"
 
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
+gem "bcrypt_pbkdf"
 gem "colorize"
+gem "ed25519"
+gem "net-ssh"
 gem "require_all"
 
 group :test do

data/lib/app_config.rb

@@ -1,6 +1,22 @@
 # frozen_string_literal: true
 
 class AppConfig
+	class << self
+		def load
+			new(app_config_path).load
+		end
+
+		private
+
+		def app_config_path
+			expand_path(Options.get("config.path"))
+		end
+
+		def expand_path(path)
+			`echo #{path}`.chomp
+		end
+	end
+
 	def initialize(filename = "")
 		@filename = filename.empty? ? default_filename : filename
 	end
@@ -18,8 +34,8 @@ class AppConfig
 	end
 
 	def config
-		@config ||= file_contents ? JSON.parse(file_contents) : {}
-	rescue JSON::ParserError => e
+		@config ||= file_contents ? YAML.safe_load(file_contents) : {}
+	rescue YAML::SyntaxError => e
 		Output.error("Error parsing config data: #{e}")
 		{}
 	end

data/lib/builtins/help.rb

@@ -35,7 +35,10 @@ module Builtins
 
 		def actions
 			@config["actions"].map do |name, value|
-				format("%<name>-35s %<desc>s", name: name.yellow, desc: value["description"] || value["command"])
+				format("%<name>-35s %<desc>s",
+					name: name.yellow,
+					desc: value["description"] || value["command"]
+				)
 			end
 		end
 	end

data/lib/builtins/up.rb

@@ -29,7 +29,7 @@ module Builtins
 		def meet_dependencies
 			dependency_handler.dependencies.each do |dependency|
 				# don't even output anything for dependencies that shouldn't be considered on this machine
-				next unless dependency.should_meet?
+				next unless dependency&.should_meet?
 
 				Output.status("[#{dependency.type}] #{dependency.name}")
 

data/lib/dependencies/apt.rb

@@ -9,7 +9,7 @@ module Dependencies
 		end
 
 		def meet
-			execute("#{sudo_string}#{meet_command}")
+			execute("#{sudo_string}apt-get install -y #{name}")
 		end
 
 		def unmeet
@@ -28,9 +28,5 @@ module Dependencies
 
 			"sudo "
 		end
-
-		def meet_command
-			"apt-get install -y #{name}"
-		end
 	end
 end

data/lib/dependencies/sshkey.rb

@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+require 'net/ssh'
+
+require 'dependency'
+
+module Dependencies
+	class Sshkey < Dependency
+		DEFAULT_KEY_SIZE = 2048
+		DEFAULT_KEY_ALGO = "rsa"
+		DEFAULT_KEY_LIFETIME_S = 600
+
+		def met?
+			# we always need to at least update the key lifetime in the agent
+			false
+		end
+
+		def meet
+			Secrets.load
+
+			FileUtils.mkdir_p(dir_name) unless File.directory?(dir_name)
+
+			generate_key unless File.exist?(priv_key_name) && File.exist?(pub_key_name)
+			add_key if success? && ENV["SSH_AUTH_SOCK"]
+		end
+
+		def unmeet
+			true
+		end
+
+		def should_meet?
+			true
+		end
+
+		private
+
+		def generate_key
+			execute("ssh-keygen -b #{key_size} -t #{key_algo} -f #{priv_key_name} -q -N '#{passphrase}'")
+		end
+
+		def add_key
+			Net::SSH::Authentication::Agent.connect.add_identity(
+				unencrypted_key,
+				"ops",
+				lifetime: key_lifetime
+			)
+		end
+
+		def unencrypted_key
+			Net::SSH::KeyFactory.load_private_key(priv_key_name, passphrase)
+		end
+
+		def dir_name
+			`echo #{File.dirname(name)}`.chomp
+		end
+
+		def priv_key_name
+			`echo #{name}`.chomp
+		end
+
+		def pub_key_name
+			"#{priv_key_name}.pub"
+		end
+
+		def key_size
+			Options.get("sshkey.key_size") || DEFAULT_KEY_SIZE
+		end
+
+		def key_algo
+			DEFAULT_KEY_ALGO
+		end
+
+		def passphrase
+			`echo #{configured_passphrase}`.chomp
+		end
+
+		def configured_passphrase
+			Options.get("sshkey.passphrase")
+		end
+
+		def key_lifetime
+			Options.get("sshkey.key_lifetime") || DEFAULT_KEY_LIFETIME_S
+		end
+	end
+end

data/lib/environment.rb

@@ -30,7 +30,7 @@ class Environment
 
 	def set_configured_variables
 		@env_hash.each do |key, value|
-			ENV[key] = value.to_s
+			ENV[key] = `echo #{value}`.chomp
 		end
 	end
 end

data/lib/ops.rb

@@ -49,11 +49,11 @@ class Ops
 
 	def run_action
 		environment.set_variables
-		app_config.load
+		AppConfig.load
 
 		return builtin.run if builtin
 
-		Output.warn("Running '#{action}' from #{CONFIG_FILE}...")
+		Output.warn("Running '#{action}' from #{CONFIG_FILE} in environment '#{ENV['environment']}'...")
 		action.run
 	end
 
@@ -106,12 +106,8 @@ class Ops
 		@environment ||= Environment.new(env_vars)
 	end
 
-	def app_config_file
-		`echo #{Options.get("config.path")}`.chomp
-	end
-
 	def app_config
-		@app_config ||= AppConfig.new(app_config_file)
+		@app_config ||= AppConfig.new
 	end
 end
 

data/lib/secrets.rb

@@ -8,19 +8,11 @@ require 'options'
 
 class Secrets < AppConfig
 	class << self
-		def load
-			Secrets.new(secrets_path).load
-		end
-
 		private
 
-		def secrets_path
+		def app_config_path
 			expand_path(Options.get("secrets.path"))
 		end
-
-		def expand_path(path)
-			`echo #{path}`.chomp
-		end
 	end
 
 	def initialize(filename = "")

data/ops_team.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
 	s.name = 'ops_team'
-	s.version = '0.5.0'
+	s.version = '0.8.2'
 	s.authors = [
 		'nickthecook@gmail.com'
 	]
@@ -22,7 +22,10 @@ Gem::Specification.new do |s|
 	]
 	s.executables << 'ops'
 	s.required_ruby_version = '~> 2.5'
+	s.add_runtime_dependency 'bcrypt_pbkdf', '~> 1.0', '>= 1.0.1'
 	s.add_runtime_dependency 'colorize', '~> 0.8', '>= 0.8.1'
+	s.add_runtime_dependency 'ed25519', '~> 1.2', '>= 1.2.4'
+	s.add_runtime_dependency 'net-ssh', '~> 6.1', '>= 6.1.0'
 	s.add_runtime_dependency 'require_all', '~> 1.1', '>= 1.1.6'
 	s.license = 'GPL-3.0-only'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ops_team
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.8.2
 platform: ruby
 authors:
 - nickthecook@gmail.com
@@ -10,6 +10,26 @@ bindir: bin
 cert_chain: []
 date: 2020-05-29 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: bcrypt_pbkdf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -30,6 +50,46 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.1
+- !ruby/object:Gem::Dependency
+  name: ed25519
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.4
+- !ruby/object:Gem::Dependency
+  name: net-ssh
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: require_all
   requirement: !ruby/object:Gem::Requirement
@@ -84,6 +144,7 @@ files:
 - lib/dependencies/dir.rb
 - lib/dependencies/docker.rb
 - lib/dependencies/gem.rb
+- lib/dependencies/sshkey.rb
 - lib/dependency.rb
 - lib/environment.rb
 - lib/ops.rb