inspec 4.7.3 → 4.7.18

data/lib/inspec/reporters/json.rb

@@ -120,6 +120,7 @@ module Inspec::Reporters
 
     def convert_descriptions(data)
       return [] if data.nil?
+
       results = []
       data.each do |label, text|
         results.push({ label: label.to_s, data: text })

data/lib/inspec/reporters/json_automate.rb

@@ -36,6 +36,7 @@ module Inspec::Reporters
     def merge_profiles
       @profiles.each do |profile|
         next unless profile.key?(:parent_profile)
+
         parent_profile = find_master_parent(profile)
         merge_controls(parent_profile, profile)
         merge_depends(parent_profile, profile)
@@ -62,6 +63,7 @@ module Inspec::Reporters
         control.each do |name, _value|
           child_value = child_control[name]
           next if child_value.nil? || (child_value.respond_to?(:empty?) && child_value.empty?)
+
           control[name] = child_value
         end
       end
@@ -69,6 +71,7 @@ module Inspec::Reporters
 
     def merge_depends(parent, child)
       return unless child.key?(:depends)
+
       child[:depends].each do |d|
         parent[:depends] << d
       end

data/lib/inspec/reporters/json_min.rb

@@ -17,9 +17,11 @@ module Inspec::Reporters
       run_data[:profiles].each do |profile|
         profile_id = profile[:name]
         next unless profile[:controls]
+
         profile[:controls].each do |control|
           control_id = control[:id]
           next unless control[:results]
