inspec-core 4.22.8 → 4.23.15
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile +2 -1
- data/inspec-core.gemspec +3 -5
- data/lib/bundles/inspec-supermarket/cli.rb +1 -1
- data/lib/inspec/base_cli.rb +11 -1
- data/lib/inspec/cli.rb +4 -2
- data/lib/inspec/config.rb +19 -1
- data/lib/inspec/input.rb +4 -3
- data/lib/inspec/input_registry.rb +7 -1
- data/lib/inspec/plugin/v2/plugin_types/reporter.rb +4 -31
- data/lib/inspec/reporters.rb +0 -3
- data/lib/inspec/reporters/automate.rb +3 -3
- data/lib/inspec/reporters/base.rb +7 -29
- data/lib/inspec/resources/apt.rb +5 -5
- data/lib/inspec/resources/bridge.rb +1 -1
- data/lib/inspec/resources/host.rb +1 -1
- data/lib/inspec/resources/mysql_session.rb +9 -5
- data/lib/inspec/resources/postgres.rb +1 -1
- data/lib/inspec/resources/postgres_session.rb +5 -3
- data/lib/inspec/resources/processes.rb +1 -1
- data/lib/inspec/resources/windows_firewall.rb +110 -0
- data/lib/inspec/resources/windows_firewall_rule.rb +137 -0
- data/lib/inspec/rule.rb +8 -8
- data/lib/inspec/run_data/profile.rb +3 -2
- data/lib/inspec/schema/exec_json.rb +1 -1
- data/lib/inspec/shell.rb +3 -3
- data/lib/inspec/utils/parser.rb +1 -1
- data/lib/inspec/utils/run_data_filters.rb +104 -0
- data/lib/inspec/version.rb +1 -1
- data/lib/plugins/inspec-compliance/lib/inspec-compliance/api.rb +4 -4
- data/lib/plugins/inspec-compliance/lib/inspec-compliance/cli.rb +1 -1
- data/lib/plugins/inspec-init/templates/profiles/aws/README.md +1 -1
- data/lib/plugins/inspec-reporter-html2/README.md +1 -1
- data/lib/plugins/inspec-reporter-junit/README.md +17 -0
- data/lib/plugins/inspec-reporter-junit/lib/inspec-reporter-junit.rb +21 -0
- data/lib/plugins/inspec-reporter-junit/lib/inspec-reporter-junit/reporter.rb +155 -0
- data/lib/plugins/inspec-reporter-junit/lib/inspec-reporter-junit/version.rb +5 -0
- data/lib/plugins/shared/core_plugin_test_helper.rb +0 -16
- metadata +17 -34
- data/README.md +0 -474
- data/lib/inspec/reporters/junit.rb +0 -77
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: a8d456ded6249283aa4db22d7dc054afeb37996472a16d9d8d007bd492f7a6c8
|
4
|
+
data.tar.gz: f355c608691df7895a0440a7f70a0ffb0f8cd0d7167da490dfcefeec45bba2bc
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: f9c878fa83d12844ea6d0b1a58da70d6e39650a41e5ad7b7041bfc11faee21c8ce67adee8c5eae29ef04a4734b7c916415d285dab888c0c776a80717037c049b
|
7
|
+
data.tar.gz: f072fbccdb85a007f3a33ba9294024b403eda80b184ee806a08226a47728681aaed1692ac61cbefde5fe7e965ea0db5e6306405e6c808f15d4011a44a6215542
|
data/Gemfile
CHANGED
@@ -19,12 +19,13 @@ group :omnibus do
|
|
19
19
|
end
|
20
20
|
|
21
21
|
group :test do
|
22
|
-
gem "chefstyle", "~>
|
22
|
+
gem "chefstyle", "~> 1.2.1"
|
23
23
|
gem "minitest", "~> 5.5"
|
24
24
|
gem "minitest-sprint", "~> 1.0"
|
25
25
|
gem "rake", ">= 10"
|
26
26
|
gem "simplecov", ["~> 0.10", "<=0.18.2"]
|
27
27
|
gem "concurrent-ruby", "~> 1.0"
|
28
|
+
gem "nokogiri", "~> 1.9"
|
28
29
|
gem "mocha", "~> 1.1"
|
29
30
|
gem "ruby-progressbar", "~> 1.8"
|
30
31
|
gem "webmock", "~> 3.0"
|
data/inspec-core.gemspec
CHANGED
@@ -17,14 +17,14 @@ Gem::Specification.new do |spec|
|
|
17
17
|
|
18
18
|
# the gemfile and gemspec are necessary for appbundler so don't remove it
|
19
19
|
spec.files =
|
20
|
-
Dir.glob("{{lib,etc}/**/*,
|
20
|
+
Dir.glob("{{lib,etc}/**/*,LICENSE,Gemfile,inspec-core.gemspec}")
|
21
21
|
.grep_v(%r{(?<!inspec-init/templates/profiles/)(aws|azure|gcp)})
|
22
22
|
.grep_v(%r{lib/plugins/.*/test/})
|
23
23
|
.reject { |f| File.directory?(f) }
|
24
24
|
|
25
25
|
# Implementation dependencies
|
26
26
|
spec.add_dependency "chef-telemetry", "~> 1.0"
|
27
|
-
spec.add_dependency "license-acceptance", ">= 0.2.13", "<
|
27
|
+
spec.add_dependency "license-acceptance", ">= 0.2.13", "< 3.0"
|
28
28
|
spec.add_dependency "thor", ">= 0.20", "< 2.0"
|
29
29
|
spec.add_dependency "json_schemer", ">= 0.2.1", "< 0.2.12"
|
30
30
|
spec.add_dependency "method_source", ">= 0.8", "< 2.0"
|
@@ -36,16 +36,14 @@ Gem::Specification.new do |spec|
|
|
36
36
|
spec.add_dependency "mixlib-log", "~> 3.0"
|
37
37
|
spec.add_dependency "sslshake", "~> 1.2"
|
38
38
|
spec.add_dependency "parallel", "~> 1.9"
|
39
|
-
spec.add_dependency "faraday", ">= 0.9.0"
|
39
|
+
spec.add_dependency "faraday", ">= 0.9.0", "< 1.1"
|
40
40
|
spec.add_dependency "tty-table", "~> 0.10"
|
41
41
|
spec.add_dependency "tty-prompt", "~> 0.17"
|
42
42
|
spec.add_dependency "tomlrb", "~> 1.2.0"
|
43
43
|
spec.add_dependency "addressable", "~> 2.4"
|
44
44
|
spec.add_dependency "parslet", "~> 1.5"
|
45
45
|
spec.add_dependency "semverse", "~> 3.0"
|
46
|
-
spec.add_dependency "htmlentities", "~> 4.3" # TODO: remove when #4853 fixed
|
47
46
|
spec.add_dependency "multipart-post", "~> 2.0"
|
48
|
-
spec.add_dependency "term-ansicolor", "~> 1.7"
|
49
47
|
|
50
48
|
spec.add_dependency "train-core", "~> 3.0"
|
51
49
|
end
|
@@ -5,7 +5,7 @@ module Supermarket
|
|
5
5
|
class SupermarketCLI < Inspec::BaseCLI
|
6
6
|
namespace "supermarket"
|
7
7
|
|
8
|
-
# TODO: find another solution, once https://github.com/erikhuda/thor/issues/261 is fixed
|
8
|
+
# TODO: find another solution, once https://github.com/erikhuda/thor/issues/261 is fixed.
|
9
9
|
def self.banner(command, _namespace = nil, _subcommand = false)
|
10
10
|
"#{basename} #{subcommand_prefix} #{command.usage}"
|
11
11
|
end
|
data/lib/inspec/base_cli.rb
CHANGED
@@ -60,7 +60,7 @@ module Inspec
|
|
60
60
|
true
|
61
61
|
end
|
62
62
|
|
63
|
-
def self.target_options # rubocop:disable MethodLength
|
63
|
+
def self.target_options # rubocop:disable Metrics/MethodLength
|
64
64
|
option :target, aliases: :t, type: :string,
|
65
65
|
desc: "Simple targeting option using URIs, e.g. ssh://user:pass@host:port"
|
66
66
|
option :backend, aliases: :b, type: :string,
|
@@ -158,6 +158,16 @@ module Inspec
|
|
158
158
|
option :silence_deprecations, type: :array,
|
159
159
|
banner: "[all]|[GROUP GROUP...]",
|
160
160
|
desc: "Suppress deprecation warnings. See install_dir/etc/deprecations.json for list of GROUPs or use 'all'."
|
161
|
+
option :diff, type: :boolean, default: true,
|
162
|
+
desc: "Use --no-diff to suppress 'diff' output of failed textual test results."
|
163
|
+
option :sort_results_by, type: :string, default: "file", banner: "--sort-results-by=none|control|file|random",
|
164
|
+
desc: "After normal execution order, results are sorted by control ID, or by file (default), or randomly. None uses legacy unsorted mode."
|
165
|
+
end
|
166
|
+
|
167
|
+
def self.help(*args)
|
168
|
+
super(*args)
|
169
|
+
puts "\nAbout #{Inspec::Dist::PRODUCT_NAME}:"
|
170
|
+
puts " Patents: chef.io/patents\n\n"
|
161
171
|
end
|
162
172
|
|
163
173
|
def self.format_platform_info(params: {}, indent: 0, color: 39)
|
data/lib/inspec/cli.rb
CHANGED
@@ -48,7 +48,8 @@ class Inspec::InspecCLI < Inspec::BaseCLI
|
|
48
48
|
desc: "Allow or disable user interaction"
|
49
49
|
|
50
50
|
class_option :disable_core_plugins, type: :string, banner: "", # Actually a boolean, but this suppresses the creation of a --no-disable...
|
51
|
-
desc: "Disable loading all plugins that are shipped in the lib/plugins directory of InSpec. Useful in development."
|
51
|
+
desc: "Disable loading all plugins that are shipped in the lib/plugins directory of InSpec. Useful in development.",
|
52
|
+
hide: true
|
52
53
|
|
53
54
|
class_option :disable_user_plugins, type: :string, banner: "",
|
54
55
|
desc: "Disable loading all plugins that the user installed."
|
@@ -194,7 +195,8 @@ class Inspec::InspecCLI < Inspec::BaseCLI
|
|
194
195
|
pretty_handle_exception(e)
|
195
196
|
end
|
196
197
|
|
197
|
-
desc "exec LOCATIONS",
|
198
|
+
desc "exec LOCATIONS", "Run all tests at LOCATIONS."
|
199
|
+
long_desc <<~EOT
|
198
200
|
Run all test files at the specified LOCATIONS.
|
199
201
|
|
200
202
|
Loads the given profile(s) and fetches their dependencies if needed. Then
|
data/lib/inspec/config.rb
CHANGED
@@ -344,7 +344,6 @@ module Inspec
|
|
344
344
|
cli
|
345
345
|
json
|
346
346
|
json-automate
|
347
|
-
junit
|
348
347
|
yaml
|
349
348
|
}
|
350
349
|
|
@@ -406,6 +405,18 @@ module Inspec
|
|
406
405
|
@plugin_cfg = data
|
407
406
|
end
|
408
407
|
|
408
|
+
def validate_sort_results_by!(option_value)
|
409
|
+
expected = %w{
|
410
|
+
none
|
411
|
+
control
|
412
|
+
file
|
413
|
+
random
|
414
|
+
}
|
415
|
+
return if expected.include? option_value
|
416
|
+
|
417
|
+
raise Inspec::ConfigError::Invalid, "--sort-results-by must be one of #{expected.join(", ")}"
|
418
|
+
end
|
419
|
+
|
409
420
|
#-----------------------------------------------------------------------#
|
410
421
|
# Merging Options
|
411
422
|
#-----------------------------------------------------------------------#
|
@@ -436,6 +447,7 @@ module Inspec
|
|
436
447
|
finalize_parse_reporters(options)
|
437
448
|
finalize_handle_sudo(options)
|
438
449
|
finalize_compliance_login(options)
|
450
|
+
finalize_sort_results(options)
|
439
451
|
|
440
452
|
Thor::CoreExt::HashWithIndifferentAccess.new(options)
|
441
453
|
end
|
@@ -510,6 +522,12 @@ module Inspec
|
|
510
522
|
end
|
511
523
|
end
|
512
524
|
|
525
|
+
def finalize_sort_results(options)
|
526
|
+
if options.key?("sort_results_by")
|
527
|
+
validate_sort_results_by!(options["sort_results_by"])
|
528
|
+
end
|
529
|
+
end
|
530
|
+
|
513
531
|
class Defaults
|
514
532
|
DEFAULTS = {
|
515
533
|
exec: {
|
data/lib/inspec/input.rb
CHANGED
@@ -171,7 +171,7 @@ module Inspec
|
|
171
171
|
# are free to go higher.
|
172
172
|
DEFAULT_PRIORITY_FOR_VALUE_SET = 60
|
173
173
|
|
174
|
-
attr_reader :description, :events, :identifier, :name, :required, :title, :type
|
174
|
+
attr_reader :description, :events, :identifier, :name, :required, :sensitive, :title, :type
|
175
175
|
|
176
176
|
def initialize(name, options = {})
|
177
177
|
@name = name
|
@@ -264,6 +264,7 @@ module Inspec
|
|
264
264
|
@required = options[:required] if options.key?(:required)
|
265
265
|
@identifier = options[:identifier] if options.key?(:identifier) # TODO: determine if this is ever used
|
266
266
|
@type = options[:type] if options.key?(:type)
|
267
|
+
@sensitive = options[:sensitive] if options.key?(:sensitive)
|
267
268
|
end
|
268
269
|
|
269
270
|
def make_creation_event(options)
|
@@ -320,7 +321,7 @@ module Inspec
|
|
320
321
|
|
321
322
|
def to_hash
|
322
323
|
as_hash = { name: name, options: {} }
|
323
|
-
%i{description title identifier type required value}.each do |field|
|
324
|
+
%i{description title identifier type required value sensitive}.each do |field|
|
324
325
|
val = send(field)
|
325
326
|
next if val.nil?
|
326
327
|
|
@@ -334,7 +335,7 @@ module Inspec
|
|
334
335
|
#--------------------------------------------------------------------------#
|
335
336
|
|
336
337
|
def to_s
|
337
|
-
"Input #{name} with #{current_value}"
|
338
|
+
"Input #{name} with value " + (sensitive ? "*** (senstive)" : "#{current_value}")
|
338
339
|
end
|
339
340
|
|
340
341
|
#--------------------------------------------------------------------------#
|
@@ -29,6 +29,8 @@ module Inspec
|
|
29
29
|
def_delegator :inputs_by_profile, :select
|
30
30
|
def_delegator :profile_aliases, :key?, :profile_alias?
|
31
31
|
|
32
|
+
attr_accessor :cache_inputs
|
33
|
+
|
32
34
|
def initialize
|
33
35
|
# Keyed on String profile_name => Hash of String input_name => Input object
|
34
36
|
@inputs_by_profile = {}
|
@@ -43,6 +45,9 @@ module Inspec
|
|
43
45
|
activator.activate!
|
44
46
|
activator.implementation_class.new
|
45
47
|
end
|
48
|
+
|
49
|
+
# Activate caching for inputs by default
|
50
|
+
@cache_inputs = true
|
46
51
|
end
|
47
52
|
|
48
53
|
#-------------------------------------------------------------#
|
@@ -84,7 +89,7 @@ module Inspec
|
|
84
89
|
|
85
90
|
# Find or create the input
|
86
91
|
inputs_by_profile[profile_name] ||= {}
|
87
|
-
if inputs_by_profile[profile_name].key?(input_name)
|
92
|
+
if inputs_by_profile[profile_name].key?(input_name) && cache_inputs
|
88
93
|
inputs_by_profile[profile_name][input_name].update(options)
|
89
94
|
else
|
90
95
|
inputs_by_profile[profile_name][input_name] = Inspec::Input.new(input_name, options)
|
@@ -316,6 +321,7 @@ module Inspec
|
|
316
321
|
profile_name,
|
317
322
|
type: input_options[:type],
|
318
323
|
required: input_options[:required],
|
324
|
+
sensitive: input_options[:sensitive],
|
319
325
|
event: evt
|
320
326
|
)
|
321
327
|
end
|
@@ -1,18 +1,20 @@
|
|
1
1
|
require_relative "../../../run_data"
|
2
|
+
require_relative "../../../utils/run_data_filters"
|
2
3
|
|
3
4
|
module Inspec::Plugin::V2::PluginType
|
4
5
|
class Reporter < Inspec::Plugin::V2::PluginBase
|
5
6
|
register_plugin_type(:reporter)
|
7
|
+
include Inspec::Utils::RunDataFilters
|
6
8
|
|
7
9
|
attr_reader :run_data
|
8
10
|
|
9
11
|
def initialize(config)
|
10
12
|
@config = config
|
11
13
|
|
12
|
-
#
|
14
|
+
# Filter the run_data while still a Hash; if it is huge, this
|
13
15
|
# saves on conversion time
|
14
16
|
@run_data = config[:run_data] || {}
|
15
|
-
|
17
|
+
apply_run_data_filters_to_hash
|
16
18
|
|
17
19
|
unless Inspec::RunData.compatible_schema?(self.class.run_data_schema_constraints)
|
18
20
|
# Best we can do is warn here, the InSpec run has finished
|
@@ -24,26 +26,6 @@ module Inspec::Plugin::V2::PluginType
|
|
24
26
|
@output = ""
|
25
27
|
end
|
26
28
|
|
27
|
-
# This is a temporary duplication of code from lib/inspec/reporters/base.rb
|
28
|
-
# To be DRY'd up once the core reporters become plugins...
|
29
|
-
# Apply options such as message truncation and removal of backtraces
|
30
|
-
def apply_report_resize_options
|
31
|
-
runtime_config = Inspec::Config.cached.respond_to?(:final_options) ? Inspec::Config.cached.final_options : {}
|
32
|
-
|
33
|
-
message_truncation = runtime_config[:reporter_message_truncation] || "ALL"
|
34
|
-
@trunc = message_truncation == "ALL" ? -1 : message_truncation.to_i
|
35
|
-
include_backtrace = runtime_config[:reporter_backtrace_inclusion].nil? ? true : runtime_config[:reporter_backtrace_inclusion]
|
36
|
-
|
37
|
-
@run_data[:profiles]&.each do |p|
|
38
|
-
p[:controls].each do |c|
|
39
|
-
c[:results]&.map! do |r|
|
40
|
-
r.delete(:backtrace) unless include_backtrace
|
41
|
-
process_message_truncation(r)
|
42
|
-
end
|
43
|
-
end
|
44
|
-
end
|
45
|
-
end
|
46
|
-
|
47
29
|
def output(str, newline = true)
|
48
30
|
@output << str
|
49
31
|
@output << "\n" if newline
|
@@ -61,14 +43,5 @@ module Inspec::Plugin::V2::PluginType
|
|
61
43
|
def self.run_data_schema_constraints
|
62
44
|
raise NotImplementedError, "#{self.class} must implement a `run_data_schema_constraints` class method to declare its compatibiltity with the RunData API."
|
63
45
|
end
|
64
|
-
|
65
|
-
private
|
66
|
-
|
67
|
-
def process_message_truncation(result)
|
68
|
-
if result.key?(:message) && result[:message] != "" && @trunc > -1 && result[:message].length > @trunc
|
69
|
-
result[:message] = result[:message][0...@trunc] + "[Truncated to #{@trunc} characters]"
|
70
|
-
end
|
71
|
-
result
|
72
|
-
end
|
73
46
|
end
|
74
47
|
end
|
data/lib/inspec/reporters.rb
CHANGED
@@ -2,7 +2,6 @@ require "inspec/reporters/base"
|
|
2
2
|
require "inspec/reporters/cli"
|
3
3
|
require "inspec/reporters/json"
|
4
4
|
require "inspec/reporters/json_automate"
|
5
|
-
require "inspec/reporters/junit"
|
6
5
|
require "inspec/reporters/automate"
|
7
6
|
require "inspec/reporters/yaml"
|
8
7
|
|
@@ -20,8 +19,6 @@ module Inspec::Reporters
|
|
20
19
|
# right to introduce breaking changes to this reporter at any time.
|
21
20
|
when "json-automate"
|
22
21
|
reporter = Inspec::Reporters::JsonAutomate.new(config)
|
23
|
-
when "junit"
|
24
|
-
reporter = Inspec::Reporters::Junit.new(config)
|
25
22
|
when "automate"
|
26
23
|
reporter = Inspec::Reporters::Automate.new(config)
|
27
24
|
when "yaml"
|
@@ -49,14 +49,14 @@ module Inspec::Reporters
|
|
49
49
|
|
50
50
|
res = http.request(req)
|
51
51
|
if res.is_a?(Net::HTTPSuccess)
|
52
|
-
|
52
|
+
true
|
53
53
|
else
|
54
54
|
Inspec::Log.error "send_report: POST to #{uri.path} returned: #{res.body}"
|
55
|
-
|
55
|
+
false
|
56
56
|
end
|
57
57
|
rescue => e
|
58
58
|
Inspec::Log.error "send_report: POST to #{uri.path} returned: #{e.message}"
|
59
|
-
|
59
|
+
false
|
60
60
|
end
|
61
61
|
end
|
62
62
|
|
@@ -1,30 +1,17 @@
|
|
1
|
+
require_relative "../utils/run_data_filters"
|
2
|
+
|
1
3
|
module Inspec::Reporters
|
2
4
|
class Base
|
5
|
+
include Inspec::Utils::RunDataFilters
|
6
|
+
|
3
7
|
attr_reader :run_data
|
4
8
|
|
5
9
|
def initialize(config)
|
6
10
|
@config = config
|
7
|
-
@run_data = config[:run_data]
|
8
|
-
|
9
|
-
@output = ""
|
10
|
-
end
|
11
|
-
|
12
|
-
# Apply options such as message truncation and removal of backtraces
|
13
|
-
def apply_report_resize_options
|
14
|
-
runtime_config = Inspec::Config.cached.respond_to?(:final_options) ? Inspec::Config.cached.final_options : {}
|
11
|
+
@run_data = config[:run_data] || {}
|
12
|
+
apply_run_data_filters_to_hash
|
15
13
|
|
16
|
-
|
17
|
-
@trunc = message_truncation == "ALL" ? -1 : message_truncation.to_i
|
18
|
-
include_backtrace = runtime_config[:reporter_backtrace_inclusion].nil? ? true : runtime_config[:reporter_backtrace_inclusion]
|
19
|
-
|
20
|
-
@run_data[:profiles]&.each do |p|
|
21
|
-
p[:controls].each do |c|
|
22
|
-
c[:results]&.map! do |r|
|
23
|
-
r.delete(:backtrace) unless include_backtrace
|
24
|
-
process_message_truncation(r)
|
25
|
-
end
|
26
|
-
end
|
27
|
-
end
|
14
|
+
@output = ""
|
28
15
|
end
|
29
16
|
|
30
17
|
def output(str, newline = true)
|
@@ -40,14 +27,5 @@ module Inspec::Reporters
|
|
40
27
|
def render
|
41
28
|
raise NotImplementedError, "#{self.class} must implement a `#render` method to format its output."
|
42
29
|
end
|
43
|
-
|
44
|
-
private
|
45
|
-
|
46
|
-
def process_message_truncation(result)
|
47
|
-
if result.key?(:message) && result[:message] != "" && @trunc > -1 && result[:message].length > @trunc
|
48
|
-
result[:message] = result[:message][0...@trunc] + "[Truncated to #{@trunc} characters]"
|
49
|
-
end
|
50
|
-
result
|
51
|
-
end
|
52
30
|
end
|
53
31
|
end
|
data/lib/inspec/resources/apt.rb
CHANGED
@@ -87,13 +87,13 @@ module Inspec::Resources
|
|
87
87
|
active = raw_line == line
|
88
88
|
|
89
89
|
# formats:
|
90
|
-
# deb
|
91
|
-
# deb
|
92
|
-
# deb [trusted=yes]
|
90
|
+
# deb "http://archive.ubuntu.com/ubuntu/" wily main restricted ...
|
91
|
+
# deb http://archive.ubuntu.com/ubuntu/ wily main restricted ...
|
92
|
+
# deb [trusted=yes] http://archive.ubuntu.com/ubuntu/ wily main restricted ...
|
93
|
+
# deb [arch=amd64 trusted=yes] http://archive.ubuntu.com/ubuntu/ wily main restricted ...
|
93
94
|
# deb cdrom:[Ubuntu 15.10 _Wily Werewolf_ - Release amd64 (20151021)]/ wily main restricted ...
|
94
95
|
|
95
|
-
words = line.split
|
96
|
-
words.delete_at 1 if words[1] && words[1].start_with?("[")
|
96
|
+
words = line.sub(/^(deb|deb-src)\s+\[.+?\]/, '\1').split
|
97
97
|
type, url, distro, *components = words
|
98
98
|
url = url.delete('"') if url
|
99
99
|
|
@@ -27,7 +27,7 @@ module Inspec::Resources
|
|
27
27
|
elsif inspec.os.windows?
|
28
28
|
@bridge_provider = WindowsBridge.new(inspec)
|
29
29
|
else
|
30
|
-
|
30
|
+
skip_resource "The `bridge` resource is not supported on your OS yet."
|
31
31
|
end
|
32
32
|
end
|
33
33
|
|
@@ -71,7 +71,7 @@ module Inspec::Resources
|
|
71
71
|
|
72
72
|
missing_requirements = @host_provider.missing_requirements(protocol)
|
73
73
|
unless missing_requirements.empty?
|
74
|
-
|
74
|
+
skip_resource "The following requirements are not met for this resource: " \
|
75
75
|
"#{missing_requirements.join(", ")}"
|
76
76
|
end
|
77
77
|
end
|
@@ -5,11 +5,15 @@ require "shellwords"
|
|
5
5
|
|
6
6
|
module Inspec::Resources
|
7
7
|
class Lines
|
8
|
-
attr_reader :output
|
8
|
+
attr_reader :output, :stdout, :stderr, :exit_status
|
9
9
|
|
10
|
-
def initialize(raw, desc)
|
10
|
+
def initialize(raw, desc, exit_status)
|
11
11
|
@output = raw
|
12
12
|
@desc = desc
|
13
|
+
@exit_status = exit_status
|
14
|
+
# backwards compatibility
|
15
|
+
@stdout = raw
|
16
|
+
@stderr = raw
|
13
17
|
end
|
14
18
|
|
15
19
|
def lines
|
@@ -29,7 +33,7 @@ module Inspec::Resources
|
|
29
33
|
example <<~EXAMPLE
|
30
34
|
sql = mysql_session('my_user','password','host')
|
31
35
|
describe sql.query('show databases like \'test\';') do
|
32
|
-
its('
|
36
|
+
its('output') { should_not match(/test/) }
|
33
37
|
end
|
34
38
|
EXAMPLE
|
35
39
|
|
@@ -52,9 +56,9 @@ module Inspec::Resources
|
|
52
56
|
end
|
53
57
|
out = cmd.stdout + "\n" + cmd.stderr
|
54
58
|
if cmd.exit_status != 0 || out =~ /Can't connect to .* MySQL server/ || out.downcase =~ /^error:.*/
|
55
|
-
Lines.new(out, "MySQL query with errors: #{q}")
|
59
|
+
Lines.new(out, "MySQL query with errors: #{q}", cmd.exit_status)
|
56
60
|
else
|
57
|
-
Lines.new(cmd.stdout.strip, "MySQL query: #{q}")
|
61
|
+
Lines.new(cmd.stdout.strip, "MySQL query: #{q}", cmd.exit_status)
|
58
62
|
end
|
59
63
|
end
|
60
64
|
|