inspec 4.7.3 → 4.7.18

data/lib/inspec/resources/docker_container.rb

@@ -83,6 +83,7 @@ module Inspec::Resources
 
     def object_info
       return @info if defined?(@info)
+
       opts = @opts
       @info = inspec.docker.containers.where { names == opts[:name] || (!id.nil? && !opts[:id].nil? && (id == opts[:id] || id.start_with?(opts[:id]))) }
     end

data/lib/inspec/resources/docker_image.rb

@@ -74,6 +74,7 @@ module Inspec::Resources
 
     def object_info
       return @info if defined?(@info)
+
       opts = @opts
       @info = inspec.docker.images.where do
         (repository == opts[:repo] && tag == opts[:tag]) || (!id.nil? && !opts[:id].nil? && (id == opts[:id] || id.start_with?(opts[:id])))

data/lib/inspec/resources/docker_plugin.rb

@@ -54,6 +54,7 @@ module Inspec::Resources
 
     def object_info
       return @info if defined?(@info)
+
       opts = @opts
       @info = inspec.docker.plugins.where do
         (name == opts[:name]) || (!id.nil? && !opts[:id].nil? && (id == opts[:id]))

data/lib/inspec/resources/docker_service.rb

@@ -81,6 +81,7 @@ module Inspec::Resources
 
     def object_info
       return @info if defined?(@info)
+
       opts = @opts
       @info = inspec.docker.services.where do
         name == opts[:name] || image == opts[:image] || (!id.nil? && !opts[:id].nil? && (id == opts[:id] || id.start_with?(opts[:id])))

data/lib/inspec/resources/elasticsearch.rb

@@ -24,29 +24,29 @@ module Inspec::Resources
     filter = FilterTable.create
     filter.register_custom_matcher(:exists?) { |x| !x.entries.empty? }
     filter.register_column(:cluster_name,          field: "cluster_name")
-          .register_column(:node_name,             field: "name")
-          .register_column(:transport_address,     field: "transport_address")
-          .register_column(:host,                  field: "host")
-          .register_column(:ip,                    field: "ip")
-          .register_column(:version,               field: "version")
-          .register_column(:build_hash,            field: "build_hash")
-          .register_column(:total_indexing_buffer, field: "total_indexing_buffer")
-          .register_column(:roles,                 field: "roles")
-          .register_column(:settings,              field: "settings")
-          .register_column(:os,                    field: "os")
-          .register_column(:process,               field: "process")
-          .register_column(:jvm,                   field: "jvm")
-          .register_column(:transport,             field: "transport")
-          .register_column(:http,                  field: "http")
-          .register_column(:plugins,               field: "plugins")
-          .register_column(:plugin_list,           field: "plugin_list")
-          .register_column(:modules,               field: "modules")
-          .register_column(:module_list,           field: "module_list")
-          .register_column(:node_id,               field: "node_id")
-          .register_column(:ingest,                field: "ingest")
-          .register_custom_property(:node_count) do |t, _|
-            t.entries.length
-          end
+      .register_column(:node_name,             field: "name")
+      .register_column(:transport_address,     field: "transport_address")
+      .register_column(:host,                  field: "host")
+      .register_column(:ip,                    field: "ip")
+      .register_column(:version,               field: "version")
+      .register_column(:build_hash,            field: "build_hash")
+      .register_column(:total_indexing_buffer, field: "total_indexing_buffer")
+      .register_column(:roles,                 field: "roles")
+      .register_column(:settings,              field: "settings")
+      .register_column(:os,                    field: "os")
+      .register_column(:process,               field: "process")
+      .register_column(:jvm,                   field: "jvm")
+      .register_column(:transport,             field: "transport")
+      .register_column(:http,                  field: "http")
+      .register_column(:plugins,               field: "plugins")
+      .register_column(:plugin_list,           field: "plugin_list")
+      .register_column(:modules,               field: "modules")
+      .register_column(:module_list,           field: "module_list")
+      .register_column(:node_id,               field: "node_id")
+      .register_column(:ingest,                field: "ingest")
+      .register_custom_property(:node_count) do |t, _|
+        t.entries.length
+      end
 
     filter.install_filter_methods_on_resource(self, :nodes)
 
@@ -156,7 +156,7 @@ module Inspec::Resources
 
     def verify_json_payload!(content)
       unless content["error"].nil?
-        raise "#{content['error']['type']}: #{content['error']['reason']}"
+        raise "#{content["error"]["type"]}: #{content["error"]["reason"]}"
       end
 
       raise "No successful nodes available in cluster" if content["_nodes"]["successful"] == 0

data/lib/inspec/resources/etc_fstab.rb

@@ -37,13 +37,13 @@ module Inspec::Resources
     end
 
     filter = FilterTable.create
