inspec 4.7.3 → 4.7.18

data/lib/inspec/resources/iis_site.rb

@@ -82,8 +82,9 @@ module Inspec::Resources
     end
 
     def iis_site
-      return @cache if !@cache.nil?
-      @cache = @site_provider.iis_site(@site_name) if !@site_provider.nil?
+      return @cache unless @cache.nil?
+
+      @cache = @site_provider.iis_site(@site_name) unless @site_provider.nil?
     end
   end
 
@@ -106,7 +107,7 @@ module Inspec::Resources
       end
 
       bindings_array = site["bindings"]["Collection"].map do |k|
-        "#{k['protocol']} #{k['bindingInformation']}#{k['protocol'] == 'https' ? " sslFlags=#{k['sslFlags']}" : ''}"
+        "#{k["protocol"]} #{k["bindingInformation"]}#{k["protocol"] == "https" ? " sslFlags=#{k["sslFlags"]}" : ""}"
       end
 
       # map our values to a hash table

data/lib/inspec/resources/interface.rb

@@ -61,13 +61,13 @@ module Inspec::Resources
 
     def ipv4_addresses_netmask
       ipv4_cidrs.map { |i| i.split("/") }.map do |addr, netlen|
-        binmask = "#{'1' * netlen.to_i}#{'0' * (32 - netlen.to_i)}".to_i(2)
+        binmask = "#{"1" * netlen.to_i}#{"0" * (32 - netlen.to_i)}".to_i(2)
         netmask = []
         (1..4).each do |_byte|
           netmask.unshift(binmask & 255)
           binmask = binmask >> 8
         end
-        "#{addr}/#{netmask.join('.')}"
+        "#{addr}/#{netmask.join(".")}"
       end
     end
 
@@ -87,7 +87,8 @@ module Inspec::Resources
 
     def interface_info
       return @cache if defined?(@cache)
-      @cache = @interface_provider.interface_info(@iface) if !@interface_provider.nil?
+
+      @cache = @interface_provider.interface_info(@iface) unless @interface_provider.nil?
     end
   end
 
@@ -142,6 +143,7 @@ module Inspec::Resources
       [4, 6].each do |v|
         cmd = inspec.command("/sbin/ip -br -#{v} address show dev #{iface}")
         next unless cmd.exit_status.to_i == 0
+
         family = v == 6 ? "inet6" : "inet"
 
         cmd.stdout.each_line do |line|
@@ -171,8 +173,8 @@ module Inspec::Resources
       end
 
       # ensure we have an array of groups
-      net_adapter = [net_adapter] if !net_adapter.is_a?(Array)
-      addresses = [addresses] if !addresses.is_a?(Array)
+      net_adapter = [net_adapter] unless net_adapter.is_a?(Array)
+      addresses = [addresses] unless addresses.is_a?(Array)
 
       # select the requested interface
       adapters = net_adapter.each_with_object([]) do |adapter, adapter_collection|
@@ -188,6 +190,7 @@ module Inspec::Resources
       end
 
       return nil if adapters.empty?
+
       warn "[Possible Error] detected multiple network interfaces with the name #{iface}" if adapters.size > 1
       adapters[0]
     end
@@ -196,8 +199,8 @@ module Inspec::Resources
 
     def addresses_for_proto(all_addresses, iface, proto)
       all_addresses.select { |i| i["InterfaceAlias"] == iface }
