inspec 0.29.0 → 0.30.0

data/test/cookbooks/os_prepare/metadata.rb

@@ -10,3 +10,4 @@ depends 'yum'
 depends 'runit'
 depends 'postgresql'
 depends 'httpd', '~> 0.2'
+depends 'windows'

data/test/cookbooks/os_prepare/recipes/file.rb

@@ -38,4 +38,9 @@ if node['platform_family'] != 'windows'
     group gid
   end
 
+else
+
+  directory 'C:\Test Directory'
+  file 'C:\Test Directory\test file.txt'
+
 end

data/test/cookbooks/os_prepare/recipes/registry_key.rb

@@ -71,4 +71,17 @@ if node['platform_family'] == 'windows'
     recursive true
     action :create
   end
+
+  # used to verify pattern test
+  ::Chef::Recipe.send(:include, Chef::Mixin::PowershellOut)
+  cmd = powershell_out!('Get-WmiObject -Class Win32_UserAccount | % { $_.SID } | ConvertTo-Json')
+  sids = JSON.parse(cmd.stdout)
+  sids.each { |sid|
+    registry_key "HKEY_USERS\\#{sid}\\Software\\Policies\\Microsoft\\Windows\\Installer" do
+      values [{ name: 'AlwaysInstallElevated', type: :dword, data: 0 }]
+      recursive true
+      ignore_failure true # ignore users that have not been logged in
+      action :create
+    end
+  }
 end

data/test/docker_run.rb

@@ -10,6 +10,8 @@ class DockerRunner
     @conf_path = conf_path ||
                  ENV['config']
 
+    docker_run_concurrency = (ENV['N'] || 5).to_i
+
     if @conf_path.nil?
       fail "You must provide a configuration file with docker boxes"
     end
@@ -28,7 +30,7 @@ class DockerRunner
 
     @images = docker_images_by_tag
     @image_pull_tickets = Concurrent::Semaphore.new(2)
-    @docker_run_tickets = Concurrent::Semaphore.new(5)
+    @docker_run_tickets = Concurrent::Semaphore.new(docker_run_concurrency)
   end
 
   def run_all(&block)

data/test/functional/inheritance_test.rb

@@ -8,19 +8,6 @@ describe 'example inheritance profile' do
   include FunctionalHelper
   let(:path) { File.join(examples_path, 'inheritance') }
 
-  [
-    'archive %s --overwrite',
-    'check %s',
-    'json %s',
-  ].each do |cmd|
-    it cmd[/^\w/] + ' fails without --profiles-path' do
-      out = inspec(format(cmd, path))
-      out.stderr.must_include 'You must supply a --profiles-path to inherit'
-      # out.stdout.must_equal '' => we still get partial output
-      out.exit_status.must_equal 1
-    end
-  end
-
   it 'check succeeds with --profiles-path' do
     out = inspec('check ' + path + ' --profiles-path ' + examples_path)
     out.stderr.must_equal ''
@@ -28,6 +15,13 @@ describe 'example inheritance profile' do
     out.exit_status.must_equal 0
   end
 
+  it 'check succeeds without --profiles-path using inspec.yml' do
+    out = inspec('check ' + path)
+    out.stderr.must_equal ''
+    out.stdout.must_match /Valid.*true/
+    out.exit_status.must_equal 0
+  end
+
   it 'archive is successful with --profiles-path' do
     out = inspec('archive ' + path + ' --output ' + dst.path + ' --profiles-path ' + examples_path)
     out.stderr.must_equal ''
@@ -37,6 +31,15 @@ describe 'example inheritance profile' do
     File.exist?(dst.path).must_equal true
   end
 
+  it 'archive is successful without --profiles-path using inspec.yml' do
+    out = inspec('archive ' + path + ' --output ' + dst.path)
+    out.stderr.must_equal ''
+    out.stdout.must_include 'Generate archive '+dst.path
+    out.stdout.must_include 'Finished archive generation.'
+    out.exit_status.must_equal 0
+    File.exist?(dst.path).must_equal true
+  end
+
   it 'read the profile json with --profiles-path' do
     out = inspec('json ' + path + ' --profiles-path '+examples_path)
     out.stderr.must_equal ''
@@ -46,4 +49,14 @@ describe 'example inheritance profile' do
     hm['name'].must_equal 'inheritance'
     hm['controls'].length.must_equal 3
   end
+
+  it 'read the profile json without --profiles-path using inspec.yml' do
+    out = inspec('json ' + path)
+    out.stderr.must_equal ''
+    out.exit_status.must_equal 0
+    s = out.stdout
+    hm = JSON.load(s)
+    hm['name'].must_equal 'inheritance'
+    hm['controls'].length.must_equal 3
+  end
 end

data/test/helper.rb