-    filter.register_column(:device_name,           field: "device_name")
-          .register_column(:mount_point,           field: "mount_point")
-          .register_column(:file_system_type,      field: "file_system_type")
-          .register_column(:mount_options,         field: "mount_options")
-          .register_column(:dump_options,          field: "dump_options")
-          .register_column(:file_system_options,   field: "file_system_options")
-          .register_custom_matcher(:configured?) { |x| x.entries.any? }
+    filter.register_column(:device_name, field: "device_name")
+      .register_column(:mount_point,           field: "mount_point")
+      .register_column(:file_system_type,      field: "file_system_type")
+      .register_column(:mount_options,         field: "mount_options")
+      .register_column(:dump_options,          field: "dump_options")
+      .register_column(:file_system_options,   field: "file_system_options")
+      .register_custom_matcher(:configured?) { |x| x.entries.any? }
 
     filter.install_filter_methods_on_resource(self, :params)
 
@@ -53,6 +53,7 @@ module Inspec::Resources
 
     def home_mount_options
       return nil unless where { mount_point == "/home" }.configured?
+
       where { mount_point == "/home" }.entries[0].mount_options
     end
 

data/lib/inspec/resources/etc_group.rb

@@ -56,6 +56,7 @@ module Inspec::Resources
     def users(filter = nil)
       entries = filter || @entries
       return nil if entries.nil?
+
       # filter the user entry
       res = entries.map do |x|
         x["members"].split(",") if !x.nil? && !x["members"].nil?
@@ -66,6 +67,7 @@ module Inspec::Resources
 
     def where(conditions = {})
       return if conditions.empty?