-                   .map { |i| "#{i["#{proto}Address"]}/#{i['PrefixLength']}" unless i["#{proto}Address"].nil? }
-                   .compact
+        .map { |i| "#{i["#{proto}Address"]}/#{i["PrefixLength"]}" unless i["#{proto}Address"].nil? }
+        .compact
     end
   end
 end

data/lib/inspec/resources/json.rb

@@ -59,7 +59,7 @@ module Inspec::Resources
     end
 
     def to_s
-      "#{resource_base_name} #{@resource_name_supplement || 'content'}"
+      "#{resource_base_name} #{@resource_name_supplement || "content"}"
     end
 
     private

data/lib/inspec/resources/kernel_module.rb

@@ -36,7 +36,7 @@ module Inspec::Resources
     def initialize(modulename = nil)
       @module = modulename
       # this resource is only supported on Linux
-      return skip_resource "The `kernel_parameter` resource is not supported on your OS." if !inspec.os.linux?
+      return skip_resource "The `kernel_parameter` resource is not supported on your OS." unless inspec.os.linux?
     end
 
     def loaded?

data/lib/inspec/resources/kernel_parameter.rb

@@ -15,12 +15,13 @@ module Inspec::Resources
       @parameter = parameter
 
       # this resource is only supported on Linux
-      return skip_resource "The `kernel_parameter` resource is not supported on your OS." if !inspec.os.linux?
+      return skip_resource "The `kernel_parameter` resource is not supported on your OS." unless inspec.os.linux?
     end
 
     def value
       cmd = inspec.command("/sbin/sysctl -q -n #{@parameter}")
       return nil if cmd.exit_status != 0
+
       # remove whitespace
       cmd = cmd.stdout.chomp.strip
       # convert to number if possible

data/lib/inspec/resources/key_rsa.rb

@@ -31,26 +31,31 @@ module Inspec::Resources
 
     def public?
       return if @key.nil?
+
       @key.public?
     end
 
     def public_key
       return if @key.nil?
+
       @key.public_key.to_s
     end
 
     def private?
       return if @key.nil?
+
       @key.private?
     end
 
     def private_key
       return if @key.nil?
+
       @key.to_s
     end
 
     def key_length
       return if @key.nil?
+
       @key.public_key.n.num_bytes * 8
     end
 

data/lib/inspec/resources/mount.rb

@@ -21,6 +21,7 @@ module Inspec::Resources
       @path = path
       @mount_manager = mount_manager_for_os
       return skip_resource "The `mount` resource is not supported on your OS yet." if @mount_manager.nil?
+
       @file = inspec.backend.file(@path)
     end
 
@@ -31,11 +32,12 @@ module Inspec::Resources
     def count
       mounted = file.mounted
       return nil if mounted.nil? || mounted.stdout.nil?
+
       mounted.stdout.lines.count
     end
 
     def method_missing(name)
-      return nil if !file.mounted?
+      return nil unless file.mounted?
 
       mounted = file.mounted
       return nil if mounted.nil? || mounted.stdout.nil?

data/lib/inspec/resources/mysql_conf.rb

@@ -17,11 +17,12 @@ module Inspec::Resources
       k = name.to_s
       res = @params[k]
       return true if res.nil? && @params.key?(k)
+
       @params[k]
     end
 
     def to_s
-      "MySQL Config entry [#{@path.join(' ')}]"
+      "MySQL Config entry [#{@path.join(" ")}]"
     end
   end
 
@@ -112,6 +113,7 @@ module Inspec::Resources
 
     def abs_path(dir, f)
       return f if f.start_with? "/"
+
       File.join(dir, f)
     end
 

data/lib/inspec/resources/mysql_session.rb

@@ -73,12 +73,14 @@ module Inspec::Resources
     def init_fallback
       # support debian mysql administration login
       return if inspec.platform.in_family?("windows")
+
       debian = inspec.command("test -f /etc/mysql/debian.cnf && cat /etc/mysql/debian.cnf").stdout
       return if debian.empty?
 
       user = debian.match(/^\s*user\s*=\s*([^ ]*)\s*$/)
       pass = debian.match(/^\s*password\s*=\s*([^ ]*)\s*$/)
       return if user.nil? || pass.nil?
+
       @user = user[1]
       @pass = pass[1]
     end

data/lib/inspec/resources/nginx.rb

@@ -28,6 +28,7 @@ module Inspec::Resources
       if cmd.exit_status != 0
         return skip_resource "Error using the command nginx -V"
       end
+
       @data = cmd.stdout
       @params = {}
       read_content

data/lib/inspec/resources/nginx_conf.rb

@@ -33,6 +33,7 @@ module Inspec::Resources
       @conf_path = conf_path || "/etc/nginx/nginx.conf"
       @contents = {}
       return skip_resource "The `nginx_conf` resource is currently not supported on Windows." if inspec.os.windows?
+
       read_content(@conf_path)
     end
 
@@ -57,11 +58,13 @@ module Inspec::Resources
 
     def read_content(path)
       return @contents[path] if @contents.key?(path)
+
       @contents[path] = read_file_content(path, allow_empty: true)
     end
 
     def parse_nginx(path)
       return nil if inspec.os.windows?
+
       content = read_content(path)
 
       # Don't attempt to parse file if it contains only comments or is empty
@@ -96,10 +99,10 @@ module Inspec::Resources
       # into the current data structure
       if data.key?("include")
         data.delete("include").flatten
-            .map { |x| File.expand_path(x, rel_path) }
-            .map { |x| find_files(x) }.flatten
-            .map { |path| parse_nginx(path) }
-            .each { |conf| merge_config!(data, conf) }
+          .map { |x| File.expand_path(x, rel_path) }
+          .map { |x| find_files(x) }.flatten
+          .map { |path| parse_nginx(path) }
+          .each { |conf| merge_config!(data, conf) }
       end
 
       # Walk through the remaining hash fields to find more references
@@ -114,6 +117,7 @@ module Inspec::Resources
     def merge_config!(data, conf)
       # Catch edge-cases
       return if data.nil? || conf.nil?
+
       # Step through all conf items and create combined return value
       data.merge!(conf) do |_, v1, v2|
         if v1.is_a?(Array) && v2.is_a?(Array)
@@ -160,7 +164,7 @@ module Inspec::Resources
 
     filter = FilterTable.create
     filter.register_column(:servers, field: "server")
-          .install_filter_methods_on_resource(self, :server_table)
+      .install_filter_methods_on_resource(self, :server_table)
 
     def locations
       servers.map(&:locations).flatten
@@ -187,7 +191,7 @@ module Inspec::Resources
 
     filter = FilterTable.create
     filter.register_column(:locations, field: "location")
-          .install_filter_methods_on_resource(self, :location_table)
+      .install_filter_methods_on_resource(self, :location_table)
 
     def to_s
       server = ""

data/lib/inspec/resources/ntp_conf.rb

@@ -26,6 +26,7 @@ module Inspec::Resources
       param = read_params[name.to_s]
       # extract first value if we have only one value in array
       return param[0] if param.is_a?(Array) && (param.length == 1)
+
       param
     end
 

data/lib/inspec/resources/oneget.rb

@@ -23,7 +23,7 @@ module Inspec::Resources
       @package_name = package_name
 
       # verify that this resource is only supported on Windows
-      return skip_resource "The `oneget` resource is not supported on your OS." if !inspec.os.windows?
+      return skip_resource "The `oneget` resource is not supported on your OS." unless inspec.os.windows?
     end
 
     def info

data/lib/inspec/resources/oracledb_session.rb

@@ -36,6 +36,7 @@ module Inspec::Resources
 
       # connection as sysdba stuff
       return skip_resource "Option 'as_os_user' not available in Windows" if inspec.os.windows? && opts[:as_os_user]
+
       @su_user = opts[:as_os_user]
       @db_role = opts[:as_db_role]
 
@@ -93,7 +94,7 @@ module Inspec::Resources
 
     def verify_query(query)
       # ensure we have a ; at the end
-      query + ";" if !query.strip.end_with?(";")
+      query + ";" unless query.strip.end_with?(";")
       query
     end
 
@@ -121,7 +122,7 @@ module Inspec::Resources
       doc = REXML::Document.new result
       table = doc.elements["table"]
       hash = []
-      if !table.nil?
+      unless table.nil?
         rows = table.elements.to_a
         headers = rows[0].elements.to_a("th").map { |entry| entry.text.strip }
         rows.delete_at(0)
@@ -134,6 +135,7 @@ module Inspec::Resources
             entries = row.elements.to_a("td")
             # ignore if we have empty entries, oracle is adding th rows in between
             return nil if entries.empty?
+
             headers.each_with_index do |header, index|
               # we need htmlentities since we do not have nokogiri
               coder = HTMLEntities.new

data/lib/inspec/resources/os_env.rb

@@ -43,6 +43,7 @@ module Inspec::Resources
 
     def content
       return @content if defined?(@content)
+
       @content = value_for(@osenv, @target) unless @osenv.nil?
     end
 

data/lib/inspec/resources/package.rb

@@ -65,11 +65,12 @@ module Inspec::Resources
 
     # returns the package description
     def info
-      return @cache if !@cache.nil?
+      return @cache unless @cache.nil?
       # All `@pkgman.info` methods return `{}`. This matches that
       # behavior if `@pkgman` can't be determined, thus avoiding the
       # `undefined method 'info' for nil:NilClass` error
       return {} if @pkgman.nil?
+
       @pkgman.info(@package_name)
     end
 
@@ -88,6 +89,7 @@ module Inspec::Resources
     def evaluate_missing_requirements
       missing_requirements_string = @pkgman.missing_requirements.uniq.join(", ")
       return if missing_requirements_string.empty?
+
       raise Inspec::Exceptions::ResourceSkipped, "The following requirements are not met for this resource: #{missing_requirements_string}"
     end
   end
@@ -154,6 +156,7 @@ module Inspec::Resources
       # CentOS does not return an error code if the package is not installed,
       # therefore we need to check for emptyness
       return {} if cmd.exit_status.to_i != 0 || cmd.stdout.chomp.empty?
+
       params = SimpleConfig.new(
         cmd.stdout.chomp,
         assignment_regex: /^\s*([^:]*?)\s*:\s*(.*?)\s*$/,
@@ -214,8 +217,8 @@ module Inspec::Resources
       }
     rescue JSON::ParserError => e
       raise Inspec::Exceptions::ResourceFailed,
-            "Failed to parse JSON from `brew` command. " \
-            "Error: #{e}"
+        "Failed to parse JSON from `brew` command. " \
+        "Error: #{e}"
     end
   end
 
@@ -244,6 +247,7 @@ module Inspec::Resources
     def info(package_name)
       cmd = inspec.command("swlist -l product | grep #{package_name}")
       return {} if cmd.exit_status.to_i != 0
+
       pkg = cmd.stdout.strip.split(" ")
       {
         name: pkg[0],
@@ -303,8 +307,8 @@ module Inspec::Resources
         package = 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
 
       # What if we match multiple packages?  just pick the first one for now.
@@ -381,7 +385,7 @@ module Inspec::Resources
         name: params["Name"],
         installed: true,
         # 0.5.11-0.175.3.1.0.5.0
-        version: "#{params['Version']}-#{params['Branch']}",
+        version: "#{params["Version"]}-#{params["Branch"]}",
         type: "pkg",
       }
     end

data/lib/inspec/resources/packages.rb

@@ -42,11 +42,11 @@ module Inspec::Resources
     end
 
     filter = FilterTable.create
-    filter.register_column(:statuses,  field: "status", style: :simple)
-          .register_column(:names,     field: "name")
-          .register_column(:versions,  field: "version")
-          .register_column(:architectures, field: "architecture")
-          .install_filter_methods_on_resource(self, :filtered_packages)
+    filter.register_column(:statuses, field: "status", style: :simple)
+      .register_column(:names,     field: "name")
+      .register_column(:versions,  field: "version")
+      .register_column(:architectures, field: "architecture")
+      .install_filter_methods_on_resource(self, :filtered_packages)
 
     private
 
@@ -82,6 +82,7 @@ module Inspec::Resources
       cmd = inspec.command(command)
       all = cmd.stdout.split("\n")
       return [] if all.nil?
+
       all.map do |m|
         a = m.split(/ {2,}/)
         a[0] = "installed" if a[0] =~ /^.i/
@@ -99,6 +100,7 @@ module Inspec::Resources
       cmd = inspec.command(command)
       all = cmd.stdout.split("\n")
       return [] if all.nil?
+
       all.map do |m|
         a = m.split("  ")
         a.unshift("installed")

data/lib/inspec/resources/passwd.rb

@@ -49,13 +49,13 @@ module Inspec::Resources
     end
 
     filter = FilterTable.create
-    filter.register_column(:users,     field: "user")
-          .register_column(:passwords, field: "password")
-          .register_column(:uids,      field: "uid")
-          .register_column(:gids,      field: "gid")
-          .register_column(:descs,     field: "desc")
-          .register_column(:homes,     field: "home")
-          .register_column(:shells,    field: "shell")
+    filter.register_column(:users, field: "user")
+      .register_column(:passwords, field: "password")
+      .register_column(:uids,      field: "uid")
+      .register_column(:gids,      field: "gid")
+      .register_column(:descs,     field: "desc")
+      .register_column(:homes,     field: "home")
+      .register_column(:shells,    field: "shell")
 
     # rebuild the passwd line from raw content
     filter.register_custom_property(:content) do |t, _|