inspec-core 5.17.4 → 5.18.14

data/lib/inspec/resources/chrony_conf.rb

@@ -34,6 +34,10 @@ module Inspec::Resources
       param
     end
 
+    def resource_id
+      @conf_path || "chrony_conf"
+    end
+
     def to_s
       "chrony.conf"
     end

data/lib/inspec/resources/command.rb

@@ -93,6 +93,11 @@ module Inspec::Resources
       res.exit_status.to_i == 0
     end
 
+    # to_s method outputs the command which we are using here as UUID to identify resource and also it take cares of Redact output
+    def resource_id
+      to_s || "command"
+    end
+
     def to_s
       output = "Command: `#{@command}`"
       # Redact output if the `redact_regex` option is passed

data/lib/inspec/resources/cpan.rb

@@ -51,6 +51,10 @@ module Inspec::Resources
       info[:version]
     end
 
+    def resource_id
+      @package_name || "cpan"
+    end
+
     def to_s
       "Perl Module #{@package_name}"
     end

data/lib/inspec/resources/cran.rb

@@ -57,6 +57,10 @@ module Inspec::Resources
       info[:version]
     end
 
+    def resource_id
+      @package_name || "cran"
+    end
+
     def to_s
       "R Module #{@package_name}"
     end

data/lib/inspec/resources/cron.rb

@@ -38,6 +38,11 @@ module Inspec::Resources
       @params.include?(rule)
     end
 
+    def resource_id
+      user = @user || "current user"
+      "cron #{user}"
+    end
+
     def to_s
       if is_user_crontab?
         "cron for user #{@user}"

data/lib/inspec/resources/csv.rb

@@ -19,7 +19,8 @@ module Inspec::Resources
 
     def initialize(path, headers = true)
       @headers = headers
-      super(path)
+      @path = path
+      super(@path)
     end
 
     # override the parse method from JsonConfig
@@ -68,6 +69,10 @@ module Inspec::Resources
       end
     end
 
+    def resource_id
+      @path || "csv"
+    end
+
     private
 
     # used by JsonConfig to build up a full to_s method

data/lib/inspec/resources/dh_params.rb

@@ -76,6 +76,10 @@ module Inspec::Resources
       @dh_params.params_ok?
     end
 
+    def resource_id
+      @dh_params_path || "dh_params"
+    end
+
     def to_s
       "dh_params #{@dh_params_path}"
     end

data/lib/inspec/resources/docker_container.rb

@@ -92,6 +92,10 @@ module Inspec::Resources
       "Docker Container #{name}"
     end
 
+    def resource_id
+      object_info.ids[0] || @opts[:id] || @opts[:name] || ""
+    end
+
     private
 
     def object_info

data/lib/inspec/resources/docker_image.rb

@@ -72,6 +72,10 @@ module Inspec::Resources
       "Docker Image #{img}"
     end
 
+    def resource_id
+      object_info.ids[0] || @opts[:id] || @opts[:image] || ""
+    end
+
     private
 
     def sanitize_options(opts)

data/lib/inspec/resources/docker_plugin.rb

@@ -50,6 +50,10 @@ module Inspec::Resources
       "Docker plugin #{plugin}"
     end
 
+    def resource_id
+      id || @opts[:id] || @opts[:name] || ""
+    end
+
     private
 
     def object_info

data/lib/inspec/resources/docker_service.rb

@@ -73,6 +73,10 @@ module Inspec::Resources
       "Docker Service #{service}"
     end
 
+    def resource_id
+      object_info.ids[0] || @opts[:id] || @opts[:name] || ""
+    end
+
     private
 
     def sanitize_options(opts)

data/lib/inspec/resources/etc_group.rb

@@ -95,6 +95,10 @@ module Inspec::Resources
       "/etc/group"
     end
 
+    def resource_id
+      @path
+    end
+
     private
 
     def parse_group(path)

data/lib/inspec/resources/etc_hosts_allow_deny.rb

@@ -37,6 +37,10 @@ module Inspec::Resources
       "hosts.allow Configuration"
     end
 
+    def resource_id
+      @conf_path
+    end
+
     private
 
     def read_content
@@ -110,5 +114,6 @@ module Inspec::Resources
     def to_s
       "hosts.deny Configuration"
     end
+
   end
 end

data/lib/inspec/resources/file.rb

@@ -35,11 +35,12 @@ module Inspec::Resources
       end
     EXAMPLE
 
-    attr_reader :file, :mount_options
+    attr_reader :file, :mount_options, :path
     def initialize(path)
       # select permissions style
       @perms_provider = select_file_perms_style(inspec.os)
       @file = inspec.backend.file(path)