@@ -145,8 +145,8 @@ class MockLoader
       'env' => cmd.call('env'),
       '${Env:PATH}'  => cmd.call('$env-PATH'),
       # registry key test (winrm 1.6.0, 1.6.1)
-      '2790db1e88204a073ed7fd3493f5445e5ce531afd0d2724a0e36c17110c535e6' => cmd.call('reg_schedule'),
-      '25a1a38fafc289a646d30f7aa966ce0901c267798f47abf2f9440e27d31a5b7d' => cmd.call('reg_schedule'),
+      'dd429dd12596fa193ba4111469b4417ecbd78a1d7ba4317c334c9111644bae44' => cmd.call('reg_schedule'),
+      'Fdd429dd12596fa193ba4111469b4417ecbd78a1d7ba4317c334c9111644bae44' => cmd.call('reg_schedule'),
       'Auditpol /get /subcategory:\'User Account Management\' /r' => cmd.call('auditpol'),
       '/sbin/auditctl -l' => cmd.call('auditctl'),
       '/sbin/auditctl -s' => cmd.call('auditctl-s'),

data/test/integration/default/file_spec.rb

@@ -176,4 +176,20 @@ if os.windows?
     its('basename') { should cmp 'Windows' }
     its('path') { should cmp "C:\\Windows" }
   end
+
+  describe file('C:\\Test Directory\\test file.txt') do
+    it { should exist }
+    it { should be_file }
+  end
+
+  describe file('C:\\Test Directory') do
+    it { should exist }
+    it { should be_directory }
+  end
+
+  describe file("C:/Program Files (x86)/Windows NT/Accessories/wordpad.exe") do
+    it { should exist }
+    # Only works on Windows 2012 R2
+    its('file_version') { should eq '6.3.9600.17415' }
+  end
 end

data/test/integration/default/powershell_spec.rb

@@ -1,6 +1,9 @@
 # encoding: utf-8
 
-return unless os.windows?
+unless os.windows?
+  STDERR.puts "\033[1;33mTODO: Not running #{__FILE__} because we are not on Windows.\033[0m"
+  return
+end
 
 script = <<-EOH
   Write-Output 'hello'

data/test/integration/default/registry_key_spec.rb

@@ -1,6 +1,9 @@
 # encoding: utf-8
 
-return unless os.windows?
+unless os.windows?
+  STDERR.puts "\033[1;33mTODO: Not running #{__FILE__} because we are not on Windows.\033[0m"
+  return
+end
 
 describe registry_key('HKLM\System\Test') do
   it { should exist }
@@ -54,13 +57,53 @@ describe registry_key('HKLM\Software\Policies\Microsoft\Internet Explorer\Main')
   its('isolation64bit') { should eq 1 }
 end
 
+describe registry_key('HKLM\System\CurrentControlSet\Control\Lsa\MSV1_0') do
+  it { should exist }
+  its('NTLMMinServerSec') { should eq 537_395_200 }
+  its('NtlmMinServerSec') { should eq 537_395_200 }
+end
+
 describe registry_key('HKLM\SOFTWARE\Policies\Microsoft\Windows NT\Terminal Services') do
   it { should exist }
   its('MinEncryptionLevel') { should eq 3 }
 end
 
-describe registry_key('HKLM\System\CurrentControlSet\Control\Lsa\MSV1_0') do
+# test option hash
+describe registry_key({
+  hive: 'HKLM',
+  key: 'SOFTWARE\Policies\Microsoft\Windows NT\Terminal Services'
+}) do
   it { should exist }
-  its('NTLMMinServerSec') { should eq 537_395_200 }
-  its('NtlmMinServerSec') { should eq 537_395_200 }
+  its('MinEncryptionLevel') { should eq 3 }
+end
+
+describe registry_key({
+  hive: 'HKEY_LOCAL_MACHINE',
+  key: 'SOFTWARE\Microsoft\SystemCertificates\Root\Certificates\8C941B34EA1EA6ED9AE2BC54CF687252B4C9B561'
+}) do
+  it { should exist }
+end
+
+# test regular expressions in our match
+describe registry_key({
+  hive: 'HKEY_LOCAL_MACHINE',
+  key: 'SOFTWARE\Microsoft\Windows NT\CurrentVersion'
+}) do
+  its('ProductName') { should match /^[a-zA-Z0-9\(\)\s]*2012\s[rR]2[a-zA-Z0-9\(\)\s]*$/ }
+end
+
+# verify all children via a regular expression
+control 'regex-test' do
+  title "Ensure 'Always install with elevated privileges' is set to 'Disabled'"
+  children = registry_key({
+    hive: 'HKEY_USERS'
+  }).children(/^S-1-5-21-[0-9]+-[0-9]+-[0-9]+-[0-9]{3,}\\Software\\Policies\\Microsoft\\Windows\\Installer/)
+  describe children do
+    it { should_not eq []}
+  end
+  children.each { |key|
+    describe registry_key(key) do
+      its('AlwaysInstallElevated') { should cmp 0 }
+    end
+  }
 end

