inspec 3.0.9 → 3.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f49689c3694c4ec3a2c9128df201e1ac81ffdf4981948d343d5396ed6599f1b
-  data.tar.gz: cc3f864f342fba8a7f404f69727e807cb12a397683ae2e2a217d4efd89a25586
+  metadata.gz: b84e3860f60f0346c8284b8eff2633018d13c3f48c43f214d883f472e96881e8
+  data.tar.gz: d336c4d15225faf7cd54644426bf06111848e2aaa8697519c485fc47bc322e6a
 SHA512:
-  metadata.gz: 1dc4515fa59a0412e2c97d2a3b2ccc80fda17b93d823e9865eb14428da5c58d3dedadc59e999c97fc09d9c5290840176403fb8d5b5d03bc9508a34f1e9fc5f79
-  data.tar.gz: 779e7a23b102ebe6cb28d4d6ba03e95c0975691d6835ee830f40e52ad326deeb450e1a3e90f8503d013eef10251706aab2d85fb4fb8b10ffab86d229cc505a41
+  metadata.gz: 54976889ef811f88ace3a5eda1cf57520092f8d9cf30b5cbfe6d245c77238fe686472bf81926e748a51ea717a0672d77c150f05fd6485eca52a015c9bddd9a78
+  data.tar.gz: ca315a5ad6e3bcd3c9f27d16fba27eaddf545fbdc94b41c4cddde6ee7a62ed253758cd60bcc31150393d973fdfa664ee49f57f26d65936cd7b608c530d569eaf

data/CHANGELOG.md

@@ -1,32 +1,44 @@
 # Change Log
 <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 3.0.9 -->
-## [v3.0.9](https://github.com/inspec/inspec/tree/v3.0.9) (2018-10-18)
+<!-- latest_release 3.0.12 -->
+## [v3.0.12](https://github.com/inspec/inspec/tree/v3.0.12) (2018-10-24)
 
