inspec 2.0.16 → 2.0.17

data/lib/resources/cran.rb

@@ -1,64 +1,64 @@
-# encoding: utf-8
-
-# Usage:
-# describe cran('DBI') do
-#   it { should be_installed }
-# end
-#
-
-module Inspec::Resources
-  class CranPackage < Inspec.resource(1)
-    name 'cran'
-    supports platform: 'unix'
-    desc 'Use the `cran` InSpec audit resource to test R modules that are installed from CRAN package repository.'
-    example "
-      describe cran('DBI') do
-        it { should be_installed }
-      end
-    "
-
-    def initialize(package_name)
-      @package_name = package_name
-      @r_cmd = 'Rscript'
-
-      # this resource is not supported on Windows
-      return skip_resource 'The `cran` resource is not supported on your OS yet.' if inspec.os.windows?
-      return skip_resource 'Rscript not found' unless inspec.command(@r_cmd).exist?
-    end
-
-    def info
-      return @info if defined?(@info)
-
-      @info = {}
-      @info[:type] = 'cran'
-      @info[:name] = @package_name
-      cmd = inspec.command("#{@r_cmd} -e 'packageVersion(\"#{@package_name}\")'")
-      return @info unless cmd.exit_status.zero?
-
-      # Extract package version from Rscript output
-      # Output includes unicode punctuation (backticks) characters like so:
-      # [1] '0.5.1'
-      #
-      # So make sure command output is converted to unicode, as it returns ASCII-8BIT by default
-      utf8_stdout = cmd.stdout.chomp.force_encoding(Encoding::UTF_8)
-      params = /^\[\d+\]\s+(?:\p{Initial_Punctuation})(.+)(?:\p{Final_Punctuation})$/.match(utf8_stdout)
-      @info[:installed] = !params.nil?
-      return @info unless @info[:installed]
-
-      @info[:version] = params[1]
-      @info
-    end
-
-    def installed?
-      info[:installed] == true
-    end
-
-    def version
-      info[:version]
-    end
-
-    def to_s
-      "R Module #{@package_name}"
-    end
-  end
-end
+# encoding: utf-8
+
+# Usage:
+# describe cran('DBI') do
+#   it { should be_installed }
+# end
+#
+
+module Inspec::Resources
+  class CranPackage < Inspec.resource(1)
+    name 'cran'
+    supports platform: 'unix'
+    desc 'Use the `cran` InSpec audit resource to test R modules that are installed from CRAN package repository.'
+    example "
+      describe cran('DBI') do
+        it { should be_installed }
+      end
+    "
+
+    def initialize(package_name)
+      @package_name = package_name
+      @r_cmd = 'Rscript'
+
+      # this resource is not supported on Windows
+      return skip_resource 'The `cran` resource is not supported on your OS yet.' if inspec.os.windows?
+      return skip_resource 'Rscript not found' unless inspec.command(@r_cmd).exist?
+    end
+
+    def info
+      return @info if defined?(@info)
+
+      @info = {}
+      @info[:type] = 'cran'
+      @info[:name] = @package_name
+      cmd = inspec.command("#{@r_cmd} -e 'packageVersion(\"#{@package_name}\")'")
+      return @info unless cmd.exit_status.zero?
+
+      # Extract package version from Rscript output
+      # Output includes unicode punctuation (backticks) characters like so:
+      # [1] '0.5.1'
+      #
+      # So make sure command output is converted to unicode, as it returns ASCII-8BIT by default
+      utf8_stdout = cmd.stdout.chomp.force_encoding(Encoding::UTF_8)
+      params = /^\[\d+\]\s+(?:\p{Initial_Punctuation})(.+)(?:\p{Final_Punctuation})$/.match(utf8_stdout)
+      @info[:installed] = !params.nil?
+      return @info unless @info[:installed]
+
+      @info[:version] = params[1]
+      @info
+    end
+
+    def installed?
+      info[:installed] == true
+    end
+
+    def version
+      info[:version]
+    end
+
+    def to_s
+      "R Module #{@package_name}"
+    end
+  end
+end

data/lib/resources/crontab.rb