data/test/integration/default/secpol_spec.rb

@@ -1,6 +1,9 @@
 # encoding: utf-8
 
-return unless os.windows?
+unless os.windows?
+  STDERR.puts "\033[1;33mTODO: Not running #{__FILE__} because we are not on Windows.\033[0m"
+  return
+end
 
 describe security_policy do
   its('EnableAdminAccount') { should eq 1 }

data/test/integration/default/wmi_spec.rb

@@ -1,6 +1,9 @@
 # encoding: utf-8
 
-return unless os.windows?
+unless os.windows?
+  STDERR.puts "\033[1;33mTODO: Not running #{__FILE__} because we are not on Windows.\033[0m"
+  return
+end
 
 # Get-WmiObject win32_service or Get-WmiObject -class win32_service
 # returns an array of service objects

data/test/unit/mock/profiles/resource-tiny/inspec.yml

@@ -0,0 +1,10 @@
+name: complete
+title: complete example profile
+maintainer: Chef Software, Inc.
+copyright: Chef Software, Inc.
+copyright_email: support@chef.io
+license: Proprietary, All rights reserved
+summary: Testing stub
+version: 1.0.0
+supports:
+- os-family: linux

data/test/unit/mock/profiles/resource-tiny/libraries/resource.rb

@@ -0,0 +1,3 @@
+class Tiny < Inspec.resource(1)
+  name 'tiny'
+end

data/test/unit/shell_detector_test.rb

@@ -0,0 +1,78 @@
+# encoding: utf-8
+# author: Steven Danna <steve@chef.io>
+#
+require 'helper'
+require 'rbconfig'
+require 'mocha/test_unit'
+require 'inspec/shell_detector'
+
+module ShellDetectorTestHelpers
+  def no_proc
+    Dir.expects(:exist?).with('/proc').returns(false)
+  end
+
+  def with_proc(shell)
+    Dir.expects(:exist?).with('/proc').returns(true)
+    File.expects(:readlink).with("/proc/#{ppid}/exe").returns(shell)
+  end
+
+  def with_ps(output)
+    subject.expects(:'`').with("ps -cp #{ppid} -o command=").returns(output)
+  end
+
+  def with_env(shell)
+    ENV.expects(:[]).with('SHELL').returns(shell)
+  end
+
+  def with_pwuid(shell)
+    Process.expects(:uid).returns(9999)
+    @mock_user = Minitest::Mock.new
+    @mock_user.expect :shell, shell
+    Etc.expects(:getpwuid).with(9999).returns(@mock_user)
+  end
+end
+
+describe Inspec::ShellDetector do
+  include ShellDetectorTestHelpers
+
+  let(:subject) { Inspec::ShellDetector.new }
+  let(:ppid) { Process.ppid }
+
+  # Small hack to ensure we can test on windows
+  it "returns nil immediately if running on windows" do
+    RbConfig::CONFIG.expects(:[]).with('host_os').returns('mswin')
+    subject.shell!.must_equal(nil)
+  end
+
+  describe "not on windows" do
+    before do
+      RbConfig::CONFIG.expects(:[]).with('host_os').returns('beos')
+    end
+
+    it "detects the shell via /proc if it exists" do
+      with_proc("/usr/bin/fish")
+      subject.shell!.must_equal("fish")
+    end
+
+    it "detects via `ps` if /proc doesn't exist" do
+      no_proc; with_ps("/usr/bin/ksh")
+      subject.shell!.must_equal("ksh")
+    end
+
+    it "detects via ENV if parent process methods failed" do
+      no_proc; with_ps(""); with_env("fish")
+      subject.shell!.must_equal("fish")
+    end
+
+    it "detects via getpwuid if all else fails" do
+      no_proc; with_ps(""); with_env(""); with_pwuid("/usr/bin/fish")
+      subject.shell!.must_equal("fish")
+      @mock_user.verify
+    end
+
+    it "returns nil if the shell isn't in the whitelist" do
+      no_proc; with_ps(""); with_env("badshell"); with_pwuid("/usr/bin/badshell")
+      subject.shell!.must_equal(nil)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inspec
 version: !ruby/object:Gem::Version
-  version: 0.29.0
+  version: 0.30.0
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-08 00:00:00.000000000 Z
+date: 2016-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: train
@@ -156,6 +156,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: molinillo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -190,7 +204,7 @@ files:
 - README.md
 - Rakefile
 - bin/inspec