-#### Merged Pull Requests
-- Add missing tests for groups resource, document members property, and assorted fixes. [#3467](https://github.com/inspec/inspec/pull/3467) ([miah](https://github.com/miah))
+#### Bug Fixes
+- Update to safe navigation exit code search [#3541](https://github.com/inspec/inspec/pull/3541) ([jquick](https://github.com/jquick))
 <!-- latest_release -->
 
-<!-- release_rollup since=3.0.0 -->
-### Changes since 3.0.0 release
-
-#### Enhancements
-- Minor cleanups of plugin documentation. &#39;Plugin&#39; instead of &#39;PluginDefinition&#39; [#3527](https://github.com/inspec/inspec/pull/3527) ([mattray](https://github.com/mattray)) <!-- 3.0.5 -->
+<!-- release_rollup since=3.0.9 -->
+### Changes since 3.0.9 release
 
 #### Bug Fixes
-- Fixes corrupt plugins.json when testing a plugin outside of core [#3526](https://github.com/inspec/inspec/pull/3526) ([clintoncwolfe](https://github.com/clintoncwolfe)) <!-- 3.0.7 -->
-- FilterTable: allow Strings or Symbols as fields [#3481](https://github.com/inspec/inspec/pull/3481) ([clintoncwolfe](https://github.com/clintoncwolfe)) <!-- 3.0.2 -->
+- Update to safe navigation exit code search [#3541](https://github.com/inspec/inspec/pull/3541) ([jquick](https://github.com/jquick)) <!-- 3.0.12 -->
 
 #### Merged Pull Requests
-- Add missing tests for groups resource, document members property, and assorted fixes. [#3467](https://github.com/inspec/inspec/pull/3467) ([miah](https://github.com/miah)) <!-- 3.0.9 -->
-- Pin inspec to the new train [#3531](https://github.com/inspec/inspec/pull/3531) ([jquick](https://github.com/jquick)) <!-- 3.0.8 -->
-- Add debug and sort options for plugins [#3530](https://github.com/inspec/inspec/pull/3530) ([jquick](https://github.com/jquick)) <!-- 3.0.6 -->
-- docs: Fix small issues with the `file` resource [#3515](https://github.com/inspec/inspec/pull/3515) ([jerryaldrichiii](https://github.com/jerryaldrichiii)) <!-- 3.0.4 -->
-- Filter out inspec-k8s and inspec-release [#3525](https://github.com/inspec/inspec/pull/3525) ([miah](https://github.com/miah)) <!-- 3.0.3 -->
-- style: Fix quotes/style on the `docker` resource [#3516](https://github.com/inspec/inspec/pull/3516) ([jerryaldrichiii](https://github.com/jerryaldrichiii)) <!-- 3.0.1 -->
+- Add inspec/train vault to plugin exclusion [#3532](https://github.com/inspec/inspec/pull/3532) ([jquick](https://github.com/jquick)) <!-- 3.0.11 -->
+
+#### New Resources
+- New resource to work with Windows security identifiers (SIDs) [#3405](https://github.com/inspec/inspec/pull/3405) ([james-stocks](https://github.com/james-stocks)) <!-- 3.0.10 -->
 <!-- release_rollup -->
 
 <!-- latest_stable_release -->
+## [v3.0.9](https://github.com/inspec/inspec/tree/v3.0.9) (2018-10-18)
+
+#### Enhancements
+- Minor cleanups of plugin documentation. &#39;Plugin&#39; instead of &#39;PluginDefinition&#39; [#3527](https://github.com/inspec/inspec/pull/3527) ([mattray](https://github.com/mattray))
+
+#### Bug Fixes
+- FilterTable: allow Strings or Symbols as fields [#3481](https://github.com/inspec/inspec/pull/3481) ([clintoncwolfe](https://github.com/clintoncwolfe))
+- Fixes corrupt plugins.json when testing a plugin outside of core [#3526](https://github.com/inspec/inspec/pull/3526) ([clintoncwolfe](https://github.com/clintoncwolfe))
+
+#### Merged Pull Requests
+- style: Fix quotes/style on the `docker` resource [#3516](https://github.com/inspec/inspec/pull/3516) ([jerryaldrichiii](https://github.com/jerryaldrichiii))
+- Filter out inspec-k8s and inspec-release [#3525](https://github.com/inspec/inspec/pull/3525) ([miah](https://github.com/miah))
+- docs: Fix small issues with the `file` resource [#3515](https://github.com/inspec/inspec/pull/3515) ([jerryaldrichiii](https://github.com/jerryaldrichiii))
+- Add debug and sort options for plugins [#3530](https://github.com/inspec/inspec/pull/3530) ([jquick](https://github.com/jquick))
+- Pin inspec to the new train [#3531](https://github.com/inspec/inspec/pull/3531) ([jquick](https://github.com/jquick))
+- Add missing tests for groups resource, document members property, and assorted fixes. [#3467](https://github.com/inspec/inspec/pull/3467) ([miah](https://github.com/miah))
+<!-- latest_stable_release -->
+
 ## [v3.0.0](https://github.com/inspec/inspec/tree/v3.0.0) (2018-10-15)
 
 #### Enhancements
@@ -35,7 +47,6 @@
 #### Merged Pull Requests
 - Change `Inspec ` to `InSpec ` where appropriate [#3494](https://github.com/inspec/inspec/pull/3494) ([jerryaldrichiii](https://github.com/jerryaldrichiii))
 - Update the text on the generic default attribute [#3508](https://github.com/inspec/inspec/pull/3508) ([jquick](https://github.com/jquick))
-<!-- latest_stable_release -->
 
 ## [v2.3.24](https://github.com/inspec/inspec/tree/v2.3.24) (2018-10-12)
 

data/etc/plugin_filters.json

@@ -15,7 +15,15 @@
     },
     {
       "plugin_name": "inspec-release",
-      "rationale": "It is not plugin."
+      "rationale": "This gem is currently only a placeholder, waiting to be built."
+    },
+    {
+      "plugin_name": "inspec-vault",
+      "rationale": "This gem is currently only a placeholder, waiting to be built."
+    },
+    {
+      "plugin_name": "train-vault",
+      "rationale": "This gem is currently only a placeholder, waiting to be built."
     },
     {
       "plugin_name": "train-tax-calculator",

data/lib/inspec/resource.rb

@@ -144,6 +144,7 @@ require 'resources/json'
 require 'resources/kernel_module'
 require 'resources/kernel_parameter'
 require 'resources/key_rsa'
+require 'resources/ksh'
 require 'resources/limits_conf'
 require 'resources/login_def'
 require 'resources/mount'
@@ -175,6 +176,7 @@ require 'resources/powershell'
 require 'resources/processes'
 require 'resources/rabbitmq_conf'
 require 'resources/registry_key'
+require 'resources/security_identifier'
 require 'resources/security_policy'
 require 'resources/service'
 require 'resources/shadow'

data/lib/inspec/runner_rspec.rb

@@ -84,7 +84,7 @@ module Inspec
     def exit_code
       return @rspec_exit_code if @formatter.results.empty?
       stats = @formatter.results[:statistics][:controls]
-      skipped = @formatter.results[:profiles].first[:status] == 'skipped'
+      skipped = @formatter.results&.fetch(:profiles, nil)&.first&.fetch(:status, nil) == 'skipped'
       if stats[:failed][:total] == 0 && stats[:skipped][:total] == 0 && !skipped
         0
       elsif stats[:failed][:total] > 0

data/lib/inspec/version.rb

@@ -4,5 +4,5 @@
 # author: Christoph Hartmann
 
 module Inspec
-  VERSION = '3.0.9'
+  VERSION = '3.0.12'
 end

data/lib/resources/ksh.rb

@@ -0,0 +1,35 @@
+# encoding: utf-8
+
+require 'utils/command_wrapper'
+require 'resources/command'
+
+module Inspec::Resources
+  class Ksh < Cmd
+    name 'ksh'
+    supports platform: 'unix'
+    desc 'Run a command or script in KornShell.'
+    example "
+      describe ksh('ls -al /') do
+        its('stdout') { should match /bin/ }
+        its('stderr') { should eq '' }
+        its('exit_status') { should eq 0 }
+      end
+
+      # Specify the path of the executable:
+      ksh('...', path: '/usr/bin/ksh93')
+
+      # Specify arguments (defaults to -c)
+      ksh('...', args: '-x -c')
+    "
+
+    def initialize(command, options = {})
+      @raw_command = command
+      options[:shell] = 'ksh' if options.is_a?(Hash)
+      super(CommandWrapper.wrap(command, options))
+    end
+
+    def to_s
+      "KornShell command #{@raw_command}"
+    end
+  end
+end

data/lib/resources/security_identifier.rb

@@ -0,0 +1,84 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
+module Inspec::Resources
+  class SecurityIdentifier < Inspec.resource(1)
+    name 'security_identifier'
+    supports platform: 'windows'
+    desc 'Resource that returns a Security Identifier for a given entity name in Windows.'
+    example <<-EOD
+      describe security_identifier(group: 'Everyone') do
+        it { should exist }
+        its('sid') { should eq 'S-1-1-0' }
+      end
+    EOD
+
+    def initialize(opts = {})
+      supported_opt_keys = [:user, :group, :unspecified]
+      raise ArgumentError, "Invalid security_identifier param '#{opts}'. Please pass a hash with these supported keys: #{supported_opt_keys}" unless opts.respond_to?(:keys)
+      raise ArgumentError, "Unsupported security_identifier options '#{opts.keys - supported_opt_keys}'. Supported keys: #[supported_opt_keys]" unless (opts.keys - supported_opt_keys).empty?
+      raise ArgumentError, 'Specifying more than one of :user :group or :unspecified for security_identifier is not supported' unless opts.keys && (opts.keys & supported_opt_keys).length == 1
+      if opts[:user]
+        @type = :user
+        @name = opts[:user]
+      end
+      if opts[:group]
+        @type = :group
+        @name = opts[:group]
+      end
+      if opts[:unspecified]
+        @type = :unspecified
+        @name = opts[:unspecified]
+      end
+      raise ArgumentError, 'Specify one of :user :group or :unspecified for security_identifier' unless @name
+      @sids = nil
+    end
+
+    def sid
+      fetch_sids unless @sids
+      @sids[@name] # nil if not found
+    end
+
+    def exist?
+      fetch_sids unless @sids
+      @sids.key?(@name)
+    end
+
+    private
+
+    def fetch_sids
+      @sids = {}
+      case @type
+      when :group
+        sid_data = wmi_results(:group)
+      when :user
+        sid_data = wmi_results(:user)
+      when :unspecified
+        # try group first, then user
+        sid_data = wmi_results(:group)
+        if sid_data.empty?
+          sid_data = wmi_results(:user)
+        end
+      else
+        raise "Unhandled entity type '#{@type}'"
+      end
+      sid_data.each { |sid| @sids[sid[1]] = sid[2] }
+    end
+
+    def wmi_results(type)
+      query = 'wmic '
+      case type
+      when :group
+        query += 'group'
+      when :user
+        query += 'useraccount'
+      end
+      query += " where 'Name=\"#{@name}\"' get Name\",\"SID /format:csv"
+      # Example output:
+      #     inspec> command("wmic useraccount where 'Name=\"Administrator\"' get Name\",\"SID /format:csv").stdout
+      #     => "\r\n\r\nNode,Name,SID\r\n\r\nComputer1,Administrator,S-1-5-21-650485088-1194226989-968533923-500\r\n\r\n"
+      # Remove the \r characters, split on \n\n, ignore the CSV header row
+      inspec.command(query).stdout.strip.tr("\r", '').split("\n\n")[1..-1].map { |entry| entry.split(',') }
+    end
+  end
+end

data/lib/utils/command_wrapper.rb

@@ -5,7 +5,7 @@
 require 'shellwords'
 
 class CommandWrapper
-  UNIX_SHELLS = %w{sh bash zsh}.freeze
+  UNIX_SHELLS = %w{sh bash zsh ksh}.freeze
 
   def self.wrap(cmd, options)
     unless options.is_a?(Hash)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inspec
 version: !ruby/object:Gem::Version
-  version: 3.0.9
+  version: 3.0.12
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-18 00:00:00.000000000 Z
+date: 2018-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: train
@@ -601,6 +601,7 @@ files:
 - lib/resources/kernel_module.rb
 - lib/resources/kernel_parameter.rb
 - lib/resources/key_rsa.rb
+- lib/resources/ksh.rb
 - lib/resources/limits_conf.rb
 - lib/resources/login_def.rb
 - lib/resources/mount.rb
@@ -632,6 +633,7 @@ files:
 - lib/resources/processes.rb
 - lib/resources/rabbitmq_conf.rb
 - lib/resources/registry_key.rb
+- lib/resources/security_identifier.rb
 - lib/resources/security_policy.rb
 - lib/resources/service.rb
 - lib/resources/shadow.rb