ops_team 1.20.1 → 1.20.2.pre.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '085bb6a99b3ae3f07cc5346ae968145952a4ccf14badc37c6407bc03bd3369e7'
-  data.tar.gz: 19b28b9e8a20ce504bbf0c60c9a21eb3cf10ec5cd8230452863e12236db30eed
+  metadata.gz: 455f0e62f07bc41ac0ef70c79c622a3ae367bf1f73f3b903b63a8a7a7d29cef8
+  data.tar.gz: bc91912b9c30b81ce6f5afb615bb33d0f13f092dcdc20c3fa77ff2536167c421
 SHA512:
-  metadata.gz: c1921cdb2c1ec54c84e4c812bb466c1825451e2d9043aeded6dd136a3d00772fbbc72f4a4d261dccc40dc231f904e216d35eb1ed4bd4c6636b99404f0ec2dee4
-  data.tar.gz: fbc54e82f30e9d21f420b196e911da14d613bc5d3104ac9e00a9db6e1df95a2930cf1b2e7c4001c0105a685533f446f08f32befb992480bc8d436b1569311451
+  metadata.gz: 1b7ff635a4f099ef8ec0bea62b5ae18027520d6d45f9ce94807979741d5c73588dcd635165330fc771921a26a6068f57f8cf56802f457a78938cd780b37d3cc6
+  data.tar.gz: 6eabc65621b9e6e8fc2102a9eff392e1b1347e07e886c6142603de55aa7e610ff1099525cb19895db8901555a6e4fc56d05b69a6f3dc146e79c0ffff5c5cf963

data/lib/dependencies/helpers/ssh_key_decryptor.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require "tempfile"
+
+module Dependencies
+	module Helpers
+		class SshKeyDecryptor
+			def initialize(source_key_path, passphrase)
+				@source_key_path = source_key_path
+				@passphrase = passphrase
+			end
+
+			def plaintext_key
+				@plaintext_key ||= begin
+					plaintext = decrypt_key
+
+					File.delete(temp_key_file.path)
+
+					plaintext
+				end
+			end
+
+			private
+
+			def temp_key_file
+				@temp_key_file ||= Tempfile.new("ops")
+			end
+
+			def decrypt_key
+				FileUtils.cp(@source_key_path, temp_key_file.path)
+				`ssh-keygen -f '#{temp_key_file.path}' -p -P '#{@passphrase}' </dev/null`
+
+				File.read(temp_key_file.path)
+			end
+		end
+	end
+end

data/lib/dependencies/sshkey.rb

@@ -54,7 +54,11 @@ module Dependencies
 		end
 
 		def unencrypted_key
-			Net::SSH::KeyFactory.load_private_key(priv_key_name, passphrase.empty? ? nil : passphrase)
+			Net::SSH::KeyFactory.load_data_private_key(decryptor.plaintext_key, nil)
+		end
+
+		def decryptor
+			@decryptor ||= Helpers::SshKeyDecryptor.new(priv_key_name, passphrase)
 		end
 
 		def key_comment

data/ops_team.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
 	s.name = 'ops_team'
-	s.version = '1.20.1'
+	s.version = '1.20.2-rc1'
 	s.authors = [
 		'nickthecook@gmail.com'
 	]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ops_team
 version: !ruby/object:Gem::Version
-  version: 1.20.1
+  version: 1.20.2.pre.rc1
 platform: ruby
 authors:
 - nickthecook@gmail.com
@@ -215,6 +215,7 @@ files:
 - lib/dependencies/docker.rb
 - lib/dependencies/gem.rb
 - lib/dependencies/helpers/apt_cache_policy.rb
+- lib/dependencies/helpers/ssh_key_decryptor.rb
 - lib/dependencies/pip.rb
 - lib/dependencies/snap.rb
 - lib/dependencies/sshkey.rb
@@ -249,9 +250,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.3.7
 signing_key: