inspec 3.1.3 → 3.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54ccf8c9157dd5a8f7641ef3612d2e2909cafcceaa3c54cd5e6cbfbee95cd71e
-  data.tar.gz: 3080398f8bb9aaa6095c7d6d345b0b6be9e3e0ad97825faeb5f9d3475dfaedd6
+  metadata.gz: 41bedb4528fa302afca59c5834684789d195e7addb8247cf03bad101be3c26db
+  data.tar.gz: e0d91369ea72888be97ad4eaeab9515f4a38a87609de938495b1c2d317ad67f0
 SHA512:
-  metadata.gz: 064c5a157f5b79bf2c2be616dcf99ac4d4ad850236f16ea0b86aa02ca6e87c1d20bf2db18e43ac1cc487b3aebf9462c9a412b5a7ee2d4d705496dcd3047a201b
-  data.tar.gz: bdf94be09e23b2c7ec9ba244858f01f3de9139f5bb96df207fe69c5543b5d670dc52a90dd06e8d449360eb92243289c7df57d8bcf3de46943be9f7d59a3cf35d
+  metadata.gz: 2beb30ea2652ed85d070783c9f846b47d8624809419286b0cb78ead32902b92af0578e6ea281c50637697b38e20fd165445be9baa5946e04b1aab2503d5fcb6e
+  data.tar.gz: f741b613b7472f4a2be1fd7d155398af3ad9aa54ac4f191ac812e89cf5ab2710fd976b4750a8bcd79dad094facdd50f5c2296f5c4845003975875f1f251ce1ca

data/README.md

@@ -117,6 +117,8 @@ Finished in 0.04321 seconds (files took 0.54917 seconds to load)
 
 ### Install it from source
 
