inspec 1.43.5 → 1.43.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4a6aec95f739ef20fa3418d47abd60a5ff8a48d
-  data.tar.gz: 48384f2eaf4146c12db4fd990751552d5070f1c8
+  metadata.gz: 2547e56cb83568acdb210c14ff571d28220d7f6f
+  data.tar.gz: 0ad635b3cb99c3728b0deb137df108f1608a9c50
 SHA512:
-  metadata.gz: 3406d2fd4c9762d58f710d96a65c6805e1e61bb0c11e0d205bab6c77cdf0cac25ce68d244c095c2ccea0814595c579774629a1eaf635654aa45706be08fb7853
-  data.tar.gz: 4153ccfbbd14258b3bcb3e981abbc74dc15a2217ca0c4d7cecc9996c8e9839d32627512e62974e001292018e2f62d88f9d25b97f86fb7a5ccea63d5178c87bc0
+  metadata.gz: 5eb0cb325ab1c2284da9d72b01f05429c6e09716e5b6bab351949481f592221e580f69fba6b63bd27ee304f0c619e85c910e0092fb60a252b89886d84cd56fac
+  data.tar.gz: 9b05c484bb430bbcbbf6711baddaf3e48c8ab02971b173284ee2420a43874306db503049ceac71b5a96e15a17c9ece5d19cc993072c61d88f695a9fb626b34e3

data/CHANGELOG.md

@@ -1,29 +1,37 @@
 # Change Log
 <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 1.43.5 -->
-## [v1.43.5](https://github.com/chef/inspec/tree/v1.43.5) (2017-10-26)
+<!-- latest_release 1.43.8 -->
+## [v1.43.8](https://github.com/chef/inspec/tree/v1.43.8) (2017-11-02)
 