+
       fields = {
         name: "name",
         group_name: "name",
@@ -81,6 +83,7 @@ module Inspec::Resources
         conditions.each do |k, v|
           idx = fields[k.to_sym]
           next if idx.nil?
+
           res = res.select { |x| x[idx].to_s == v.to_s }
         end
       end
@@ -113,6 +116,7 @@ module Inspec::Resources
       x = line.split(":")
       # abort if we have an empty or comment line
       return nil if x.empty?
+
       # map data
       {
         "name" => x.at(0), # Name of the group.

data/lib/inspec/resources/etc_hosts.rb

@@ -31,10 +31,10 @@ class EtcHosts < Inspec.resource(1)
   end
 
   FilterTable.create
-             .register_column(:ip_address,     field: "ip_address")
-             .register_column(:primary_name,   field: "primary_name")
-             .register_column(:all_host_names, field: "all_host_names")
-             .install_filter_methods_on_resource(self, :params)
+    .register_column(:ip_address,     field: "ip_address")
+    .register_column(:primary_name,   field: "primary_name")
+    .register_column(:all_host_names, field: "all_host_names")
+    .install_filter_methods_on_resource(self, :params)
 
   private
 

data/lib/inspec/resources/etc_hosts_allow_deny.rb

@@ -27,9 +27,9 @@ module Inspec::Resources
     end
 
     filter = FilterTable.create
-    filter.register_column(:daemon,      field: "daemon")
-          .register_column(:client_list, field: "client_list")
-          .register_column(:options,     field: "options")
+    filter.register_column(:daemon, field: "daemon")
+      .register_column(:client_list, field: "client_list")
+      .register_column(:options,     field: "options")
 
     filter.install_filter_methods_on_resource(self, :params)
 
@@ -47,6 +47,7 @@ module Inspec::Resources
       content.each do |line|
         data, = parse_comment_line(line, comment_char: "#", standalone_comments: false)
         next unless data != ""
+
         data.split(":")[0].split(",").each do |daemon|
           split_daemons_list.push("#{daemon} : " + line.split(":", 2)[1])
         end
@@ -98,6 +99,7 @@ module Inspec::Resources
 
     def initialize(path = nil)
       return skip_resource "`etc_hosts_deny` is not supported on your OS" unless inspec.os.linux?
+
       super(path || "/etc/hosts.deny")
     end
 

data/lib/inspec/resources/file.rb

@@ -57,6 +57,7 @@ module Inspec::Resources
     def content
       res = file.content
       return nil if res.nil?
+
       res.force_encoding("utf-8")
     end
 
@@ -102,7 +103,7 @@ module Inspec::Resources
       Inspec.deprecate(:file_resource_be_mounted_matchers, "The file resource `be_mounted.with` and `be_mounted.only_with` matchers are deprecated. Please use the `mount` resource instead")
 
       # we cannot read mount data on non-Linux systems
-      return nil if !inspec.os.linux?
+      return nil unless inspec.os.linux?
 
       # parse content if we are on linux
       @mount_options ||= parse_mount_options(mounted.stdout, true)
@@ -171,6 +172,7 @@ module Inspec::Resources
 
     def file_permission_granted?(access_type, by_usergroup, by_specific_user)
       raise "`file_permission_granted?` is not supported on your OS" if @perms_provider.nil?
+
       if by_specific_user.nil? || by_specific_user.empty?
         @perms_provider.check_file_permission_by_mask(file, access_type, by_usergroup, by_specific_user)
       else
@@ -215,6 +217,7 @@ module Inspec::Resources
       flag = permission_flag(access_type)
       mask = file.unix_mode_mask(usergroup, flag)
       raise "Invalid usergroup/owner provided" if mask.nil?
+
       (file.mode & mask) != 0
     end
 

data/lib/inspec/resources/filesystem.rb

@@ -39,8 +39,9 @@ module Inspec::Resources
     end
 
     def info
-      return @cache if !@cache.nil?
+      return @cache unless @cache.nil?
       return {} if @fsman.nil?
+
       @cache = @fsman.info(@partition)
     end
 
@@ -119,12 +120,13 @@ module Inspec::Resources
       EOF
 
       raise Inspec::Exceptions::ResourceSkipped, "Unable to get available space for partition #{partition}" if cmd.stdout == "" || cmd.exit_status.to_i != 0
+
       begin
         fs = JSON.parse(cmd.stdout)
       rescue JSON::ParserError => e
         raise Inspec::Exceptions::ResourceFailed,
-              "Failed to parse JSON from Powershell. " \
-              "Error: #{e}"
+          "Failed to parse JSON from Powershell. " \
+          "Error: #{e}"
       end
       {
         name: fs["DeviceID"],

data/lib/inspec/resources/firewalld.rb

@@ -28,10 +28,10 @@ module Inspec::Resources
     attr_reader :params
 
     filter = FilterTable.create
-    filter.register_column(:zone,       field: "zone")
-          .register_column(:interfaces, field: "interfaces")
-          .register_column(:sources,    field: "sources")
-          .register_column(:services,   field: "services")
+    filter.register_column(:zone, field: "zone")
+      .register_column(:interfaces, field: "interfaces")
+      .register_column(:sources,    field: "sources")
+      .register_column(:services,   field: "services")
 
     filter.install_filter_methods_on_resource(self, :params)
 
@@ -45,12 +45,14 @@ module Inspec::Resources
 
     def has_zone?(query_zone)
       return false unless installed?
+
       result = firewalld_command("--get-zones").split(" ")
       result.include?(query_zone)
     end
 
     def running?
       return false unless installed?
+
       result = firewalld_command("--state")
       result =~ /^running/ ? true : false
     end
@@ -135,6 +137,7 @@ module Inspec::Resources
       if result.stderr != ""
         return "Error on command #{command}: #{result.stderr}"
       end
+
       result.stdout.strip
     end
   end

data/lib/inspec/resources/groups.rb

@@ -49,10 +49,10 @@ module Inspec::Resources
 
     filter = FilterTable.create
     filter.register_custom_matcher(:exists?) { |x| !x.entries.empty? }
-    filter.register_column(:names,     field: "name")
-          .register_column(:gids,      field: "gid")
-          .register_column(:domains,   field: "domain")
-          .register_column(:members,   field: "members", style: :simple)
+    filter.register_column(:names, field: "name")
+      .register_column(:gids,      field: "gid")
+      .register_column(:domains,   field: "domain")
+      .register_column(:members,   field: "members", style: :simple)
     filter.install_filter_methods_on_resource(self, :collect_group_details)
 
     def to_s
@@ -64,6 +64,7 @@ module Inspec::Resources
     # collects information about every group
     def collect_group_details
       return @groups_cache ||= @group_provider.groups unless @group_provider.nil?
+
       []
     end
   end
@@ -176,6 +177,7 @@ module Inspec::Resources
       groups.each { |g| g["gid"] = g["gid"].to_i }
       groups.each do |g|
         next if g["users"].nil?
+
         g["members"] = g.delete("users")
         g["members"].tr!(" ", ",")
       end

data/lib/inspec/resources/grub_conf.rb

@@ -90,6 +90,7 @@ class GrubConfig < Inspec.resource(1)
     lines = content.split("\n")
     lines.each_with_index do |line, index|
       next unless line =~ /^menuentry\s+.*/
+
       entry = {}
       entry["insmod"] = []
 
@@ -104,6 +105,7 @@ class GrubConfig < Inspec.resource(1)
       # Begin processing from index forward until a `}` line is met
       lines.drop(index + 1).each do |mline|
         break if mline =~ /^\s*}\s*$/
+
         case mline
         when /(?:^|\s*)initrd.*/
           entry["initrd"] = mline.split(" ")[1]
@@ -155,6 +157,7 @@ class GrubConfig < Inspec.resource(1)
     kernel_opts = {}
     lines.each_with_index do |file_line, index|
       next unless file_line =~ /^title.*/
+
       current_kernel = file_line.split(" ", 2)[1]
       lines.drop(index + 1).each do |kernel_line|
         if kernel_line =~ /^\s.*/

data/lib/inspec/resources/host.rb

@@ -72,7 +72,7 @@ module Inspec::Resources
       missing_requirements = @host_provider.missing_requirements(protocol)
       unless missing_requirements.empty?
         return skip_resource "The following requirements are not met for this resource: " \
-          "#{missing_requirements.join(', ')}"
+          "#{missing_requirements.join(", ")}"
       end
     end
 
@@ -83,7 +83,7 @@ module Inspec::Resources
 
     # if we get the IP address, the host is resolvable
     def resolvable?(type = nil)
-      warn "The `host` resource ignores #{type} parameters. Continue to resolve host." if !type.nil?
+      warn "The `host` resource ignores #{type} parameters. Continue to resolve host." unless type.nil?
       resolve.nil? || resolve.empty? ? false : true
     end
 
@@ -131,7 +131,8 @@ module Inspec::Resources
 
     def resolve
       return @ip_cache if defined?(@ip_cache)
-      @ip_cache = @host_provider.resolve(hostname) if !@host_provider.nil?
+
+      @ip_cache = @host_provider.resolve(hostname) unless @host_provider.nil?
     end
   end
 
@@ -248,6 +249,7 @@ module Inspec::Resources
       cmd.stdout.lines.each do |line|
         ip, = line.split(/\s+/, 2)
         next unless ip.match(Resolv::IPv4::Regex) || ip.match(Resolv::IPv6::Regex)
+
         addresses << ip unless addresses.include?(ip)
       end
 

data/lib/inspec/resources/http.rb

@@ -35,8 +35,8 @@ module Inspec::Resources
       # profiles.
       if opts.key?(:enable_remote_worker) && !inspec.local_transport?
         warn "Ignoring `enable_remote_worker` option, the `http` resource ",
-             "remote worker is enabled by default for remote targets and ",
-             "cannot be disabled"
+          "remote worker is enabled by default for remote targets and ",
+          "cannot be disabled"
       end
 
       # Run locally if InSpec is ran locally and remotely if ran remotely
@@ -138,6 +138,7 @@ module Inspec::Resources
 
         def response
           return @response if @response
+
           conn = Faraday.new(url: url, headers: request_headers, params: params, ssl: { verify: ssl_verify? }) do |builder|
             builder.request :url_encoded
             builder.use FaradayMiddleware::FollowRedirects, limit: max_redirects if max_redirects > 0
@@ -163,7 +164,7 @@ module Inspec::Resources
         def initialize(inspec, http_method, url, opts)
           unless inspec.command("curl").exist?
             raise Inspec::Exceptions::ResourceSkipped,
-                  "curl is not available on the target machine"
+              "curl is not available on the target machine"
           end
 
           @ran_curl = false
@@ -203,6 +204,7 @@ module Inspec::Resources
           prelude, remainder = response.split("\n\n", 2)
           loop do
             break unless remainder =~ %r{^HTTP/}
+
             prelude, remainder = remainder.split("\n\n", 2)
           end
           @body = remainder
@@ -248,7 +250,7 @@ module Inspec::Resources
           if params.nil?
             cmd << "'#{url}'"
           else
-            cmd << "'#{url}?#{params.map { |e| e.join('=') }.join('&')}'"
+            cmd << "'#{url}?#{params.map { |e| e.join("=") }.join("&")}'"
           end
 
           cmd.join(" ")

data/lib/inspec/resources/iis_app.rb

@@ -76,6 +76,7 @@ module Inspec::Resources
 
     def iis_app
       return @cache unless @cache.nil?
+
       command = "Import-Module WebAdministration; Get-WebApplication -Name '#{@path}' -Site '#{@site_name}' | Select-Object * | ConvertTo-Json"
       cmd = @inspec.command(command)
 

data/lib/inspec/resources/iis_app_pool.rb

@@ -117,7 +117,7 @@ class IisAppPool < Inspec.resource(1)
       e32b: pool["enable32BitAppOnWin64"],
       mode: pool["managedPipelineMode"],
       processes: process_model["maxProcesses"],
-      timeout: "#{idle_timeout['Hours']}:#{idle_timeout['Minutes']}:#{idle_timeout['Seconds']}",
+      timeout: "#{idle_timeout["Hours"]}:#{idle_timeout["Minutes"]}:#{idle_timeout["Seconds"]}",
       timeout_days: idle_timeout["Days"],
       timeout_hours: idle_timeout["Hours"],
       timeout_minutes: idle_timeout["Minutes"],