inspec 0.12.0 → 0.14.0

data/test/unit/resources/passwd_test.rb

@@ -6,19 +6,74 @@ require 'helper'
 require 'inspec/resource'
 
 describe 'Inspec::Resources::Passwd' do
-  it 'verify passwd parsing' do
-    resource = load_resource('passwd')
-    _(resource.usernames).must_equal %w{root www-data}
-    _(resource.uids).must_equal %w{0 33}
-
-    # verify root passwd resource
-    root = resource.uid(0)
-    _(root.username).must_equal 'root'
-    _(root.count).must_equal 1
-
-    # verify www-data resource
-    www = resource.uid(33)
-    _(www.username).must_equal 'www-data'
-    _(www.count).must_equal 1
+  let(:passwd) { load_resource('passwd') }
+  it 'retrieve users via field' do
+    _(passwd.users).must_equal %w{root www-data}
+  end
+
+  it 'retrieve uids via field' do
+    _(passwd.uids).must_equal %w{0 33}
+  end
+
+  it 'retrieve gids via field' do
+    _(passwd.gids).must_equal %w{0 133}
+  end
+
+  it 'retrieve passwords via field' do
+    _(passwd.passwords).must_equal %w{x x}
+  end
+
+  it 'retrieve login-shells via field' do
+    _(passwd.shells).must_equal %w{/bin/bash /bin/sh}
+  end
+
+  it 'access all lines of the file' do
+    _(passwd.lines).must_equal %w{root:x:0:0:root:/root:/bin/bash www-data:x:33:133:www-data:/var/www:/bin/sh}
+  end
+
+  it 'access all params of the file' do
+    _(passwd.params[1]).must_equal({"user"=>"www-data", "password"=>"x", "uid"=>"33", "gid"=>"133", "desc"=>"www-data", "home"=>"/var/www", "shell"=>"/bin/sh"})
+  end
+
+  describe 'filter by uid == 0' do
+    let(:child) { passwd.uids(0) }
+    it 'creates a new passwd instance' do
+      _(child.content).must_equal 'root:x:0:0:root:/root:/bin/bash'
+    end
+
+    it 'prints a nice to_s string' do
+      _(child.to_s).must_equal '/etc/passwd with uid = "0"'
+    end
+
+    it 'retrieves singular elements instead of arrays when filter has only one entry' do
+      _(child.users).must_equal ['root']
+      _(child.count).must_equal 1
+    end
+  end
+
+  describe 'filter via name =~ /^www/' do
+    let(:child) { passwd.users(/^www/) }
+    it 'filters by user via name (regex)' do
+      _(child.users).must_equal ['www-data']
+      _(child.count).must_equal 1
+    end
+
+    it 'prints a nice to_s string' do
+      _(child.to_s).must_equal '/etc/passwd with user = /^www/'
+    end
+  end
+
+  describe 'deprecated calls' do
+    it 'retrieves a username via uid' do
+      _(passwd.uid(0).username).must_equal 'root'
+    end
+
+    it 'retrieves a usercount via uid' do
+      _(passwd.uid(0).count).must_equal 1
+    end
+
+    it 'retrieves usernames' do
+      _(passwd.usernames).must_equal ['root', 'www-data']
+    end
   end
 end

data/test/unit/resources/shadow_test.rb

@@ -0,0 +1,67 @@
+# encoding: utf-8
+# author: Dominik Richter
+# author: Christoph Hartmann
+
+require 'helper'
+require 'inspec/resource'
+
+describe 'Inspec::Resources::Shadow' do
+  let(:shadow) { load_resource('shadow') }
+
+  it 'retrieve users via field' do
+    _(shadow.users).must_equal %w{root www-data}
+  end
+
+  it 'retrieve passwords via field' do
+    _(shadow.passwords).must_equal %w{x !!}
+  end
+
+  it 'retrieve last password change via field' do
+    _(shadow.last_changes).must_equal %w{1 10}
+  end
+
+  it 'retrieve min password days via field' do
+    _(shadow.min_days).must_equal %w{2 20}
+  end
+
+  it 'retrieve max password days via field' do
+    _(shadow.max_days).must_equal %w{3 30}
+  end
+
+  it 'retrieve warning days for password expiry via field' do
+    _(shadow.warn_days).must_equal [nil, "40"]
+  end
+
+  it 'retrieve days before account is inactive via field' do
+    _(shadow.inactive_days).must_equal [nil, "50"]
+  end
+
+  it 'retrieve dates when account will expire via field' do
+    _(shadow.expiry_dates).must_equal [nil, "60"]
+  end
+
+  it 'access all lines of the file' do
+    _(shadow.lines[0]).must_equal 'root:x:1:2:3::::'
+  end
+
+  it 'access all params of the file' do
+    _(shadow.params[0]).must_equal({
+      'user' => 'root', 'password' => 'x', 'last_change' => '1',
+      'min_days' => '2', 'max_days' => '3', 'warn_days' => nil,
+      'inactive_days' => nil, 'expiry_date' => nil, 'reserved' => nil,
+    })
+  end
+
+  describe 'filter via name =~ /^www/' do
+    let(:child) { shadow.users(/^www/) }
+
+    it 'filters by user via name (regex)' do
+      _(child.users).must_equal ['www-data']
+      _(child.count).must_equal 1
+    end
+
+    it 'prints a nice to_s string' do
+      _(child.to_s).must_equal '/etc/shadow with user = /^www/'
+    end
+  end
+end