@@ -1,170 +1,170 @@
-# encoding: utf-8
-
-require 'utils/parser'
-require 'utils/filter'
-
-module Inspec::Resources
-  class Crontab < Inspec.resource(1)
-    name 'crontab'
-    supports platform: 'unix'
-    desc 'Use the crontab InSpec audit resource to test the contents of the crontab for a given user which contains information about scheduled tasks owned by that user.'
-    example "
-      describe crontab(user: 'root') do
-        its('commands') { should include '/path/to/some/script' }
-      end
-
-      describe crontab('myuser').commands('/home/myuser/build.sh') do
-        its('hours') { should cmp '*' }
-        its('minutes') { should cmp '*' }
-      end
-
-      describe crontab.where({'hour' => '*', 'minute' => '*'}) do
-        its('entries.length') { should cmp '0' }
-      end
-
-      describe crontab.where { command =~ /a partial command string/ } do
-        its('entries.length') { should cmp 1 }
-      end
-
-      describe crontab(path: '/etc/cron.d/some_crontab') do
-        its('commands') { should include '/path/to/some/script' }
-      end
-    "
-
-    attr_reader :params
-
-    include CommentParser
-
-    def initialize(opts = nil)
-      if opts.respond_to?(:fetch)
-        Hash[opts.map { |k, v| [k.to_sym, v] }]
-        @user = opts.fetch(:user, nil)
-        @path = opts.fetch(:path, nil)
-        raise Inspec::Exceptions::ResourceFailed, 'A user or path must be supplied.' if @user.nil? && @path.nil?
-      else
-        @user = opts
-        @path = nil
-      end
-      raise Inspec::Exceptions::ResourceSkipped, 'The `crontab` resource is not supported on your OS.' unless inspec.os.unix?
-      @params = read_crontab
-    end
-
-    def read_crontab
-      ct = is_system_crontab? ? inspec.file(@path).content : inspec.command(crontab_cmd).stdout
-      ct.lines.map { |l| parse_crontab_line(l) }.compact
-    end
-
-    def parse_crontab_line(l)
-      data, = parse_comment_line(l, comment_char: '#', standalone_comments: false)
-      return nil if data.nil? || data.empty?
-
-      is_system_crontab? ? parse_system_crontab(data) : parse_user_crontab(data)
-    end
-
-    def crontab_cmd
-      @user.nil? ? 'crontab -l' : "crontab -l -u #{@user}"
-    end
-
-    filter = FilterTable.create
-    filter.add_accessor(:where)
-          .add_accessor(:entries)
-          .add(:minutes,  field: 'minute')
-          .add(:hours,    field: 'hour')
-          .add(:days,     field: 'day')
-          .add(:months,   field: 'month')
-          .add(:weekdays, field: 'weekday')
-          .add(:user,     field: 'user')
-          .add(:commands, field: 'command')
-
-    # rebuild the crontab line from raw content
-    filter.add(:content) { |t, _|
-      t.entries.map do |e|
-        [e.minute, e.hour, e.day, e.month, e.weekday, e.user, e.command].compact.join(' ')
-      end.join("\n")
-    }
-
-    filter.connect(self, :params)
-
-    def to_s
-      if is_system_crontab?
-        "crontab for path #{@path}"
-      elsif is_user_crontab?
-        "crontab for user #{@user}"
-      else
-        'crontab for current user'
-      end
-    end
-
-    private
-
-    def is_system_crontab?
-      !@path.nil?
-    end
-
-    def is_user_crontab?
-      !@user.nil?
-    end
-
-    def parse_system_crontab(data)
-      case data
-      when /@hourly .*/
-        elements = data.split(/\s+/, 3)
-        { 'minute' => '0', 'hour' => '*', 'day' => '*', 'month' => '*', 'weekday' => '*', 'user' => elements.at(1), 'command' => elements.at(2) }
-      when /@(midnight|daily) .*/
-        elements = data.split(/\s+/, 3)
-        { 'minute' => '0', 'hour' => '0', 'day' => '*', 'month' => '*', 'weekday' => '*', 'user' => elements.at(1), 'command' => elements.at(2) }
-      when /@weekly .*/
-        elements = data.split(/\s+/, 3)
-        { 'minute' => '0', 'hour' => '0', 'day' => '*', 'month' => '*', 'weekday' => '0', 'user' => elements.at(1), 'command' => elements.at(2) }
-      when /@monthly ./
-        elements = data.split(/\s+/, 3)
-        { 'minute' => '0', 'hour' => '0', 'day' => '1', 'month' => '*', 'weekday' => '*', 'user' => elements.at(1), 'command' => elements.at(2) }
-      when /@(annually|yearly) .*/
-        elements = data.split(/\s+/, 3)
-        { 'minute' => '0', 'hour' => '0', 'day' => '1', 'month' => '1', 'weekday' => '*', 'user' => elements.at(1), 'command' => elements.at(2) }
-      when /@reboot .*/
-        elements = data.split(/\s+/, 3)
-        { 'minute' => '-1', 'hour' => '-1', 'day' => '-1', 'month' => '-1', 'weekday' => '-1', 'user' => elements.at(1), 'command' => elements.at(2) }
-      else
-        elements = data.split(/\s+/, 7)
-        {
-          'minute'  => elements.at(0),
-          'hour'    => elements.at(1),
-          'day'     => elements.at(2),
-          'month'   => elements.at(3),
-          'weekday' => elements.at(4),
-          'user'    => elements.at(5),
-          'command' => elements.at(6),
-        }
-      end
-    end
-
-    def parse_user_crontab(data)
-      case data
-      when /@hourly .*/
-        { 'minute' => '0', 'hour' => '*', 'day' => '*', 'month' => '*', 'weekday' => '*', 'user' => @user, 'command' => data.split(/\s+/, 2).at(1) }
-      when /@(midnight|daily) .*/
-        { 'minute' => '0', 'hour' => '0', 'day' => '*', 'month' => '*', 'weekday' => '*', 'user' => @user, 'command' => data.split(/\s+/, 2).at(1) }
-      when /@weekly .*/
-        { 'minute' => '0', 'hour' => '0', 'day' => '*', 'month' => '*', 'weekday' => '0', 'user' => @user, 'command' => data.split(/\s+/, 2).at(1) }
-      when /@monthly ./
-        { 'minute' => '0', 'hour' => '0', 'day' => '1', 'month' => '*', 'weekday' => '*', 'user' => @user, 'command' => data.split(/\s+/, 2).at(1) }
-      when /@(annually|yearly) .*/
-        { 'minute' => '0', 'hour' => '0', 'day' => '1', 'month' => '1', 'weekday' => '*', 'user' => @user, 'command' => data.split(/\s+/, 2).at(1) }
-      when /@reboot .*/
-        { 'minute' => '-1', 'hour' => '-1', 'day' => '-1', 'month' => '-1', 'weekday' => '-1', 'user' => @user, 'command' => data.split(/\s+/, 2).at(1) }
-      else
-        elements = data.split(/\s+/, 6)
-        {
-          'minute'  => elements.at(0),
-          'hour'    => elements.at(1),
-          'day'     => elements.at(2),
-          'month'   => elements.at(3),
-          'weekday' => elements.at(4),
-          'user'    => @user,
-          'command' => elements.at(5),
-        }
-      end
-    end
-  end
-end
+# encoding: utf-8
+
+require 'utils/parser'
+require 'utils/filter'
+
+module Inspec::Resources
+  class Crontab < Inspec.resource(1)
+    name 'crontab'
+    supports platform: 'unix'
+    desc 'Use the crontab InSpec audit resource to test the contents of the crontab for a given user which contains information about scheduled tasks owned by that user.'
+    example "
+      describe crontab(user: 'root') do
+        its('commands') { should include '/path/to/some/script' }
+      end
+
+      describe crontab('myuser').commands('/home/myuser/build.sh') do
+        its('hours') { should cmp '*' }
+        its('minutes') { should cmp '*' }
+      end
+
+      describe crontab.where({'hour' => '*', 'minute' => '*'}) do
+        its('entries.length') { should cmp '0' }
+      end
+
+      describe crontab.where { command =~ /a partial command string/ } do
+        its('entries.length') { should cmp 1 }
+      end
+
+      describe crontab(path: '/etc/cron.d/some_crontab') do
+        its('commands') { should include '/path/to/some/script' }
+      end
+    "
+
+    attr_reader :params
+
+    include CommentParser
+
+    def initialize(opts = nil)
+      if opts.respond_to?(:fetch)
+        Hash[opts.map { |k, v| [k.to_sym, v] }]
+        @user = opts.fetch(:user, nil)
+        @path = opts.fetch(:path, nil)
+        raise Inspec::Exceptions::ResourceFailed, 'A user or path must be supplied.' if @user.nil? && @path.nil?
+      else
+        @user = opts
+        @path = nil
+      end
+      raise Inspec::Exceptions::ResourceSkipped, 'The `crontab` resource is not supported on your OS.' unless inspec.os.unix?
+      @params = read_crontab
+    end
+
+    def read_crontab
+      ct = is_system_crontab? ? inspec.file(@path).content : inspec.command(crontab_cmd).stdout
+      ct.lines.map { |l| parse_crontab_line(l) }.compact
+    end
+
+    def parse_crontab_line(l)
+      data, = parse_comment_line(l, comment_char: '#', standalone_comments: false)
+      return nil if data.nil? || data.empty?
+
+      is_system_crontab? ? parse_system_crontab(data) : parse_user_crontab(data)
+    end
+
+    def crontab_cmd
+      @user.nil? ? 'crontab -l' : "crontab -l -u #{@user}"
+    end
+
+    filter = FilterTable.create
+    filter.add_accessor(:where)
+          .add_accessor(:entries)
+          .add(:minutes,  field: 'minute')
+          .add(:hours,    field: 'hour')
+          .add(:days,     field: 'day')
+          .add(:months,   field: 'month')
+          .add(:weekdays, field: 'weekday')
+          .add(:user,     field: 'user')
+          .add(:commands, field: 'command')
+
+    # rebuild the crontab line from raw content
+    filter.add(:content) { |t, _|
+      t.entries.map do |e|
+        [e.minute, e.hour, e.day, e.month, e.weekday, e.user, e.command].compact.join(' ')
+      end.join("\n")
+    }
+
+    filter.connect(self, :params)
+
+    def to_s
+      if is_system_crontab?
+        "crontab for path #{@path}"
+      elsif is_user_crontab?
+        "crontab for user #{@user}"
+      else
+        'crontab for current user'
+      end
+    end
+
+    private
+
+    def is_system_crontab?
+      !@path.nil?
+    end
+
+    def is_user_crontab?
+      !@user.nil?
+    end
+
+    def parse_system_crontab(data)
+      case data
+      when /@hourly .*/
+        elements = data.split(/\s+/, 3)
+        { 'minute' => '0', 'hour' => '*', 'day' => '*', 'month' => '*', 'weekday' => '*', 'user' => elements.at(1), 'command' => elements.at(2) }
+      when /@(midnight|daily) .*/
+        elements = data.split(/\s+/, 3)
+        { 'minute' => '0', 'hour' => '0', 'day' => '*', 'month' => '*', 'weekday' => '*', 'user' => elements.at(1), 'command' => elements.at(2) }
+      when /@weekly .*/
+        elements = data.split(/\s+/, 3)
+        { 'minute' => '0', 'hour' => '0', 'day' => '*', 'month' => '*', 'weekday' => '0', 'user' => elements.at(1), 'command' => elements.at(2) }
+      when /@monthly ./
+        elements = data.split(/\s+/, 3)
+        { 'minute' => '0', 'hour' => '0', 'day' => '1', 'month' => '*', 'weekday' => '*', 'user' => elements.at(1), 'command' => elements.at(2) }
+      when /@(annually|yearly) .*/
+        elements = data.split(/\s+/, 3)
+        { 'minute' => '0', 'hour' => '0', 'day' => '1', 'month' => '1', 'weekday' => '*', 'user' => elements.at(1), 'command' => elements.at(2) }
+      when /@reboot .*/
+        elements = data.split(/\s+/, 3)
+        { 'minute' => '-1', 'hour' => '-1', 'day' => '-1', 'month' => '-1', 'weekday' => '-1', 'user' => elements.at(1), 'command' => elements.at(2) }
+      else
+        elements = data.split(/\s+/, 7)
+        {
+          'minute'  => elements.at(0),
+          'hour'    => elements.at(1),
+          'day'     => elements.at(2),
+          'month'   => elements.at(3),
+          'weekday' => elements.at(4),
+          'user'    => elements.at(5),
+          'command' => elements.at(6),
+        }
+      end
+    end
+
+    def parse_user_crontab(data)
+      case data
+      when /@hourly .*/
+        { 'minute' => '0', 'hour' => '*', 'day' => '*', 'month' => '*', 'weekday' => '*', 'user' => @user, 'command' => data.split(/\s+/, 2).at(1) }
+      when /@(midnight|daily) .*/
+        { 'minute' => '0', 'hour' => '0', 'day' => '*', 'month' => '*', 'weekday' => '*', 'user' => @user, 'command' => data.split(/\s+/, 2).at(1) }
+      when /@weekly .*/
+        { 'minute' => '0', 'hour' => '0', 'day' => '*', 'month' => '*', 'weekday' => '0', 'user' => @user, 'command' => data.split(/\s+/, 2).at(1) }
+      when /@monthly ./
+        { 'minute' => '0', 'hour' => '0', 'day' => '1', 'month' => '*', 'weekday' => '*', 'user' => @user, 'command' => data.split(/\s+/, 2).at(1) }
+      when /@(annually|yearly) .*/
+        { 'minute' => '0', 'hour' => '0', 'day' => '1', 'month' => '1', 'weekday' => '*', 'user' => @user, 'command' => data.split(/\s+/, 2).at(1) }
+      when /@reboot .*/
+        { 'minute' => '-1', 'hour' => '-1', 'day' => '-1', 'month' => '-1', 'weekday' => '-1', 'user' => @user, 'command' => data.split(/\s+/, 2).at(1) }
+      else
+        elements = data.split(/\s+/, 6)
+        {
+          'minute'  => elements.at(0),
+          'hour'    => elements.at(1),
+          'day'     => elements.at(2),
+          'month'   => elements.at(3),
+          'weekday' => elements.at(4),
+          'user'    => @user,
+          'command' => elements.at(5),
+        }
+      end
+    end
+  end
+end