-- docs/ctl_inspec.rst
+- docs/cli.rst
 - docs/dsl_inspec.rst
 - docs/dsl_resource.rst
 - docs/inspec_and_friends.rst
@@ -273,8 +287,13 @@ files:
 - lib/inspec/backend.rb
 - lib/inspec/base_cli.rb
 - lib/inspec/cli.rb
+- lib/inspec/completions/bash.sh.erb
+- lib/inspec/completions/zsh.sh.erb
+- lib/inspec/dependencies.rb
 - lib/inspec/describe.rb
 - lib/inspec/dsl.rb
+- lib/inspec/env_printer.rb
+- lib/inspec/errors.rb
 - lib/inspec/expect.rb
 - lib/inspec/fetcher.rb
 - lib/inspec/log.rb
@@ -307,6 +326,7 @@ files:
 - lib/inspec/secrets.rb
 - lib/inspec/secrets/yaml.rb
 - lib/inspec/shell.rb
+- lib/inspec/shell_detector.rb
 - lib/inspec/source_reader.rb
 - lib/inspec/version.rb
 - lib/matchers/matchers.rb
@@ -377,6 +397,7 @@ files:
 - lib/utils/filter_array.rb
 - lib/utils/find_files.rb
 - lib/utils/hash.rb
+- lib/utils/hash_map.rb
 - lib/utils/json_log.rb
 - lib/utils/modulator.rb
 - lib/utils/object_traversal.rb
@@ -384,6 +405,14 @@ files:
 - lib/utils/plugin_registry.rb
 - lib/utils/simpleconfig.rb
 - tasks/maintainers.rb
+- test/bench/startup.flat.txt
+- test/bench/startup.graph.html
+- test/bench/startup.grind.dat
+- test/bench/startup.stack.html
+- test/bench/startup/startup.flat.txt
+- test/bench/startup/startup.graph.html
+- test/bench/startup/startup.grind.dat
+- test/bench/startup/startup.stack.html
 - test/cookbooks/os_prepare/attributes/default.rb
 - test/cookbooks/os_prepare/files/empty.iso
 - test/cookbooks/os_prepare/files/example.csv
@@ -577,6 +606,8 @@ files:
 - test/unit/mock/profiles/library/inspec.yml
 - test/unit/mock/profiles/library/libraries/gordonlib.rb
 - test/unit/mock/profiles/library/libraries/testlib.rb
+- test/unit/mock/profiles/resource-tiny/inspec.yml
+- test/unit/mock/profiles/resource-tiny/libraries/resource.rb
 - test/unit/mock/profiles/simple-metadata/inspec.yml
 - test/unit/mock/profiles/skippy-profile-os/controls/one.rb
 - test/unit/mock/profiles/skippy-profile-os/inspec.yml
@@ -638,6 +669,7 @@ files:
 - test/unit/resources/xinetd_test.rb
 - test/unit/resources/yaml_test.rb
 - test/unit/resources/yum_test.rb
+- test/unit/shell_detector_test.rb
 - test/unit/source_reader_test.rb
 - test/unit/source_readers/flat_test.rb
 - test/unit/source_readers/inspec_test.rb
@@ -667,11 +699,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Infrastructure and compliance testing.
 test_files:
+- test/bench/startup.flat.txt
+- test/bench/startup.graph.html
+- test/bench/startup.grind.dat
+- test/bench/startup.stack.html
+- test/bench/startup/startup.flat.txt
+- test/bench/startup/startup.graph.html
+- test/bench/startup/startup.grind.dat
+- test/bench/startup/startup.stack.html
 - test/cookbooks/os_prepare/attributes/default.rb
 - test/cookbooks/os_prepare/files/empty.iso
 - test/cookbooks/os_prepare/files/example.csv
@@ -865,6 +905,8 @@ test_files:
 - test/unit/mock/profiles/library/inspec.yml
 - test/unit/mock/profiles/library/libraries/gordonlib.rb
 - test/unit/mock/profiles/library/libraries/testlib.rb
+- test/unit/mock/profiles/resource-tiny/inspec.yml
+- test/unit/mock/profiles/resource-tiny/libraries/resource.rb
 - test/unit/mock/profiles/simple-metadata/inspec.yml
 - test/unit/mock/profiles/skippy-profile-os/controls/one.rb
 - test/unit/mock/profiles/skippy-profile-os/inspec.yml
@@ -926,6 +968,7 @@ test_files:
 - test/unit/resources/xinetd_test.rb
 - test/unit/resources/yaml_test.rb
 - test/unit/resources/yum_test.rb
+- test/unit/shell_detector_test.rb
 - test/unit/source_reader_test.rb
 - test/unit/source_readers/flat_test.rb
 - test/unit/source_readers/inspec_test.rb