inspec 2.2.20 → 2.2.27

data/lib/resources/etc_fstab.rb

@@ -38,17 +38,15 @@ module Inspec::Resources
     end
 
     filter = FilterTable.create
-    filter.add_accessor(:where)
-          .add_accessor(:entries)
-          .add(:device_name,           field: 'device_name')
-          .add(:mount_point,           field: 'mount_point')
-          .add(:file_system_type,      field: 'file_system_type')
-          .add(:mount_options,         field: 'mount_options')
-          .add(:dump_options,          field: 'dump_options')
-          .add(:file_system_options,   field: 'file_system_options')
-          .add(:configured?) { |x| x.entries.any? }
+    filter.register_column(:device_name,           field: 'device_name')
+          .register_column(:mount_point,           field: 'mount_point')
+          .register_column(:file_system_type,      field: 'file_system_type')
+          .register_column(:mount_options,         field: 'mount_options')
+          .register_column(:dump_options,          field: 'dump_options')
+          .register_column(:file_system_options,   field: 'file_system_options')
+          .register_custom_matcher(:configured?) { |x| x.entries.any? }
 
-    filter.connect(self, :params)
+    filter.install_filter_methods_on_resource(self, :params)
 
     def nfs_file_systems
       where { file_system_type.match(/nfs/) }

data/lib/resources/etc_hosts.rb

@@ -33,12 +33,10 @@ class EtcHosts < Inspec.resource(1)
   end
 
   FilterTable.create
-             .add_accessor(:where)
-             .add_accessor(:entries)
-             .add(:ip_address,     field: 'ip_address')
-             .add(:primary_name,   field: 'primary_name')
-             .add(:all_host_names, field: 'all_host_names')
-             .connect(self, :params)
+             .register_column(:ip_address,     field: 'ip_address')
+             .register_column(:primary_name,   field: 'primary_name')
+             .register_column(:all_host_names, field: 'all_host_names')
+             .install_filter_methods_on_resource(self, :params)
 
   private
 

data/lib/resources/etc_hosts_allow_deny.rb

@@ -29,13 +29,11 @@ module Inspec::Resources
     end
 
     filter = FilterTable.create
-    filter.add_accessor(:where)
-          .add_accessor(:entries)
-          .add(:daemon,      field: 'daemon')
-          .add(:client_list, field: 'client_list')
-          .add(:options,     field: 'options')
+    filter.register_column(:daemon,      field: 'daemon')
+          .register_column(:client_list, field: 'client_list')
+          .register_column(:options,     field: 'options')
 
-    filter.connect(self, :params)
+    filter.install_filter_methods_on_resource(self, :params)
 
     private
 

data/lib/resources/file.rb

@@ -44,7 +44,7 @@ module Inspec::Resources
     %w{
       type exist? file? block_device? character_device? socket? directory?
       symlink? pipe? mode mode? owner owned_by? group grouped_into?
-      link_path linked_to? mtime size selinux_label immutable?
+      link_path shallow_link_path linked_to? mtime size selinux_label immutable?
       product_version file_version version? md5sum sha256sum
       path basename source source_path uid gid
     }.each do |m|

data/lib/resources/firewalld.rb

@@ -28,14 +28,12 @@ module Inspec::Resources
     attr_reader :params
 
     filter = FilterTable.create
-    filter.add_accessor(:where)
-          .add_accessor(:entries)
-          .add(:zone,       field: 'zone')
-          .add(:interfaces, field: 'interfaces')
-          .add(:sources,    field: 'sources')
-          .add(:services,   field: 'services')
-
-    filter.connect(self, :params)
+    filter.register_column(:zone,       field: 'zone')
+          .register_column(:interfaces, field: 'interfaces')
+          .register_column(:sources,    field: 'sources')
+          .register_column(:services,   field: 'services')
+
+    filter.install_filter_methods_on_resource(self, :params)
 
     def initialize
       @params = parse_active_zones(active_zones)

data/lib/resources/groups.rb

@@ -47,14 +47,12 @@ module Inspec::Resources
     end
 
     filter = FilterTable.create
