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

fix compliance plugin

Browse source
This commit is contained in:
Christoph Hartmann 2016-04-26 16:07:57 -05:00
parent 95de29cd83
commit 8678ab6625
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/bundles/inspec-compliance/target.rb
View file

@ -14,7 +14,7 @@ module Compliance
name 'compliance' name 'compliance'
priority 500 priority 500
def self.resolve(target, opts = {}) def self.resolve(target, _opts = {})
# check for local scheme compliance:// # check for local scheme compliance://
uri = URI(target) uri = URI(target)
return nil unless URI(uri).scheme == 'compliance' return nil unless URI(uri).scheme == 'compliance'
@ -25,10 +25,8 @@ module Compliance
# verifies that the target e.g base/ssh exists # verifies that the target e.g base/ssh exists
profile = uri.host + uri.path profile = uri.host + uri.path
Compliance::API.exist?(profile) Compliance::API.exist?(config, profile)
super(target_url(config, profile), config)
opts['user'] = config['token']
super(target_url(config, profile), opts)
rescue URI::Error => _e rescue URI::Error => _e
nil nil
end end

9
lib/fetchers/url.rb
View file

@ -65,10 +65,15 @@ module Fetchers
# download url into archive using opts, # download url into archive using opts,
# returns File object and content-type from HTTP headers # returns File object and content-type from HTTP headers
def self.download_archive(url, opts) def self.download_archive(url, opts = {})
http_opts = {}
# http_opts['http_basic_authentication'] = [opts['user'] || '', opts['password'] || ''] if opts['user']
http_opts['ssl_verify_mode'.to_sym] = OpenSSL::SSL::VERIFY_NONE if opts['insecure']
http_opts['Authorization'] = "Bearer #{opts['token']}" if opts['token']
remote = open( remote = open(
url, url,
http_basic_authentication: [opts['user'] || '', opts['password'] || ''], http_opts,
) )
content_type = remote.meta['content-type'] content_type = remote.meta['content-type']