+
           control[:results].each do |result|
             result_for_report = {
               id: control_id,

data/lib/inspec/resource.rb

@@ -41,6 +41,7 @@ module Inspec
                           end
 
           raise ProfileNotFound, "Cannot find profile named: #{profile_name}" if inner_context.nil?
+
           inner_context.resource_registry[resource_name]
         end
 
@@ -51,6 +52,7 @@ module Inspec
 
           # confirm backend custom resources have access to other custom resources
           next if backend.respond_to?(id)
+
           backend.class.send(:define_method, id.to_sym) do |*args|
             r.new(backend, id.to_s, *args)
           end

data/lib/inspec/resources/aide_conf.rb

@@ -44,7 +44,7 @@ module Inspec::Resources
 
     filter = FilterTable.create
     filter.register_column(:selection_lines, field: "selection_line")
-          .register_column(:rules,           field: "rules")
+      .register_column(:rules, field: "rules")
 
     filter.install_filter_methods_on_resource(self, :params)
 
@@ -52,6 +52,7 @@ module Inspec::Resources
 
     def read_content
       return @content unless @content.nil?
+
       @rules = {}
 
       raw_conf = read_file_content(@conf_path)
@@ -74,7 +75,7 @@ module Inspec::Resources
       params = []
       content.each do |line|
         param = parse_line(line)
-        if !param["selection_line"].nil?
+        unless param["selection_line"].nil?
           params.push(param)
         end
       end
@@ -116,7 +117,7 @@ module Inspec::Resources
       rule_list.each_index do |i|
         hash_list = @rules[rule_list[i]]
         # Cases where rule respresents one or more other rules
-        if !hash_list.nil?
+        unless hash_list.nil?
           rule_list[i] = hash_list
         end
         rule_list[i] = handle_multi_rule(rule_list, i)

data/lib/inspec/resources/apache_conf.rb

@@ -53,7 +53,7 @@ module Inspec::Resources
     def filter_comments(data)
       content = ""
       data.each_line do |line|
-        if !line.match(/^\s*#/)
+        unless line.match(/^\s*#/)
           content << line
         end
       end

data/lib/inspec/resources/apt.rb

@@ -55,6 +55,7 @@ module Inspec::Resources
 
     def enabled?
       return false if find_repo.count == 0
+
       actives = find_repo.map { |repo| repo[:active] }
       actives = actives.uniq
       actives.size == 1 && actives[0] = true
@@ -113,6 +114,7 @@ module Inspec::Resources
     def determine_ppa_url(ppa_url)
       # verify if we have the url already, then just return
       return ppa_url if ppa_url =~ HTTP_URL_RE
+
       # otherwise start generating the ppa url
 
       # special care if the name stats with :

data/lib/inspec/resources/auditd.rb

@@ -30,7 +30,7 @@ module Inspec::Resources
     def initialize
       unless inspec.command("/sbin/auditctl").exist?
         raise Inspec::Exceptions::ResourceFailed,
-              "Command `/sbin/auditctl` does not exist"
+          "Command `/sbin/auditctl` does not exist"
       end
 
       auditctl_cmd = "/sbin/auditctl -l"
@@ -38,32 +38,32 @@ module Inspec::Resources
 
       if result.exit_status != 0
         raise Inspec::Exceptions::ResourceFailed,
-              "Command `#{auditctl_cmd}` failed with error: #{result.stderr}"
+          "Command `#{auditctl_cmd}` failed with error: #{result.stderr}"
       end
 
       @content = result.stdout
       @params = []
 
       if @content =~ /^LIST_RULES:/
-        raise Inspec::Exceptions::RsourceFailed,
-              "The version of audit is outdated." \
-              "The `auditd` resource supports versions of audit >= 2.3."
+        raise Inspec::Exceptions::ResourceFailed,
+          "The version of audit is outdated." \
+          "The `auditd` resource supports versions of audit >= 2.3."
       end
       parse_content
     end
 
     filter = FilterTable.create
-    filter.register_column(:file,         field: "file")
-          .register_column(:list,         field: "list")
-          .register_column(:action,       field: "action")
-          .register_column(:fields,       field: "fields")
-          .register_column(:fields_nokey, field: "fields_nokey")
-          .register_column(:syscall,      field: "syscall")
-          .register_column(:key,          field: "key")
-          .register_column(:arch,         field: "arch")
-          .register_column(:path,         field: "path")
-          .register_column(:permissions,  field: "permissions")
-          .register_column(:exit,         field: "exit")
+    filter.register_column(:file, field: "file")
+      .register_column(:list,         field: "list")
+      .register_column(:action,       field: "action")
+      .register_column(:fields,       field: "fields")
+      .register_column(:fields_nokey, field: "fields_nokey")
+      .register_column(:syscall,      field: "syscall")
+      .register_column(:key,          field: "key")
+      .register_column(:arch,         field: "arch")
+      .register_column(:path,         field: "path")
+      .register_column(:permissions,  field: "permissions")
+      .register_column(:exit,         field: "exit")
 
     filter.install_filter_methods_on_resource(self, :params)
 
@@ -73,13 +73,14 @@ module Inspec::Resources
       # See: https://github.com/inspec/inspec/issues/3113
       if @status_content =~ /^AUDIT_STATUS/
         @status_content = @status_content.gsub("AUDIT_STATUS: ", "")
-                                         .tr(" ", "\n")
-                                         .tr("=", " ")
+          .tr(" ", "\n")
+          .tr("=", " ")
       end
 
       @status_params ||= Hash[@status_content.scan(/^([^ ]+) (.*)$/)]
 
       return @status_params[name] if name
+
       @status_params
     end
 

data/lib/inspec/resources/bridge.rb

@@ -37,6 +37,7 @@ module Inspec::Resources
 
     def has_interface?(interface)
       return skip_resource "The `bridge` resource does not provide interface detection for Windows yet" if inspec.os.windows?
+
       bridge_info.nil? ? false : bridge_info[:interfaces].include?(interface)
     end
 
@@ -52,7 +53,8 @@ module Inspec::Resources
 
     def bridge_info
       return @cache if defined?(@cache)
-      @cache = @bridge_provider.bridge_info(@bridge_name) if !@bridge_provider.nil?
+
+      @cache = @bridge_provider.bridge_info(@bridge_name) unless @bridge_provider.nil?
     end
   end
 
@@ -102,7 +104,7 @@ module Inspec::Resources
       end
 
       # ensure we have an array of groups
-      bridges = [bridges] if !bridges.is_a?(Array)
+      bridges = [bridges] unless bridges.is_a?(Array)
 
       # select the requested interface
       bridges = bridges.each_with_object([]) do |adapter, adapter_collection|
@@ -115,6 +117,7 @@ module Inspec::Resources
       end
 
       return nil if bridges.empty?
+
       warn "[Possible Error] detected multiple bridges interfaces with the name #{bridge_name}" if bridges.size > 1
       bridges[0]
     end

data/lib/inspec/resources/chocolatey_package.rb

@@ -20,6 +20,7 @@ module Inspec::Resources
 
     def initialize(package_name, _opts = {})
       raise "Chocolatey is not installed" unless inspec.command("choco").exist?
+
       @package_name = package_name
       @cache = base_data.update(generate_cache)
     end
@@ -67,6 +68,7 @@ module Inspec::Resources
       cmd = inspec.powershell(command.strip)
 
       return {} if cmd.exit_status != 0 || cmd.stdout.strip.empty?
+
       out = JSON.parse(cmd.stdout)
 
       {

data/lib/inspec/resources/command.rb

@@ -35,7 +35,7 @@ module Inspec::Resources
           # Make sure command is replaced so sensitive output isn't shown
           @command = "ERROR"
           raise Inspec::Exceptions::ResourceFailed,
-                "The `redact_regex` option must be a regular expression"
+            "The `redact_regex` option must be a regular expression"
         end
         @redact_regex = options[:redact_regex]
       end

data/lib/inspec/resources/crontab.rb

@@ -50,7 +50,8 @@ module Inspec::Resources
 
     def read_crontab
       if is_system_crontab?
-        raise Inspec::Exceptions::ResourceFailed, "Supplied crontab path '#{@path}' must exist!" if !inspec.file(@path).exist?
+        raise Inspec::Exceptions::ResourceFailed, "Supplied crontab path '#{@path}' must exist!" unless inspec.file(@path).exist?
+
         ct = inspec.file(@path).content
       else
         ct = inspec.command(crontab_cmd).stdout
@@ -70,13 +71,13 @@ module Inspec::Resources
     end
 
     filter = FilterTable.create
-    filter.register_column(:minutes,  field: "minute")
-          .register_column(:hours,    field: "hour")
-          .register_column(:days,     field: "day")
-          .register_column(:months,   field: "month")
-          .register_column(:weekdays, field: "weekday")
-          .register_column(:user,     field: "user")
-          .register_column(:commands, field: "command")
+    filter.register_column(:minutes, field: "minute")
+      .register_column(:hours,    field: "hour")
+      .register_column(:days,     field: "day")
+      .register_column(:months,   field: "month")
+      .register_column(:weekdays, field: "weekday")
+      .register_column(:user,     field: "user")
+      .register_column(:commands, field: "command")
 
     # rebuild the crontab line from raw content
     filter.register_custom_property(:content) do |t, _|

data/lib/inspec/resources/csv.rb

@@ -28,7 +28,7 @@ module Inspec::Resources
       end
 
       # implicit conversion of values
-      csv = CSV.new(content, headers: true, converters: [:all, :blank_to_nil])
+      csv = CSV.new(content, headers: true, converters: %i{all blank_to_nil})
 
       # convert to hash
       csv.to_a.map(&:to_hash)

data/lib/inspec/resources/dh_params.rb

@@ -36,36 +36,42 @@ class DhParams < Inspec.resource(1)
   # its('generator') { should eq 2 }
   def generator
     return if @dh_params.nil?
+
     @dh_params.g.to_i
   end
 
   # its('modulus') { should eq '00:91:a0:15:89:e5:bc:38:93:12:02:fc:...' }
   def modulus
     return if @dh_params.nil?
+
     "00:" + @dh_params.p.to_s(16).downcase.scan(/.{2}/).join(":")
   end
 
   # its('pem') { should eq '-----BEGIN DH PARAMETERS...' }
   def pem
     return if @dh_params.nil?
+
     @dh_params.to_pem
   end
 
   # its('prime_length') { should be 2048 }
   def prime_length
     return if @dh_params.nil?
+
     @dh_params.p.num_bits
   end
 
   # its('text') { should eq 'human-readable-text' }
   def text
     return if @dh_params.nil?
+
     @dh_params.to_text
   end
 
   # it { should be_valid }
   def valid?
     return if @dh_params.nil?
+
     @dh_params.params_ok?
   end
 

data/lib/inspec/resources/docker.rb

@@ -11,21 +11,21 @@ module Inspec::Resources
     # use filtertable for containers
     filter = FilterTable.create
     filter.register_custom_matcher(:exists?) { |x| !x.entries.empty? }
-    filter.register_column(:commands,       field: "command")
-          .register_column(:ids,            field: "id")
-          .register_column(:images,         field: "image")
-          .register_column(:labels,         field: "labels", style: :simple)
-          .register_column(:local_volumes,  field: "localvolumes")
-          .register_column(:mounts,         field: "mounts")
-          .register_column(:names,          field: "names")
-          .register_column(:networks,       field: "networks")
-          .register_column(:ports,          field: "ports")
-          .register_column(:running_for,    field: "runningfor")
-          .register_column(:sizes,          field: "size")
-          .register_column(:status,         field: "status")
-          .register_custom_matcher(:running?) do |x|
-            x.where { status.downcase.start_with?("up") }
-          end
+    filter.register_column(:commands, field: "command")
+      .register_column(:ids,            field: "id")
+      .register_column(:images,         field: "image")
+      .register_column(:labels,         field: "labels", style: :simple)
+      .register_column(:local_volumes,  field: "localvolumes")
+      .register_column(:mounts,         field: "mounts")
+      .register_column(:names,          field: "names")
+      .register_column(:networks,       field: "networks")
+      .register_column(:ports,          field: "ports")
+      .register_column(:running_for,    field: "runningfor")
+      .register_column(:sizes,          field: "size")
+      .register_column(:status,         field: "status")
+      .register_custom_matcher(:running?) do |x|
+        x.where { status.downcase.start_with?("up") }
+      end
     filter.install_filter_methods_on_resource(self, :containers)
 
     attr_reader :containers
@@ -37,13 +37,13 @@ module Inspec::Resources
   class DockerImageFilter
     filter = FilterTable.create
     filter.register_custom_matcher(:exists?) { |x| !x.entries.empty? }
-    filter.register_column(:ids,           field: "id")
-          .register_column(:repositories,  field: "repository")
-          .register_column(:tags,          field: "tag")
-          .register_column(:sizes,         field: "size")
-          .register_column(:digests,       field: "digest")
-          .register_column(:created,       field: "createdat")
-          .register_column(:created_since, field: "createdsize")
+    filter.register_column(:ids, field: "id")
+      .register_column(:repositories,  field: "repository")
+      .register_column(:tags,          field: "tag")
+      .register_column(:sizes,         field: "size")
+      .register_column(:digests,       field: "digest")
+      .register_column(:created,       field: "createdat")
+      .register_column(:created_since, field: "createdsize")
     filter.install_filter_methods_on_resource(self, :images)
 
     attr_reader :images
@@ -54,10 +54,10 @@ module Inspec::Resources
 
   class DockerPluginFilter
     filter = FilterTable.create
-    filter.add(:ids,      field: "id")
-          .add(:names,    field: "name")
-          .add(:versions, field: "version")
-          .add(:enabled,  field: "enabled")
+    filter.add(:ids, field: "id")
+      .add(:names,    field: "name")
+      .add(:versions, field: "version")
+      .add(:enabled,  field: "enabled")
     filter.connect(self, :plugins)
 
     attr_reader :plugins
@@ -69,12 +69,12 @@ module Inspec::Resources
   class DockerServiceFilter
     filter = FilterTable.create
     filter.register_custom_matcher(:exists?) { |x| !x.entries.empty? }
-    filter.register_column(:ids,      field: "id")
-          .register_column(:names,    field: "name")
-          .register_column(:modes,    field: "mode")
-          .register_column(:replicas, field: "replicas")
-          .register_column(:images,   field: "image")
-          .register_column(:ports,    field: "ports")
+    filter.register_column(:ids, field: "id")
+      .register_column(:names,    field: "name")
+      .register_column(:modes,    field: "mode")
+      .register_column(:replicas, field: "replicas")
+      .register_column(:images,   field: "image")
+      .register_column(:ports,    field: "ports")
     filter.install_filter_methods_on_resource(self, :services)
 
     attr_reader :services
@@ -147,6 +147,7 @@ module Inspec::Resources
 
     def version
       return @version if defined?(@version)
+
       data = {}
       cmd = inspec.command("docker version --format '{{ json . }}'")
       data = JSON.parse(cmd.stdout) if cmd.exit_status == 0
@@ -157,6 +158,7 @@ module Inspec::Resources
 
     def info
       return @info if defined?(@info)
+
       data = {}
       # docke info format is only supported for Docker 17.03+
       cmd = inspec.command("docker info --format '{{ json . }}'")
@@ -169,6 +171,7 @@ module Inspec::Resources
     # returns information about docker objects
     def object(id)
       return @inspect if defined?(@inspect)
+
       data = JSON.parse(inspec.command("docker inspect #{id}").stdout)
       data = data[0] if data.is_a?(Array)
       @inspect = Hashie::Mash.new(data)
@@ -185,7 +188,7 @@ module Inspec::Resources
     def parse_json_command(labels, subcommand)
       # build command
       format = labels.map { |label| "\"#{label}\": {{json .#{label}}}" }
-      raw = inspec.command("docker #{subcommand} --format '{#{format.join(', ')}}'").stdout
+      raw = inspec.command("docker #{subcommand} --format '{#{format.join(", ")}}'").stdout
       output = []
       # since docker is not outputting valid json, we need to parse each row
       raw.each_line do |entry|
@@ -238,7 +241,7 @@ module Inspec::Resources
 
     def ensure_keys(entry, labels)
       labels.each do |key|
-        entry[key.downcase] = nil if !entry.key?(key.downcase)
+        entry[key.downcase] = nil unless entry.key?(key.downcase)
       end
       entry
     end