+Note that installing from OS packages from [the download page](https://downloads.chef.io) is the preferred method.
+
 That requires [bundler](http://bundler.io/):
 
 ```bash
@@ -451,4 +453,4 @@ Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
-limitations under the License.
+limitations under the License. 

data/inspec.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.3'
 
-  spec.add_dependency 'train', '~> 1.5', '>= 1.5.11'
+  spec.add_dependency 'train', '~> 1.5', '>= 1.6.3'
   spec.add_dependency 'thor', '~> 0.20'
   spec.add_dependency 'json', '>= 1.8', '< 3.0'
   spec.add_dependency 'method_source', '~> 0.8'

data/lib/inspec/base_cli.rb

@@ -69,6 +69,12 @@ module Inspec
         desc: 'Use SSL for transport layer encryption (WinRM).'
       option :self_signed, type: :boolean,
         desc: 'Allow remote scans with self-signed certificates (WinRM).'
+      option :winrm_transport, type: :string, default: 'negotiate',
+        desc: 'Specify which transport to use, defaults to negotiate (WinRM).'
+      option :winrm_disable_sspi, type: :boolean,
+        desc: 'Whether to use disable sspi authentication, defaults to false (WinRM).'
+      option :winrm_basic_auth, type: :boolean,
+        desc: 'Whether to use basic authentication, defaults to false (WinRM).'
       option :json_config, type: :string,
         desc: 'Read configuration from JSON file (`-` reads from stdin).'
       option :proxy_command, type: :string,

data/lib/inspec/version.rb

@@ -4,5 +4,5 @@
 # author: Christoph Hartmann
 
 module Inspec
-  VERSION = '3.1.3'
+  VERSION = '3.2.6'
 end

data/lib/resource_support/aws.rb

@@ -51,6 +51,7 @@ require 'resources/aws/aws_security_groups'
 require 'resources/aws/aws_sns_subscription'
 require 'resources/aws/aws_sns_topic'
 require 'resources/aws/aws_sns_topics'
+require 'resources/aws/aws_sqs_queue'
 require 'resources/aws/aws_subnet'
 require 'resources/aws/aws_subnets'
 require 'resources/aws/aws_vpc'

data/lib/resources/aws/aws_sqs_queue.rb

@@ -0,0 +1,62 @@
+require 'uri'
+
+class AwsSqsQueue < Inspec.resource(1)
+  name 'aws_sqs_queue'
+  desc 'Verifies settings for an SQS Queue'
+  example "
+    describe aws_sqs_queue('https://sqs.ap-southeast-2.amazonaws.com/519527725796/QueueName') do
+      it { should exist }
+      its('visiblity_timeout') { should be 300}
+    end
+  "
+  supports platform: 'aws'
+
+  include AwsSingularResourceMixin
+  attr_reader :arn, :is_fifo_queue, :visibility_timeout, :maximum_message_size, :message_retention_period, :delay_seconds, :receive_message_wait_timeout_seconds, :content_based_deduplication
+
+  private
+
+  def validate_params(raw_params)
+    validated_params = check_resource_param_names(
+      raw_params: raw_params,
+      allowed_params: [:url],
+      allowed_scalar_name: :url,
+      allowed_scalar_type: String,
+    )
+    # Validate the URL
+    unless validated_params[:url] =~ /\A#{URI::DEFAULT_PARSER.make_regexp(%w{https})}\z/
+      raise ArgumentError, 'Malformed URL for SQS.  Expected an ARN of the form ' \
+                           "'https://sqs.ap-southeast-2.amazonaws.com/111212121/MyQeueue'"
+    end
+    validated_params
+  end
+
+  def fetch_from_api
+    aws_response = BackendFactory.create(inspec_runner).get_queue_attributes(queue_url: @url, attribute_names: ['All']).attributes
+    @exists = true
+    @visibility_timeout = aws_response['VisibilityTimeout'].to_i
+    @maximum_message_size = aws_response['MaximumMessageSize'].to_i
+    @message_retention_period = aws_response['MessageRetentionPeriod'].to_i
+    @delay_seconds = aws_response['DelaySeconds'].to_i
+    @receive_message_wait_timeout_seconds = aws_response['ReceiveMessageWaitTimeSeconds'].to_i
+
+    # FIFO queues - these attributes only exist for FIFO queues, their presence indicates a FIFO
+    # queue
+    @is_fifo_queue = aws_response['FifoQueue'].nil? ? false: true
+    @content_based_deduplication = aws_response['ContentBasedDeduplication'].nil? ? false: true
+  rescue Aws::SQS::Errors::NonExistentQueue
+    @exists = false
+  end
+
+  # Uses the SDK API to really talk to AWS
+  class Backend
+    class AwsClientApi < AwsBackendBase
+      BackendFactory.set_default_backend(self)
+      self.aws_client_class = Aws::SQS::Client
+
+      def get_queue_attributes(criteria)
+        aws_service_client.get_queue_attributes(criteria)
+      end
+    end
+  end
+end

data/lib/resources/docker.rb

@@ -14,7 +14,7 @@ module Inspec::Resources
     filter.register_column(:commands,       field: 'command')
           .register_column(:ids,            field: 'id')
           .register_column(:images,         field: 'image')
-          .register_column(:labels,         field: 'labels')
+          .register_column(:labels,         field: 'labels', style: :simple)
           .register_column(:local_volumes,  field: 'localvolumes')
           .register_column(:mounts,         field: 'mounts')
           .register_column(:names,          field: 'names')
@@ -190,21 +190,28 @@ module Inspec::Resources
       # since docker is not outputting valid json, we need to parse each row
       raw.each_line { |entry|
         # convert all keys to lower_case to work well with ruby and filter table
-        j = JSON.parse(entry).map { |k, v|
-          [k.downcase, v]
+        row = JSON.parse(entry).map { |key, value|
+          [key.downcase, value]
         }.to_h
 
         # ensure all keys are there
-        j = ensure_keys(j, labels)
+        row = ensure_keys(row, labels)
 
         # strip off any linked container names
         # Depending on how it was linked, the actual container name may come before
         # or after the link information, so we'll just look for the first name that
         # does not include a slash since that is not a valid character in a container name
-        j['names'] = j['names'].split(',').find { |c| !c.include?('/') } if j.key?('names')
+        if row['names']
+          row['names'] = row['names'].split(',').find { |c| !c.include?('/') }
+        end
+
+        # Split labels on ',' or set to empty array
+        # Allows for `docker.containers.where { labels.include?('app=redis') }`
+        row['labels'] = row.key?('labels') ? row['labels'].split(',') : []
 
-        output.push(j)
+        output.push(row)
       }
+
       output
     rescue JSON::ParserError => _e
       warn "Could not parse `docker #{subcommand}` output"

data/lib/resources/docker_container.rb

@@ -21,6 +21,7 @@ module Inspec::Resources
         its('tag') { should eq 'latest' }
         its('ports') { should eq [] }
         its('command') { should eq 'nc -ll -p 1234 -e /bin/cat' }
+        its('labels') { should include 'app=example' }
       end
 
       describe docker_container(id: 'e2c52a183358') do
@@ -47,7 +48,7 @@ module Inspec::Resources
     end
 
     def labels
-      object_info.labels[0] if object_info.entries.length == 1
+      object_info.labels
     end
 
     def ports

data/lib/utils/spdx.txt

@@ -1,86 +1,69 @@
-Glide
-Abstyles
+0BSD
+AAL
+ADSL
 AFL-1.1
 AFL-1.2
 AFL-2.0
 AFL-2.1
 AFL-3.0
+AGPL-1.0
+AGPL-1.0-only
+AGPL-1.0-or-later
+AGPL-3.0
+AGPL-3.0-only
+AGPL-3.0-or-later
+AMDPLPA
+AML
 AMPAS
-APL-1.0
-Adobe-Glyph
+ANTLR-PD
 APAFML
+APL-1.0
+APSL-1.0
+APSL-1.1
+APSL-1.2
+APSL-2.0
+Abstyles
 Adobe-2006
-AGPL-1.0
+Adobe-Glyph
 Afmparse
 Aladdin
-ADSL
-AMDPLPA
-ANTLR-PD
+All Rights Reserved
 Apache-1.0
 Apache-1.1
 Apache-2.0
-AML
-APSL-1.0
-APSL-1.1
-APSL-1.2
-APSL-2.0
 Artistic-1.0
 Artistic-1.0-Perl
 Artistic-1.0-cl8
 Artistic-2.0
-AAL
-Bahyph
-Barr
-Beerware
-BitTorrent-1.0
-BitTorrent-1.1
-BSL-1.0
-Borceux
+BSD-1-Clause
 BSD-2-Clause
 BSD-2-Clause-FreeBSD
 BSD-2-Clause-NetBSD
+BSD-2-Clause-Patent
 BSD-3-Clause
+BSD-3-Clause-Attribution
 BSD-3-Clause-Clear
+BSD-3-Clause-LBNL
 BSD-3-Clause-No-Nuclear-License
 BSD-3-Clause-No-Nuclear-License-2014
 BSD-3-Clause-No-Nuclear-Warranty
 BSD-4-Clause
+BSD-4-Clause-UC
 BSD-Protection
 BSD-Source-Code
-BSD-3-Clause-Attribution
-0BSD
-BSD-4-Clause-UC
-bzip2-1.0.5
-bzip2-1.0.6
-Caldera
-CECILL-1.0
-CECILL-1.1
-CECILL-2.0
-CECILL-2.1
-CECILL-B
-CECILL-C
-ClArtistic
-MIT-CMU
-CNRI-Jython
-CNRI-Python
-CNRI-Python-GPL-Compatible
-CPOL-1.02
-CDDL-1.0
-CDDL-1.1
-CPAL-1.0
-CPL-1.0
+BSL-1.0
+Bahyph
+Barr
+Beerware
+BitTorrent-1.0
+BitTorrent-1.1
+Borceux
 CATOSL-1.1
-Condor-1.1
 CC-BY-1.0
 CC-BY-2.0
 CC-BY-2.5
 CC-BY-3.0
 CC-BY-4.0
-CC-BY-ND-1.0
-CC-BY-ND-2.0
-CC-BY-ND-2.5
-CC-BY-ND-3.0
-CC-BY-ND-4.0
 CC-BY-NC-1.0
 CC-BY-NC-2.0
 CC-BY-NC-2.5
@@ -96,135 +79,189 @@ CC-BY-NC-SA-2.0
 CC-BY-NC-SA-2.5
 CC-BY-NC-SA-3.0
 CC-BY-NC-SA-4.0
+CC-BY-ND-1.0
+CC-BY-ND-2.0
+CC-BY-ND-2.5
+CC-BY-ND-3.0
+CC-BY-ND-4.0
 CC-BY-SA-1.0
 CC-BY-SA-2.0
 CC-BY-SA-2.5
 CC-BY-SA-3.0
 CC-BY-SA-4.0
 CC0-1.0
+CDDL-1.0
+CDDL-1.1
+CDLA-Permissive-1.0
+CDLA-Sharing-1.0
+CECILL-1.0
+CECILL-1.1
+CECILL-2.0
+CECILL-2.1
+CECILL-B
+CECILL-C
+CNRI-Jython
+CNRI-Python
+CNRI-Python-GPL-Compatible
+CPAL-1.0
+CPL-1.0
+CPOL-1.02
+CUA-OPL-1.0
+Caldera
+ClArtistic
+Condor-1.1
 Crossword
 CrystalStacker
-CUA-OPL-1.0
 Cube
-curl
 D-FSL-1.0
-diffmark
-WTFPL
 DOC
-Dotseqn
 DSDP
-dvipdfm
-EPL-1.0
+Dotseqn
 ECL-1.0
 ECL-2.0
-eGenix
 EFL-1.0
 EFL-2.0
-MIT-advertising
-MIT-enna
-Entessa
-ErlPL-1.1
+EPL-1.0
+EPL-2.0
 EUDatagrid
 EUPL-1.0
 EUPL-1.1
+EUPL-1.2
+Entessa
+ErlPL-1.1
 Eurosym
-Fair
-MIT-feh
-Frameworx-1.0
-FreeImage
-FTL
 FSFAP
 FSFUL
 FSFULLR
-Giftware
-GL2PS
-Glulxe
-AGPL-3.0
+FTL
+Fair
+Frameworx-1.0
+FreeImage
 GFDL-1.1
+GFDL-1.1-only
+GFDL-1.1-or-later
 GFDL-1.2
+GFDL-1.2-only
+GFDL-1.2-or-later
 GFDL-1.3
+GFDL-1.3-only
+GFDL-1.3-or-later
+GL2PS
 GPL-1.0
+GPL-1.0+
+GPL-1.0-only
+GPL-1.0-or-later
 GPL-2.0
+GPL-2.0+
+GPL-2.0-only
+GPL-2.0-or-later
+GPL-2.0-with-GCC-exception
+GPL-2.0-with-autoconf-exception
+GPL-2.0-with-bison-exception
+GPL-2.0-with-classpath-exception
+GPL-2.0-with-font-exception
 GPL-3.0
-LGPL-2.1
-LGPL-3.0
-LGPL-2.0
-gnuplot
-gSOAP-1.3b
-HaskellReport
+GPL-3.0+
+GPL-3.0-only
+GPL-3.0-or-later
+GPL-3.0-with-GCC-exception
+GPL-3.0-with-autoconf-exception
+Giftware
+Glide
+Glulxe
 HPND
+HaskellReport
 IBM-pibs
-IPL-1.0
 ICU
+IJG
+IPA
+IPL-1.0
+ISC
 ImageMagick
-iMatix
 Imlib2
-IJG
 Info-ZIP
-Intel-ACPI
 Intel
+Intel-ACPI
 Interbase-1.0
-IPA
-ISC
-JasPer-2.0
 JSON
+JasPer-2.0
+LAL-1.2
+LAL-1.3
+LGPL-2.0
+LGPL-2.0+
+LGPL-2.0-only
+LGPL-2.0-or-later
+LGPL-2.1
+LGPL-2.1+
+LGPL-2.1-only
+LGPL-2.1-or-later
+LGPL-3.0
+LGPL-3.0+
+LGPL-3.0-only
+LGPL-3.0-or-later
+LGPLLR
+LPL-1.0
+LPL-1.02
 LPPL-1.0
 LPPL-1.1
 LPPL-1.2
 LPPL-1.3a
 LPPL-1.3c
 Latex2e
-BSD-3-Clause-LBNL
 Leptonica
-LGPLLR
-Libpng
-libtiff
-LAL-1.2
-LAL-1.3
 LiLiQ-P-1.1
-LiLiQ-Rplus-1.1
 LiLiQ-R-1.1
-LPL-1.02
-LPL-1.0
-MakeIndex
-MTLL
-MS-PL
-MS-RL
-MirOS
-MITNFA
+LiLiQ-Rplus-1.1
+Libpng
+Linux-OpenIB
 MIT
-Motosoto
+MIT-0
+MIT-CMU
+MIT-advertising
+MIT-enna
+MIT-feh
+MITNFA
 MPL-1.0
 MPL-1.1
 MPL-2.0
 MPL-2.0-no-copyleft-exception
-mpich2
+MS-PL
+MS-RL
+MTLL
+MakeIndex
+MirOS
+Motosoto
 Multics
 Mup
 NASA-1.3
-Naumen
 NBPL-1.0
-Net-SNMP
-NetCDF
+NCSA
 NGPL
+NLOD-1.0
+NLPL
 NOSL
 NPL-1.0
 NPL-1.1
-Newsletr
-NLPL
-Nokia
 NPOSL-3.0
-NLOD-1.0
-Noweb
 NRL
 NTP
+Naumen
+Net-SNMP
+NetCDF
+Newsletr
+Nokia
+Noweb
 Nunit
+OCCT-PL
 OCLC-2.0
+ODC-By-1.0
 ODbL-1.0
-PDDL-1.0
-OCCT-PL
+OFL-1.0
+OFL-1.1
+OGL-UK-1.0
+OGL-UK-2.0
+OGL-UK-3.0
 OGTSL
-OLDAP-2.2.2
 OLDAP-1.1
 OLDAP-1.2
 OLDAP-1.3
@@ -234,6 +271,7 @@ OLDAP-2.0.1
 OLDAP-2.1
 OLDAP-2.2
 OLDAP-2.2.1
+OLDAP-2.2.2
 OLDAP-2.3
 OLDAP-2.4
 OLDAP-2.5
@@ -242,103 +280,104 @@ OLDAP-2.7
 OLDAP-2.8
 OML
 OPL-1.0
+OSET-PL-2.1
 OSL-1.0
 OSL-1.1
 OSL-2.0
 OSL-2.1
 OSL-3.0
 OpenSSL
-OSET-PL-2.1
+PDDL-1.0
 PHP-3.0
 PHP-3.01
 Plexus
 PostgreSQL
-psfrag
-psutils
 Python-2.0
 QPL-1.0
 Qhull
-Rdisc
-RPSL-1.0
+RHeCos-1.1
 RPL-1.1
 RPL-1.5
-RHeCos-1.1
-RSCPL
+RPSL-1.0
 RSA-MD
+RSCPL
+Rdisc
 Ruby
 SAX-PD
-Saxpath
 SCEA
-SWL
-SMPPL
-Sendmail
 SGI-B-1.0
 SGI-B-1.1
 SGI-B-2.0
-OFL-1.0
-OFL-1.1
+SISSL
+SISSL-1.2
+SMLNJ
+SMPPL
+SNIA
+SPL-1.0
+SWL
+Saxpath
+Sendmail
+Sendmail-8.23
 SimPL-2.0
 Sleepycat
-SNIA
 Spencer-86
 Spencer-94
 Spencer-99
-SMLNJ
+StandardML-NJ
 SugarCRM-1.1.3
-SISSL
-SISSL-1.2
-SPL-1.0
-Watcom-1.0
 TCL
 TCP-wrappers
-Unlicense
 TMate
 TORQUE-1.1
 TOSL
+TU-Berlin-1.0
+TU-Berlin-2.0
+UPL-1.0
 Unicode-DFS-2015
 Unicode-DFS-2016
 Unicode-TOU
-UPL-1.0
-NCSA
-Vim
+Unlicense
 VOSTROM
 VSL-1.0
-W3C-20150513
-W3C-19980720
+Vim
 W3C
+W3C-19980720
+W3C-20150513
+WTFPL
+Watcom-1.0
 Wsuipa
-Xnet
 X11
-Xerox
 XFree86-1.1
-xinetd
-xpp
 XSkat
+Xerox
+Xnet
 YPL-1.0
 YPL-1.1
+ZPL-1.1
+ZPL-2.0
+ZPL-2.1
 Zed
 Zend-2.0
 Zimbra-1.3
 Zimbra-1.4
 Zlib
-zlib-acknowledgement
-ZPL-1.1
-ZPL-2.0
-ZPL-2.1
+bzip2-1.0.5
+bzip2-1.0.6
+copyleft-next-0.3.0
+copyleft-next-0.3.1
+curl
+diffmark
+dvipdfm
 eCos-2.0
-GPL-1.0+
-GPL-2.0+
-GPL-2.0-with-autoconf-exception
-GPL-2.0-with-bison-exception
-GPL-2.0-with-classpath-exception
-GPL-2.0-with-font-exception
-GPL-2.0-with-GCC-exception
-GPL-3.0+
-GPL-3.0-with-autoconf-exception
-GPL-3.0-with-GCC-exception
-LGPL-2.1+
-LGPL-3.0+
-LGPL-2.0+
-StandardML-NJ
-WXwindows
-All Rights Reserved
+eGenix
+gSOAP-1.3b
+gnuplot
+iMatix
+libtiff
+mpich2
+psfrag
+psutils
+wxWindows
+xinetd
+xpp
+zlib-acknowledgement

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inspec
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.2.6
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-12 00:00:00.000000000 Z
+date: 2018-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: train
@@ -19,7 +19,7 @@ dependencies:
         version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.11
+        version: 1.6.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.11
+        version: 1.6.3
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -589,6 +589,7 @@ files:
 - lib/resources/aws/aws_sns_subscription.rb
 - lib/resources/aws/aws_sns_topic.rb
 - lib/resources/aws/aws_sns_topics.rb
+- lib/resources/aws/aws_sqs_queue.rb
 - lib/resources/aws/aws_subnet.rb
 - lib/resources/aws/aws_subnets.rb
 - lib/resources/aws/aws_vpc.rb