inspec 1.29.0 → 1.30.0

data/lib/resources/postgres_session.rb

@@ -3,7 +3,6 @@
 # author: Dominik Richter
 # author: Christoph Hartmann
 # author: Aaron Lippold
-# license: All rights reserved
 
 module Inspec::Resources
   class Lines

data/lib/resources/powershell.rb

@@ -2,7 +2,6 @@
 # copyright: 2015, Vulcano Security GmbH
 # author: Christoph Hartmann
 # author: Dominik Richter
-# license: All rights reserved
 
 module Inspec::Resources
   class PowershellScript < Cmd

data/lib/resources/processes.rb

@@ -2,7 +2,6 @@
 # copyright: 2015, Vulcano Security GmbH
 # author: Dominik Richter
 # author: Christoph Hartmann
-# license: All rights reserved
 
 require 'utils/filter'
 

data/lib/resources/registry_key.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 # copyright: 2015, Vulcano Security GmbH
 # author: Christoph Hartmann
-# license: All rights reserved
 
 require 'json'
 

data/lib/resources/service.rb

@@ -2,7 +2,7 @@
 # author: Christoph Hartmann
 # author: Dominik Richter
 # author: Stephan Renatus
-# license: All rights reserved
+
 require 'hashie'
 
 module Inspec::Resources

data/lib/resources/ssh_conf.rb

@@ -2,7 +2,6 @@
 # copyright: 2015, Vulcano Security GmbH
 # author: Dominik Richter
 # author: Christoph Hartmann
-# license: All rights reserved
 
 require 'utils/simpleconfig'
 

data/lib/resources/ssl.rb

@@ -1,6 +1,5 @@
 # encoding: utf-8
 # copyright: 2015, Chef Software Inc.
-# license: All rights reserved
 # author: Dominik Richter
 # author: Christoph Hartmann
 

data/lib/utils/database_helpers.rb

@@ -0,0 +1,77 @@
+# encoding: utf-8
+# author: Christoph Hartmann
+# author: Dominik Richter
+
+module DatabaseHelper
+  class SQLColumn
+    def initialize(row, name)
+      @row = row
+      @name = name
+    end
+
+    def value
+      @row[@name.downcase]
+    end
+
+    def to_s
+      'SQL Column'
+    end
+  end
+
+  class SQLRow
+    def initialize(query, row)
+      @query = query
+      @row = row
+    end
+
+    def column(column)
+      SQLColumn.new(@row, column)
+    end
+
+    def to_s
+      'SQL Row'
+    end
+  end
+
+  class SQLQueryResult
+    attr_reader :error
+    def initialize(cmd, results)
+      @cmd = cmd
+      @results = results
+    end
+
+    def empty?
+      @results.empty?
+    end
+
+    def successful?
+      @cmd.exit_status == 0 && @error.nil?
+    end
+
+    def row(id)
+      SQLRow.new(self, @results[id])
+    end
+
+    def size
+      @results.size
+    end
+
+    def stdout
+      warn '[DEPRECATION] The `stdout` method is deprecated. Use `row` instead.'
+      @cmd.stdout
+    end
+
+    def stderr
+      warn '[DEPRECATION] The `stderr` method is deprecated. Use `successful?` instead.'
+      @cmd.stderr
+    end
+
+    def inspect
+      to_s
+    end
+
+    def to_s
+      'SQL ResultSet'
+    end
+  end
+end

data/lib/utils/filter_array.rb

@@ -1,6 +1,5 @@
 # encoding: utf-8
 # copyright: 2015, Chef Software, Inc.
-# license: All rights reserved
 # author: Stephan Renatus
 
 class FilterArray

data/lib/utils/find_files.rb

@@ -1,6 +1,5 @@
 # encoding: utf-8
 # copyright: 2015, Vulcano Security GmbH
-# license: All rights reserved
 # author: Dominik Richter
 # author: Christoph Hartmann
 

data/lib/utils/nginx_parser.rb

@@ -22,7 +22,7 @@ class NginxParser < Parslet::Parser
   }
 
   rule(:identifier) {
-    (match('[a-zA-Z]') >> match('[a-zA-Z0-9_]').repeat).as(:identifier) >> space >> space.repeat
+    (match('[a-zA-Z]') >> match('\S').repeat).as(:identifier) >> space >> space.repeat
   }
 
   rule(:value) {
@@ -60,6 +60,8 @@ class NginxConfig
     tree = NginxTransform.new.apply(lex)
     gtree = NginxTransform::Group.new(nil, '', tree)
     read_nginx_group(gtree)
+  rescue Parslet::ParseFailed => err
+    raise "Failed to parse NginX config: #{err}"
   end
 
   def self.read_nginx_group(t)
@@ -67,7 +69,7 @@ class NginxConfig
     agg_conf['_'] = t.args unless t.args == ''
 
     groups, conf = t.body.partition { |i| i.is_a? NginxTransform::Group }
-    conf.each { |x| agg_conf[x.key] += [x.vals.join(' ')] }
+    conf.each { |x| agg_conf[x.key] += [x.vals] }
     groups.each { |x| agg_conf[x.id] += [read_nginx_group(x)] }
     agg_conf
   end

data/lib/utils/simpleconfig.rb

@@ -1,6 +1,5 @@
 # encoding: utf-8
 # copyright: 2015, Dominik Richter
-# license: All rights reserved
 # author: Dominik Richter
 # author: Christoph Hartmann
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inspec
 version: !ruby/object:Gem::Version
-  version: 1.29.0
+  version: 1.30.0
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-22 00:00:00.000000000 Z
+date: 2017-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: train
@@ -274,6 +274,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: htmlentities
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: InSpec provides a framework for creating end-to-end infrastructure tests.
   You can use it for integration or even compliance testing. Create fully portable
   test profiles and use them in your workflow to ensure stability and security. Integrate
@@ -583,6 +597,7 @@ files:
 - lib/resources/mysql.rb
 - lib/resources/mysql_conf.rb
 - lib/resources/mysql_session.rb
+- lib/resources/nginx_conf.rb
 - lib/resources/npm.rb
 - lib/resources/ntp_conf.rb
 - lib/resources/oneget.rb
@@ -625,6 +640,7 @@ files:
 - lib/source_readers/inspec.rb
 - lib/utils/command_wrapper.rb
 - lib/utils/convert.rb
+- lib/utils/database_helpers.rb
 - lib/utils/erlang_parser.rb
 - lib/utils/filter.rb
 - lib/utils/filter_array.rb