Mirrors/inspec
2
0
Fork 0
mirror of https://github.com/inspec/inspec synced 2024-11-10 07:04:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

ssl resource to use inspec.backend.hostname and require train 0.19.1

Browse source
This commit is contained in:
Alex Pop 2016-09-16 10:41:22 +01:00
parent 913a8fdc40
commit 8a470c16f1
2 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
inspec.gemspec
View file

@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
spec.require_paths = ['lib'] spec.require_paths = ['lib']
spec.add_dependency 'train', '>=0.19.0', '<1.0' spec.add_dependency 'train', '>=0.19.1', '<1.0'
spec.add_dependency 'thor', '~> 0.19' spec.add_dependency 'thor', '~> 0.19'
spec.add_dependency 'json', '>= 1.8', '< 3.0' spec.add_dependency 'json', '>= 1.8', '< 3.0'
spec.add_dependency 'rainbow', '~> 2' spec.add_dependency 'rainbow', '~> 2'

20
lib/resources/ssl.rb
View file

@ -44,18 +44,16 @@ class SSL < Inspec.resource(1)
attr_reader :host, :port attr_reader :host, :port
def initialize(opts = {}) def initialize(opts = {})
@host = opts[:host] || @host = opts[:host]
inspec.backend.instance_variable_get(:@hostname)
# FIXME: This can be removed when/if @hostname is available as a property for 'Train::Transports::WinRM::Connection'
# Train enhancement request for this here: https://github.com/chef/train/issues/128
if @host.nil? && inspec.backend.class.to_s == 'Train::Transports::WinRM::Connection'
@host = URI.parse(inspec.backend.instance_variable_get(:@options)[:endpoint]).hostname
end
if @host.nil? && inspec.backend.class.to_s == 'Train::Transports::Local::Connection'
@host = 'localhost'
end
if @host.nil? if @host.nil?
fail 'Cannot determine host for SSL test. Please specify it or use a different target.' # Transports like SSH and WinRM will provide a hostname
if inspec.backend.respond_to?('hostname')
@host = inspec.backend.hostname
elsif inspec.backend.class.to_s == 'Train::Transports::Local::Connection'
@host = 'localhost'
else
fail 'Cannot determine host for SSL test. Please specify it or use a different target.'
end
end end
@port = opts[:port] || 443 @port = opts[:port] || 443
@timeout = opts[:timeout] @timeout = opts[:timeout]