-    filter.add_accessor(:where)
-          .add_accessor(:entries)
-          .add(:names,     field: 'name')
-          .add(:gids,      field: 'gid')
-          .add(:domains,   field: 'domain')
-          .add(:members,   field: 'members')
-          .add(:exists?) { |x| !x.entries.empty? }
-    filter.connect(self, :collect_group_details)
+    filter.register_custom_matcher(:exists?) { |x| !x.entries.empty? }
+    filter.register_column(:names,     field: 'name')
+          .register_column(:gids,      field: 'gid')
+          .register_column(:domains,   field: 'domain')
+          .register_column(:members,   field: 'members')
+    filter.install_filter_methods_on_resource(self, :collect_group_details)
 
     def to_s
       'Groups'

data/lib/resources/nginx_conf.rb

@@ -156,9 +156,8 @@ module Inspec::Resources
     end
 
     filter = FilterTable.create
-    filter.add_accessor(:where)
-          .add(:servers, field: 'server')
-          .connect(self, :server_table)
+    filter.register_column(:servers, field: 'server')
+          .install_filter_methods_on_resource(self, :server_table)
 
     def locations
       servers.map(&:locations).flatten
@@ -184,9 +183,8 @@ module Inspec::Resources
     end
 
     filter = FilterTable.create
-    filter.add_accessor(:where)
-          .add(:locations, field: 'location')
-          .connect(self, :location_table)
+    filter.register_column(:locations, field: 'location')
+          .install_filter_methods_on_resource(self, :location_table)
 
     def to_s
       server = ''

data/lib/resources/packages.rb

@@ -42,13 +42,11 @@ module Inspec::Resources
     end
 
     filter = FilterTable.create
-    filter.add_accessor(:where)
-          .add_accessor(:entries)
-          .add(:statuses,  field: 'status', style: :simple)
-          .add(:names,     field: 'name')
-          .add(:versions,  field: 'version')
-          .add(:architectures, field: 'architecture')
-          .connect(self, :filtered_packages)
+    filter.register_column(:statuses,  field: 'status', style: :simple)
+          .register_column(:names,     field: 'name')
+          .register_column(:versions,  field: 'version')
+          .register_column(:architectures, field: 'architecture')
+          .install_filter_methods_on_resource(self, :filtered_packages)
 
     private
 

data/lib/resources/passwd.rb

@@ -50,24 +50,22 @@ module Inspec::Resources
     end
 
     filter = FilterTable.create
-    filter.add_accessor(:where)
-          .add_accessor(:entries)
-          .add(:users,     field: 'user')
-          .add(:passwords, field: 'password')
-          .add(:uids,      field: 'uid')
-          .add(:gids,      field: 'gid')
-          .add(:descs,     field: 'desc')
-          .add(:homes,     field: 'home')
-          .add(:shells,    field: 'shell')
+    filter.register_column(:users,     field: 'user')
+          .register_column(:passwords, field: 'password')
+          .register_column(:uids,      field: 'uid')
+          .register_column(:gids,      field: 'gid')
+          .register_column(:descs,     field: 'desc')
+          .register_column(:homes,     field: 'home')
+          .register_column(:shells,    field: 'shell')
 
     # rebuild the passwd line from raw content