data/test/unit/source_reader_test.rb

@@ -0,0 +1,17 @@
+# encoding: utf-8
+# author: Dominik Richter
+# author: Christoph Hartmann
+
+require 'helper'
+
+describe Inspec::SourceReader do
+  let(:reg) { Inspec::SourceReader }
+
+  it 'resolves nil-targets to nil' do
+    _(reg.resolve(nil)).must_be_nil
+  end
+
+  it 'only supports Fetchers' do
+    proc { reg.resolve("not supported") }.must_raise StandardError
+  end
+end

data/test/unit/source_readers/flat_test.rb

@@ -0,0 +1,61 @@
+# encoding: utf-8
+# author: Dominik Richter
+# author: Christoph Hartmann
+
+require 'helper'
+
+describe SourceReaders::Flat do
+  let(:reader) { SourceReaders::Flat }
+
+  it 'registers with the source readers registry' do
+    reg = Inspec::SourceReader.registry
+    _(reg['flat']).must_equal reader
+  end
+
+  describe 'with a flat file' do
+    let(:target) { Inspec::Fetcher.resolve(__FILE__) }
+    let(:res) { Inspec::SourceReader.resolve(target.relative_target) }
+
+    it 'resolves the target' do
+      _(res).must_be_kind_of reader
+    end
+
+    it 'has no metadata' do
+      _(res.metadata.params).must_equal({})
+    end
+
+    it 'retrieves all files' do
+      _(res.tests.keys).must_equal [File.basename(__FILE__)]
+      _(res.tests.values[0]).must_equal File.read(__FILE__)
+    end
+
+    it 'has no libraries' do
+      _(res.libraries).must_be_empty
+    end
+  end
+
+  describe 'with a flat folder' do
+    let(:target) { Inspec::Fetcher.resolve(File.dirname(__FILE__)) }
+    let(:res) { Inspec::SourceReader.resolve(target.relative_target) }
+
+    it 'resolves the target' do
+      _(res).must_be_kind_of reader
+    end
+
+    it 'has no metadata' do
+      _(res.metadata.params).must_equal({})
+    end
+
+    it 'retrieves all files' do
+      dir = File.dirname(__FILE__)
+      full_files = Dir[File.join(dir, '**')]
+      files = full_files.map { |x| x.sub(dir+'/', '') }
+      _(res.tests.keys).must_equal files
+      _(res.tests.values[0]).must_equal File.read(full_files[0])
+    end
+
+    it 'has no libraries' do
+      _(res.libraries).must_be_empty
+    end
+  end
+end

data/test/unit/source_readers/inspec_test.rb

@@ -0,0 +1,38 @@
+# encoding: utf-8
+# author: Dominik Richter
+# author: Christoph Hartmann
+
+require 'helper'
+
+describe SourceReaders::InspecReader do
+  let(:reader) { SourceReaders::InspecReader }
+
+  it 'registers with the source readers registry' do
+    reg = Inspec::SourceReader.registry
+    _(reg['inspec']).must_equal reader
+  end
+
+  describe 'with a valid profile' do
+    let(:mock_file) { mock_file = MockLoader.profile_tgz('complete-profile') }
+    let(:target) { Inspec::Fetcher.resolve(mock_file) }
+    let(:res) { Inspec::SourceReader.resolve(target) }
+
+    it 'resolves the target to inspec' do
+      _(res).must_be_kind_of reader
+    end
+
+    it 'retrieves metadata' do
+      _(res.metadata.params[:name]).must_equal 'complete'
+    end
+
+    it 'retrieves all files' do
+      _(res.tests.keys).must_equal %w{controls/filesystem_spec.rb}
+      _(res.tests.values[0]).must_match /^control 'test01' do$/
+    end
+
+    it 'retrieves all libraries' do
+      _(res.libraries.keys).must_equal %w{libraries/testlib.rb}
+      _(res.libraries.values[0]).must_match /^# Library resource$/
+    end
+  end
+end