+      @path = path
     end
 
     %w{
@@ -217,6 +218,10 @@ module Inspec::Resources
       end
     end
 
+    def resource_id
+      path
+    end
+
     private
 
     def file_permission_granted?(access_type, by_usergroup, by_specific_user)

data/lib/inspec/resources/filesystem.rb

@@ -84,6 +84,10 @@ module Inspec::Resources
       info = @fsman.info(@partition)
       info[:name]
     end
+
+    def resource_id
+      partition
+    end
   end
 
   class FsManagement

data/lib/inspec/resources/gem.rb

@@ -76,5 +76,9 @@ module Inspec::Resources
     def to_s
       "gem package #{@package_name}"
     end
+
+    def resource_id
+      "#{@package_name}-#{version}"
+    end
   end
 end

data/lib/inspec/resources/groups.rb

@@ -154,6 +154,10 @@ module Inspec::Resources
       "Group #{@group}"
     end
 
+    def resource_id
+      gid ? "#{@group}-#{gid}" : ""
+    end
+
     private
 
     def flatten_entry(group_info, prop)

data/lib/inspec/resources/grub_conf.rb

@@ -69,6 +69,10 @@ module Inspec::Resources
       "Grub Config"
     end
 
+    def resource_id
+      @conf_path
+    end
+
     private
 
     ######################################################################

data/lib/inspec/resources/host.rb

@@ -130,6 +130,10 @@ module Inspec::Resources
       resource_name
     end
 
+    def resource_id
+      port ? "#{hostname}-#{port}-#{protocol}" : hostname
+    end
+
     private
 
     def ping

data/lib/inspec/resources/http.rb

@@ -83,6 +83,10 @@ module Inspec::Resources
           @response = nil
         end
 
+        def resource_id
+          @url
+        end
+
         private
 
         def params

data/lib/inspec/resources/ibmdb2_conf.rb

@@ -24,6 +24,14 @@ module Inspec::Resources
       @output = run_command
     end
 
+    def resource_id
+      if inspec.os.platform?("windows")
+        "ibmdb2_conf"
+      else
+        "ibmdb2_conf:DatabaseInstance:#{@db_instance}"
+      end
+    end
+
     def to_s
       "IBM Db2 Conf"
     end

data/lib/inspec/resources/ibmdb2_session.rb

@@ -1,10 +1,11 @@
 module Inspec::Resources
   class Lines
-    attr_reader :output
+    attr_reader :output, :exit_status
 
-    def initialize(raw, desc)
+    def initialize(raw, desc, exit_status)
       @output = raw
       @desc = desc
+      @exit_status = exit_status
     end
 
     def to_s
@@ -58,7 +59,15 @@ module Inspec::Resources
       if cmd.exit_status != 0 || out =~ /Can't connect to IBM Db2 / || out.downcase =~ /^error:.*/
         raise Inspec::Exceptions::ResourceFailed, "IBM Db2 connection error: #{out}"
       else
-        Lines.new(cmd.stdout.strip, "IBM Db2 Query: #{q}")
+        Lines.new(cmd.stdout.strip, "IBM Db2 Query: #{q}", cmd.exit_status)
+      end
+    end
+
+    def resource_id
+      if inspec.os.platform?("windows")
+        "ibmdb2_session:DatabaseName#{@db_name}"
+      else
+        "ibmdb2_session:DatabaseInstance:#{@db_instance}:DatabaseName#{@db_name}"
       end
     end
 

data/lib/inspec/resources/iis_app.rb

@@ -72,6 +72,10 @@ module Inspec::Resources
       "iis_app '#{@site_name}#{@path}'"
     end
 
+    def resource_id
+      @path
+    end
+
     private
 
     def iis_app

data/lib/inspec/resources/iis_app_pool.rb

@@ -80,6 +80,10 @@ module Inspec::Resources
       "IIS App Pool '#{@pool_name}'"
     end
 
+    def resource_id
+      @pool_name
+    end
+
     private
 
     def iis_app_pool

data/lib/inspec/resources/iis_site.rb

@@ -77,6 +77,10 @@ module Inspec::Resources
       iis_site.nil? ? false : (iis_site[:bindings].include? binding)
     end
 
+    def resource_id
+      @site_name || "IIS Site"
+    end
+
     def to_s
       "iis_site '#{@site_name}'"
     end

data/lib/inspec/resources/inetd_conf.rb

@@ -46,6 +46,10 @@ module Inspec::Resources
       @params = conf.params
     end
 
+    def resource_id
+      @conf_path || "inetd.conf"
+    end
+
     def to_s
       "inetd.conf"
     end

data/lib/inspec/resources/interface.rb

@@ -83,6 +83,10 @@ module Inspec::Resources
       interface_info && Array(interface_info[:ipv6_addresses])
     end
 
+    def resource_id
+      @iface || "Interface"
+    end
+
     def to_s
       "Interface #{@iface}"
     end

data/lib/inspec/resources/ip6tables.rb

@@ -62,6 +62,10 @@ module Inspec::Resources
       @ip6tables_cache = cmd.stdout.split("\n").map(&:strip)
     end
 
+    def resource_id
+      format("Ip6tables %s %s", @table && "table: #{@table}", @chain && "chain: #{@chain}").strip
+    end
+
     def to_s
       format("Ip6tables %s %s", @table && "table: #{@table}", @chain && "chain: #{@chain}").strip
     end

data/lib/inspec/resources/ipfilter.rb

@@ -42,6 +42,10 @@ module Inspec::Resources
       @ipfilter_cache = cmd.stdout.split("\n").map(&:strip)
     end
 
+    def resource_id
+      "Ipfilter"
+    end
+
     def to_s
       "Ipfilter"
     end

data/lib/inspec/resources/ipnat.rb

@@ -41,6 +41,10 @@ module Inspec::Resources
       @ipnat_cache = cmd.stdout.split("\n").map(&:strip)
     end
 
+    def resource_id
+      "Ipnat"
+    end
+
     def to_s
       "Ipnat"
     end

data/lib/inspec/resources/iptables.rb

@@ -69,6 +69,10 @@ module Inspec::Resources
       end
     end
 
+    def resource_id
+      format("Iptables %s %s", @table && "table: #{@table}", @chain && "chain: #{@chain}").strip
+    end
+
     def to_s
       format("Iptables %s %s", @table && "table: #{@table}", @chain && "chain: #{@chain}").strip
     end

data/lib/inspec/resources/json.rb

@@ -59,6 +59,10 @@ module Inspec::Resources
       extract_value(key, params)
     end
 
+    def resource_id
+      @resource_name_supplement || "#{resource_base_name}'s content"
+    end
+
     def to_s
       "#{resource_base_name} #{@resource_name_supplement || "content"}"
     end

data/lib/inspec/resources/kernel_module.rb

@@ -69,6 +69,10 @@ module Inspec::Resources
       cmd.exit_status == 0 ? cmd.stdout.delete("\n") : nil
     end
 
+    def resource_id
+      @module || "Kernel Module"
+    end
+
     def to_s
       "Kernel Module #{@module}"
     end

data/lib/inspec/resources/kernel_parameter.rb

@@ -29,6 +29,10 @@ module Inspec::Resources
       cmd
     end
 
+    def resource_id
+      @parameter || "Kernel Parameter"
+    end
+
     def to_s
       "Kernel Parameter #{@parameter}"
     end

data/lib/inspec/resources/key_rsa.rb

@@ -59,6 +59,10 @@ module Inspec::Resources
       @key.public_key.n.num_bytes * 8
     end
 
+    def resource_id
+      @key_path || "RSA Key"
+    end
+
     def to_s
       "rsa_key #{@key_path}"
     end

data/lib/inspec/resources/ksh.rb

@@ -26,6 +26,10 @@ module Inspec::Resources
       super(CommandWrapper.wrap(command, options))
     end
 
+    def resource_id
+      @raw_command || "Kornshell command"
+    end
+
     def to_s
       "KornShell command #{@raw_command}"
     end

data/lib/inspec/resources/limits_conf.rb

@@ -38,6 +38,10 @@ module Inspec::Resources
       @params = conf.params
     end
 
+    def resource_id
+      @conf_path
+    end
+
     def to_s
       "limits.conf"
     end

data/lib/inspec/resources/login_defs.rb

@@ -49,6 +49,10 @@ module Inspec::Resources
       @params = conf.params
     end
 
+    def resource_id
+      @conf_path
+    end
+
     def to_s
       "login.defs"
     end

data/lib/inspec/resources/mongodb.rb

@@ -19,6 +19,10 @@ module Inspec::Resources
       end
     end
 
+    def resource_id
+      @conf_path
+    end
+
     def to_s
       "MongoDB"
     end

data/lib/inspec/resources/mongodb_conf.rb

@@ -24,6 +24,11 @@ module Inspec::Resources
       super(@conf_path)
     end
 
+    # set resource_id to "" if system is not able to determine the @conf_path
+    def resource_id
+      @conf_path || "mongodb_conf"
+    end
+
     private
 
     def parse(content)

data/lib/inspec/resources/mongodb_session.rb

@@ -4,9 +4,10 @@ module Inspec::Resources
   class Lines
     attr_reader :params
 
-    def initialize(raw, desc)
+    def initialize(raw, desc, exit_status = nil)
       @params = raw
       @desc = desc
+      @exit_status = exit_status
     end
 
     def to_s
@@ -62,6 +63,10 @@ module Inspec::Resources
       raise Inspec::Exceptions::ResourceFailed, "Can't run MongoDB command Error: #{e.message}"
     end
 
+    def resource_id
+      "mongodb_session:User:#{@user}:Host:#{@host}:Database:#{@database}"
+    end
+
     private
 
     def create_session

data/lib/inspec/resources/mount.rb

@@ -51,6 +51,10 @@ module Inspec::Resources
       @mount_options[name]
     end
 
+    def resource_id
+      @path || "mount"
+    end
+
     def to_s
       "Mount #{@path}"
     end

data/lib/inspec/resources/mssql_session.rb

@@ -80,6 +80,10 @@ module Inspec::Resources
       end
     end
 
+    def resource_id
+      "mssql_session:User:#{@user}:Host:#{@host}:Database:#{@db_name}:Instance:#{@instance}"
+    end
+
     def to_s
       "MSSQL session"
     end

data/lib/inspec/resources/mssql_sys_conf.rb

@@ -19,6 +19,8 @@ module Inspec::Resources
     attr_reader :mssql_session, :sql_query
 
     def initialize(conf_param_name, opts = {})
+      @conf_param_name = conf_param_name
+      @opts = opts
       opts[:username] ||= "SA"
       @mssql_session = inspec.mssql_session(opts)
       setting = conf_param_name.to_s.gsub("_", " ").split.map(&:capitalize).join(" ")
@@ -37,6 +39,11 @@ module Inspec::Resources
       "MsSql DB Configuration"
     end
 
+    def resource_id
+      username = @opts[:username] || "SA"
+      "#{@conf_param_name}-#{username}"
+    end
+
     private
 
     def determine_system_configurations(setting)

data/lib/inspec/resources/mysql_conf.rb

@@ -121,6 +121,10 @@ module Inspec::Resources
       @files_contents[path] ||= read_file_content(path)
     end
 
+    def resource_id
+      @conf_path || "mysql_conf"
+    end
+
     def to_s
       "MySQL Configuration"
     end

data/lib/inspec/resources/mysql_session.rb

@@ -43,6 +43,7 @@ module Inspec::Resources
       @host = host
       @port = port
       @socket = socket
+      @db = nil
       init_fallback if user.nil? || pass.nil?
       raise Inspec::Exceptions::ResourceFailed, "Can't run MySQL SQL checks without authentication." if @user.nil? || @pass.nil?
 
@@ -52,7 +53,9 @@ module Inspec::Resources
     def query(q, db = "")
       raise Inspec::Exceptions::ResourceFailed, "#{resource_exception_message}" if resource_failed?
 
-      mysql_cmd = create_mysql_cmd(q, db)
+      @db = db
+      mysql_cmd = create_mysql_cmd(q, @db)
+
       cmd = if !@pass.nil?
               inspec.command(mysql_cmd, redact_regex: /(mysql -u\w+ -p).+(\s-(h|S).*)/)
             else
@@ -66,6 +69,10 @@ module Inspec::Resources
       end
     end
 
+    def resource_id
+      "mysql_session:User:#{@user}:Host:#{@host}:Database:#{@db}"
+    end
+
     def to_s
       "MySQL Session"
     end

data/lib/inspec/resources/nginx.rb

@@ -18,12 +18,13 @@ module Inspec::Resources
         its('modules') { should include 'my_module' }
       end
     EXAMPLE
-    attr_reader :params, :bin_dir
+    attr_reader :params, :bin_dir, :nginx_path
 
     def initialize(nginx_path = "/usr/sbin/nginx")
       return skip_resource "The `nginx` resource is not yet available on your OS." if inspec.os.windows?
       return skip_resource "The `nginx` binary not found in the path provided." unless inspec.command(nginx_path).exist?
 
+      @nginx_path = nginx_path
       cmd = inspec.command("#{nginx_path} -V 2>&1")
       if cmd.exit_status != 0
         return skip_resource "Error using the command nginx -V"
@@ -59,6 +60,10 @@ module Inspec::Resources
       @data.scan(/--with-(\S+)_module/).flatten
     end
 
+    def resource_id
+      nginx_path || "nginx"
+    end
+
     def to_s
       "Nginx Environment"
     end