-#### Enhancements
-- Add Chef Automate support to `inspec compliance login` [#2203](https://github.com/chef/inspec/pull/2203) ([jerryaldrichiii](https://github.com/jerryaldrichiii))
+#### Bug Fixes
+- service resource: properly search for SysV Init S files [#2274](https://github.com/chef/inspec/pull/2274) ([Wing924](https://github.com/Wing924))
 <!-- latest_release -->
 
-<!-- release_rollup since=1.42.3 -->
-### Changes since 1.42.3 release
-
-#### Enhancements
-- Add Chef Automate support to `inspec compliance login` [#2203](https://github.com/chef/inspec/pull/2203) ([jerryaldrichiii](https://github.com/jerryaldrichiii)) <!-- 1.43.5 -->
-- Include ref when writing out inspec control objects [#2259](https://github.com/chef/inspec/pull/2259) ([arlimus](https://github.com/arlimus)) <!-- 1.43.2 -->
+<!-- release_rollup since=1.43.5 -->
+### Changes since 1.43.5 release
 
 #### Bug Fixes
-- Fix regression when uploading compliance profiles [#2264](https://github.com/chef/inspec/pull/2264) ([jerryaldrichiii](https://github.com/jerryaldrichiii)) <!-- 1.43.1 -->
+- service resource: properly search for SysV Init S files [#2274](https://github.com/chef/inspec/pull/2274) ([Wing924](https://github.com/Wing924)) <!-- 1.43.8 -->
+- mount resource: fix for Device-/Sharenames and Mountpoints including … [#2257](https://github.com/chef/inspec/pull/2257) ([mgrobelin](https://github.com/mgrobelin)) <!-- 1.43.7 -->
+- inspec compliance login: Ensure supplied server has a proper URI scheme [#2268](https://github.com/chef/inspec/pull/2268) ([jerryaldrichiii](https://github.com/jerryaldrichiii)) <!-- 1.43.6 -->
+<!-- release_rollup -->
+
+<!-- latest_stable_release -->
+## [v1.43.5](https://github.com/chef/inspec/tree/v1.43.5) (2017-10-26)
 
 #### New Resources
-- cran resource: check for R module installation [#2255](https://github.com/chef/inspec/pull/2255) ([mgrobelin](https://github.com/mgrobelin)) <!-- 1.43.4 -->
-- cpan resource: check for Perl module installation [#2254](https://github.com/chef/inspec/pull/2254) ([mgrobelin](https://github.com/mgrobelin)) <!-- 1.43.3 -->
-- new resource: elasticsearch resource, test cluster/node state [#2261](https://github.com/chef/inspec/pull/2261) ([adamleff](https://github.com/adamleff)) <!-- 1.43.0 -->
-<!-- release_rollup -->
+- new resource: elasticsearch resource, test cluster/node state [#2261](https://github.com/chef/inspec/pull/2261) ([adamleff](https://github.com/adamleff))
+- cpan resource: check for Perl module installation [#2254](https://github.com/chef/inspec/pull/2254) ([mgrobelin](https://github.com/mgrobelin))
+- cran resource: check for R module installation [#2255](https://github.com/chef/inspec/pull/2255) ([mgrobelin](https://github.com/mgrobelin))
+
+#### Enhancements
+- Include ref when writing out inspec control objects [#2259](https://github.com/chef/inspec/pull/2259) ([arlimus](https://github.com/arlimus))
+- Add Chef Automate support to `inspec compliance login` [#2203](https://github.com/chef/inspec/pull/2203) ([jerryaldrichiii](https://github.com/jerryaldrichiii))
 
+#### Bug Fixes
+- Fix regression when uploading compliance profiles [#2264](https://github.com/chef/inspec/pull/2264) ([jerryaldrichiii](https://github.com/jerryaldrichiii))
 <!-- latest_stable_release -->
+
 ## [v1.42.3](https://github.com/chef/inspec/tree/v1.42.3) (2017-10-19)
 
 #### Enhancements
@@ -45,7 +53,6 @@
 - Update the profile tempate [#2238](https://github.com/chef/inspec/pull/2238) ([nathenharvey](https://github.com/nathenharvey))
 - Fix documentation of `split` matcher [#2240](https://github.com/chef/inspec/pull/2240) ([eramoto](https://github.com/eramoto))
 - Squashed some unit test warnings [#2242](https://github.com/chef/inspec/pull/2242) ([username-is-already-taken2](https://github.com/username-is-already-taken2))
-<!-- latest_stable_release -->
 
 ## [v1.41.0](https://github.com/chef/inspec/tree/v1.41.0) (2017-10-09)
 

data/docs/resources/docker.md.erb

@@ -18,7 +18,7 @@ A `docker` resource block declares allows you to write test for many containers:
 
 or:
 
-    describe docker.containers.where { name == 'flamboyant_colden' } do
+    describe docker.containers.where { names == 'flamboyant_colden' } do
       it { should be_running }
     end
 

data/docs/resources/shadow.md.erb

@@ -124,15 +124,10 @@ The `min_days` matcher tests the minimum number of days a password must exist, b
 
 ### passwords
 
-The `passwords` matcher tests if passwords are
-
-* Encrypted
-* Have direct logins disabled, as indicated by an asterisk (`*`)
-* In the `/etc/shadow` file, as indicated by the letter x (`x`)
+The `passwords` matcher returns the encrypted password string from the shadow file. The returned string may not be an encrypted password, but rather a `*` or similar which indicates that direct logins are not allowed.
 
 For example:
 
-    its('passwords') { should eq ['x'] }
     its('passwords') { should cmp '*' }
 
 ### users

data/lib/bundles/inspec-compliance/api/login.rb

@@ -11,6 +11,8 @@ module Compliance
       def login(options)
         raise ArgumentError, 'Please specify a server using `inspec compliance login https://SERVER`' unless options['server']
 
+        options['server'] = URI("https://#{options['server']}").to_s if URI(options['server']).scheme.nil?
+
         options['server_type'] = Compliance::API.determine_server_type(options['server'], options['insecure'])
 
         case options['server_type']

data/lib/inspec/version.rb

@@ -4,5 +4,5 @@
 # author: Christoph Hartmann
 
 module Inspec
-  VERSION = '1.43.5'.freeze
+  VERSION = '1.43.8'.freeze
 end

data/lib/resources/service.rb

@@ -397,7 +397,7 @@ module Inspec::Resources
       # read all enabled services from runlevel
       # on rhel via: 'chkconfig --list', is not installed by default
       # bash: for i in `find /etc/rc*.d -name S*`; do basename $i | sed -r 's/^S[0-9]+//'; done | sort | uniq
-      enabled_services_cmd = inspec.command('find /etc/rc*.d /etc/init.d/rc*.d -name S*').stdout
+      enabled_services_cmd = inspec.command('find /etc/rc*.d /etc/init.d/rc*.d -name "S*"').stdout
       service_line = %r{rc(?<runlevel>[0-6])\.d/S[^/]*?#{Regexp.escape service_name}$}
       all_services = enabled_services_cmd.split("\n").map { |line|
         service_line.match(line)

data/lib/utils/parser.rb

@@ -67,7 +67,19 @@ module LinuxMountParser
   # this parses the output of mount command (only tested on linux)
   # this method expects only one line of the mount output
   def parse_mount_options(mount_line, compatibility = false)
-    mount = mount_line.scan(/\S+/)
+    if includes_whitespaces?(mount_line)
+      # Device-/Sharenames and Mountpoints including whitespaces require special treatment:
+      # We use the keyword ' type ' to split up and rebuild the desired array of fields
+      type_split = mount_line.split(' type ')
+      fs_path = type_split[0]
+      other_opts = type_split[1]
+      fs, path = fs_path.match(%r{^(.+?)\son\s(/.+?)$}).captures
+      mount = [fs, 'on', path, 'type']
+      mount.concat(other_opts.scan(/\S+/))
+    else
+      # ... otherwise we just split the fields by whitespaces
+      mount = mount_line.scan(/\S+/)
+    end
 
     # parse device and type
     mount_options    = { device: mount[0], type: mount[4] }
@@ -92,6 +104,12 @@ module LinuxMountParser
 
     mount_options
   end
+
+  # Device-/Sharename or Mountpoint includes whitespaces?
+  def includes_whitespaces?(mount_line)
+    ws = mount_line.match(/^(.+)\son\s(.+)\stype\s.*$/)
+    ws.captures[0].include?(' ') or ws.captures[1].include?(' ')
+  end
 end
 
 module BsdMountParser

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inspec
 version: !ruby/object:Gem::Version
-  version: 1.43.5
+  version: 1.43.8
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-26 00:00:00.000000000 Z
+date: 2017-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: train