data/test/unit/utils/passwd_parser_test.rb

@@ -18,7 +18,7 @@ describe PasswdParser do
 
     it 'parses a valid passwd line' do
       info = [{
-        "name"=>"root",
+        "user"=>"root",
         "password"=>"x",
         "uid"=>"0",
         "gid"=>"0",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inspec
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-15 00:00:00.000000000 Z
+date: 2016-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: r-train
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.6
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.6
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -180,6 +174,7 @@ files:
 - docs/dsl_inspec.rst
 - docs/dsl_resource.rst
 - docs/inspec_and_friends.rst
+- docs/matchers.rst
 - docs/profiles.rst
 - docs/readme.rst
 - docs/resources.rst
@@ -229,20 +224,28 @@ files:
 - lib/bundles/inspec-init/templates/profile/controls/example.rb
 - lib/bundles/inspec-init/templates/profile/inspec.yml
 - lib/bundles/inspec-init/templates/profile/libraries/.gitkeep
+- lib/bundles/inspec-supermarket.rb
 - lib/bundles/inspec-supermarket/README.md
 - lib/bundles/inspec-supermarket/api.rb
 - lib/bundles/inspec-supermarket/cli.rb
 - lib/bundles/inspec-supermarket/target.rb
+- lib/fetchers/local.rb
+- lib/fetchers/tar.rb
+- lib/fetchers/url.rb
+- lib/fetchers/zip.rb
 - lib/inspec.rb
 - lib/inspec/archive/tar.rb
 - lib/inspec/archive/zip.rb
 - lib/inspec/backend.rb
 - lib/inspec/dsl.rb
+- lib/inspec/fetcher.rb
 - lib/inspec/log.rb
 - lib/inspec/metadata.rb
 - lib/inspec/plugins.rb
 - lib/inspec/plugins/cli.rb
+- lib/inspec/plugins/fetcher.rb
 - lib/inspec/plugins/resource.rb
+- lib/inspec/plugins/source_reader.rb
 - lib/inspec/profile.rb
 - lib/inspec/profile_context.rb
 - lib/inspec/resource.rb
@@ -252,15 +255,7 @@ files:
 - lib/inspec/runner_mock.rb
 - lib/inspec/runner_rspec.rb
 - lib/inspec/shell.rb
-- lib/inspec/targets.rb
-- lib/inspec/targets/archive.rb
-- lib/inspec/targets/core.rb
-- lib/inspec/targets/dir.rb
-- lib/inspec/targets/file.rb
-- lib/inspec/targets/folder.rb
-- lib/inspec/targets/tar.rb
-- lib/inspec/targets/url.rb
-- lib/inspec/targets/zip.rb
+- lib/inspec/source_reader.rb
 - lib/inspec/version.rb
 - lib/matchers/matchers.rb
 - lib/resources/apache.rb
@@ -310,11 +305,14 @@ files:
 - lib/resources/script.rb
 - lib/resources/security_policy.rb
 - lib/resources/service.rb
+- lib/resources/shadow.rb
 - lib/resources/ssh_conf.rb
 - lib/resources/user.rb
 - lib/resources/windows_feature.rb
 - lib/resources/yaml.rb
 - lib/resources/yum.rb
+- lib/source_readers/flat.rb
+- lib/source_readers/inspec.rb
 - lib/utils/base_cli.rb
 - lib/utils/convert.rb
 - lib/utils/detect.rb
@@ -324,6 +322,7 @@ files:
 - lib/utils/json_log.rb
 - lib/utils/modulator.rb
 - lib/utils/parser.rb
+- lib/utils/plugin_registry.rb
 - lib/utils/simpleconfig.rb
 - tasks/maintainers.rb
 - test/docker_run.rb
@@ -384,6 +383,11 @@ files:
 - test/resource/sshd_config.rb
 - test/test-extra.yaml
 - test/test.yaml
+- test/unit/fetchers.rb
+- test/unit/fetchers/local_test.rb
+- test/unit/fetchers/tar_test.rb
+- test/unit/fetchers/url_test.rb
+- test/unit/fetchers/zip_test.rb
 - test/unit/metadata_test.rb
 - test/unit/mock/cmd/$env-PATH
 - test/unit/mock/cmd/Get-NetAdapter
@@ -468,11 +472,13 @@ files:
 - test/unit/mock/files/ports.conf
 - test/unit/mock/files/rootwrap.conf
 - test/unit/mock/files/serve-cgi-bin.conf
+- test/unit/mock/files/shadow
 - test/unit/mock/files/ssh_config
 - test/unit/mock/files/sshd_config
 - test/unit/mock/profiles/complete-metadata/inspec.yml
 - test/unit/mock/profiles/complete-profile/controls/filesystem_spec.rb
 - test/unit/mock/profiles/complete-profile/inspec.yml
+- test/unit/mock/profiles/complete-profile/libraries/testlib.rb
 - test/unit/mock/profiles/empty-metadata/inspec.yml
 - test/unit/mock/profiles/legacy-complete-metadata/metadata.rb
 - test/unit/mock/profiles/legacy-complete-metadata/test/.gitkeep
@@ -523,12 +529,15 @@ files:
 - test/unit/resources/script_test.rb
 - test/unit/resources/security_policy_test.rb
 - test/unit/resources/service_test.rb
+- test/unit/resources/shadow_test.rb
 - test/unit/resources/ssh_conf_test.rb
 - test/unit/resources/user_test.rb
 - test/unit/resources/windows_feature.rb
 - test/unit/resources/yaml_test.rb
 - test/unit/resources/yum_test.rb
-- test/unit/targets.rb
+- test/unit/source_reader_test.rb
+- test/unit/source_readers/flat_test.rb
+- test/unit/source_readers/inspec_test.rb
 - test/unit/utils/filter_array_test.rb
 - test/unit/utils/find_files_test.rb
 - test/unit/utils/passwd_parser_test.rb
@@ -617,6 +626,11 @@ test_files:
 - test/resource/sshd_config.rb
 - test/test-extra.yaml
 - test/test.yaml
+- test/unit/fetchers.rb
+- test/unit/fetchers/local_test.rb
+- test/unit/fetchers/tar_test.rb
+- test/unit/fetchers/url_test.rb
+- test/unit/fetchers/zip_test.rb
 - test/unit/metadata_test.rb
 - test/unit/mock/cmd/$env-PATH
 - test/unit/mock/cmd/Get-NetAdapter
@@ -701,11 +715,13 @@ test_files:
 - test/unit/mock/files/ports.conf
 - test/unit/mock/files/rootwrap.conf
 - test/unit/mock/files/serve-cgi-bin.conf
+- test/unit/mock/files/shadow
 - test/unit/mock/files/ssh_config
 - test/unit/mock/files/sshd_config
 - test/unit/mock/profiles/complete-metadata/inspec.yml
 - test/unit/mock/profiles/complete-profile/controls/filesystem_spec.rb
 - test/unit/mock/profiles/complete-profile/inspec.yml
+- test/unit/mock/profiles/complete-profile/libraries/testlib.rb
 - test/unit/mock/profiles/empty-metadata/inspec.yml
 - test/unit/mock/profiles/legacy-complete-metadata/metadata.rb
 - test/unit/mock/profiles/legacy-complete-metadata/test/.gitkeep
@@ -756,12 +772,15 @@ test_files:
 - test/unit/resources/script_test.rb
 - test/unit/resources/security_policy_test.rb
 - test/unit/resources/service_test.rb
+- test/unit/resources/shadow_test.rb
 - test/unit/resources/ssh_conf_test.rb
 - test/unit/resources/user_test.rb
 - test/unit/resources/windows_feature.rb
 - test/unit/resources/yaml_test.rb
 - test/unit/resources/yum_test.rb
-- test/unit/targets.rb
+- test/unit/source_reader_test.rb
+- test/unit/source_readers/flat_test.rb
+- test/unit/source_readers/inspec_test.rb
 - test/unit/utils/filter_array_test.rb
 - test/unit/utils/find_files_test.rb
 - test/unit/utils/passwd_parser_test.rb