-    filter.add(:content) { |t, _|
+    filter.register_custom_property(:content) { |t, _|
       t.entries.map do |e|
         [e.user, e.password, e.uid, e.gid, e.desc, e.home, e.shell].join(':')
       end.join("\n")
     }
 
-    filter.connect(self, :params)
+    filter.install_filter_methods_on_resource(self, :params)
 
     def to_s
       '/etc/passwd'

data/lib/resources/port.rb

@@ -39,15 +39,13 @@ module Inspec::Resources
     end
 
     filter = FilterTable.create
-    filter.add_accessor(:where)
-          .add_accessor(:entries)
-          .add(:ports,     field: 'port', style: :simple)
-          .add(:addresses, field: 'address', style: :simple)
-          .add(:protocols, field: 'protocol', style: :simple)
-          .add(:processes, field: 'process', style: :simple)
-          .add(:pids,      field: 'pid', style: :simple)
-          .add(:listening?) { |x| !x.entries.empty? }
-    filter.connect(self, :info)
+    filter.register_column(:ports,     field: 'port', style: :simple)
+          .register_column(:addresses, field: 'address', style: :simple)
+          .register_column(:protocols, field: 'protocol', style: :simple)
+          .register_column(:processes, field: 'process', style: :simple)
+          .register_column(:pids,      field: 'pid', style: :simple)
+          .register_custom_matcher(:listening?) { |x| !x.entries.empty? }
+    filter.install_filter_methods_on_resource(self, :info)
 
     def to_s
       "Port #{@port}"

data/lib/resources/postgres_hba_conf.rb

@@ -28,16 +28,14 @@ module Inspec::Resources
     end
 
     filter = FilterTable.create
-    filter.add_accessor(:where)
-          .add_accessor(:entries)
-          .add(:type,     field: 'type')
-          .add(:database, field: 'database')
-          .add(:user,     field: 'user')
-          .add(:address,  field: 'address')
-          .add(:auth_method, field: 'auth_method')
-          .add(:auth_params, field: 'auth_params')
+    filter.register_column(:type,     field: 'type')
+          .register_column(:database, field: 'database')
+          .register_column(:user,     field: 'user')
+          .register_column(:address,  field: 'address')
+          .register_column(:auth_method, field: 'auth_method')
+          .register_column(:auth_params, field: 'auth_params')
 
-    filter.connect(self, :params)
+    filter.install_filter_methods_on_resource(self, :params)
 
     def to_s
       "Postgres Hba Config #{@conf_file}"

data/lib/resources/postgres_ident_conf.rb

@@ -27,13 +27,11 @@ module Inspec::Resources
     end
 
     filter = FilterTable.create
-    filter.add_accessor(:where)
-          .add_accessor(:entries)
-          .add(:map_name,        field: 'map_name')
-          .add(:system_username, field: 'system_username')
-          .add(:pg_username,     field: 'pg_username')
+    filter.register_column(:map_name,        field: 'map_name')
+          .register_column(:system_username, field: 'system_username')
+          .register_column(:pg_username,     field: 'pg_username')
 
-    filter.connect(self, :params)
+    filter.install_filter_methods_on_resource(self, :params)
 
     def to_s
       "PostgreSQL Ident Config #{@conf_file}"

data/lib/resources/processes.rb

@@ -61,21 +61,19 @@ module Inspec::Resources
     end
 
     filter = FilterTable.create
-    filter.add_accessor(:where)
-          .add_accessor(:entries)
-          .add(:labels,   field: 'label')
-          .add(:pids,     field: 'pid')
-          .add(:cpus,     field: 'cpu')
-          .add(:mem,      field: 'mem')
-          .add(:vsz,      field: 'vsz')
-          .add(:rss,      field: 'rss')
-          .add(:tty,      field: 'tty')
-          .add(:states,   field: 'stat')
-          .add(:start,    field: 'start')
-          .add(:time,     field: 'time')
-          .add(:users,    field: 'user')
-          .add(:commands, field: 'command')
-          .connect(self, :filtered_processes)
+    filter.register_column(:labels,   field: 'label')
+          .register_column(:pids,     field: 'pid')
+          .register_column(:cpus,     field: 'cpu')
+          .register_column(:mem,      field: 'mem')
+          .register_column(:vsz,      field: 'vsz')
+          .register_column(:rss,      field: 'rss')
+          .register_column(:tty,      field: 'tty')
+          .register_column(:states,   field: 'stat')
+          .register_column(:start,    field: 'start')
+          .register_column(:time,     field: 'time')
+          .register_column(:users,    field: 'user')
+          .register_column(:commands, field: 'command')
+          .install_filter_methods_on_resource(self, :filtered_processes)
 
     private
 

data/lib/resources/ssl.rb

@@ -58,15 +58,13 @@ class SSL < Inspec.resource(1)
   end
 
   filter = FilterTable.create
-  filter.add(:enabled?) do |x|
+  filter.register_custom_matcher(:enabled?) do |x|
     raise 'Cannot determine host for SSL test. Please specify it or use a different target.' if x.resource.host.nil?
     x.handshake.values.any? { |i| i['success'] }
   end
-  filter.add_accessor(:where)
-        .add_accessor(:entries)
-        .add(:ciphers, field: 'cipher')
-        .add(:protocols, field: 'protocol')
-        .add(:handshake) { |x|
+  filter.register_column(:ciphers, field: 'cipher')
+        .register_column(:protocols, field: 'protocol')
+        .register_custom_property(:handshake) { |x|
           groups = x.entries.group_by(&:protocol)
           res = Parallel.map(groups, in_threads: 8) do |proto, e|
             [proto, SSLShake.hello(x.resource.host, port: x.resource.port,
@@ -75,7 +73,7 @@ class SSL < Inspec.resource(1)
           end
           Hash[res]
         }
-        .connect(self, :scan_config)
+        .install_filter_methods_on_resource(self, :scan_config)
 
   def to_s
     "SSL/TLS on #{@host}:#{@port}"

data/lib/resources/users.rb

@@ -70,23 +70,21 @@ module Inspec::Resources
     end
 
     filter = FilterTable.create
-    filter.add_accessor(:where)
-          .add_accessor(:entries)
-          .add(:usernames, field: :username)
-          .add(:uids,      field: :uid)
-          .add(:gids,      field: :gid)
-          .add(:groupnames, field: :groupname)
-          .add(:groups,    field: :groups)
-          .add(:homes,     field: :home)
-          .add(:shells,    field: :shell)
-          .add(:mindays,   field: :mindays)
-          .add(:maxdays,   field: :maxdays)
-          .add(:warndays,  field: :warndays)
-          .add(:disabled,  field: :disabled)
-          .add(:exists?) { |x| !x.entries.empty? }
-          .add(:disabled?) { |x| x.where { disabled == false }.entries.empty? }
-          .add(:enabled?) { |x| x.where { disabled == true }.entries.empty? }
-    filter.connect(self, :collect_user_details)
+    filter.register_custom_matcher(:exists?) { |x| !x.entries.empty? }
+    filter.register_column(:usernames, field: :username)
+          .register_column(:uids,      field: :uid)
+          .register_column(:gids,      field: :gid)
+          .register_column(:groupnames, field: :groupname)
+          .register_column(:groups,    field: :groups)
+          .register_column(:homes,     field: :home)
+          .register_column(:shells,    field: :shell)
+          .register_column(:mindays,   field: :mindays)
+          .register_column(:maxdays,   field: :maxdays)
+          .register_column(:warndays,  field: :warndays)
+          .register_column(:disabled,  field: :disabled)
+          .register_custom_matcher(:disabled?) { |x| x.where { disabled == false }.entries.empty? }
+          .register_custom_matcher(:enabled?) { |x| x.where { disabled == true }.entries.empty? }
+    filter.install_filter_methods_on_resource(self, :collect_user_details)
 
     def to_s
       'Users'

data/lib/resources/xinetd.rb

@@ -37,17 +37,15 @@ module Inspec::Resources
     end
 
     filter = FilterTable.create
-    filter.add_accessor(:where)
-          .add_accessor(:entries)
-          .add(:services,     field: 'service')
-          .add(:ids,          field: 'id')
-          .add(:socket_types, field: 'socket_type')
-          .add(:types,        field: 'type')
-          .add(:protocols,    field: 'protocol')
-          .add(:wait,         field: 'wait')
-          .add(:disabled?) { |x| x.where('disable' => 'no').services.empty? }
-          .add(:enabled?) { |x| x.where('disable' => 'yes').services.empty? }
-          .connect(self, :service_lines)
+    filter.register_column(:services,     field: 'service')
+          .register_column(:ids,          field: 'id')
+          .register_column(:socket_types, field: 'socket_type')
+          .register_column(:types,        field: 'type')
+          .register_column(:protocols,    field: 'protocol')
+          .register_column(:wait,         field: 'wait')
+          .register_custom_matcher(:disabled?) { |x| x.where('disable' => 'no').services.empty? }
+          .register_custom_matcher(:enabled?) { |x| x.where('disable' => 'yes').services.empty? }
+          .install_filter_methods_on_resource(self, :service_lines)
 
     private
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inspec
 version: !ruby/object:Gem::Version
-  version: 2.2.20
+  version: 2.2.27
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-21 00:00:00.000000000 Z
+date: 2018-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: train