inspec 0.14.8 → 0.15.0

data/lib/resources/postgres.rb

@@ -4,34 +4,36 @@
 # author: Christoph Hartmann
 # license: All rights reserved
 
-class Postgres < Inspec.resource(1)
-  name 'postgres'
+module Inspec::Resources
+  class Postgres < Inspec.resource(1)
+    name 'postgres'
 
-  attr_reader :service, :data_dir, :conf_dir, :conf_path
-  def initialize
-    case inspec.os[:family]
-    when 'ubuntu', 'debian'
-      @service = 'postgresql'
-      @data_dir = '/var/lib/postgresql'
-      @version = inspec.command('ls /etc/postgresql/').stdout.chomp
-      @conf_dir = "/etc/postgresql/#{@version}/main"
-      @conf_path = File.join @conf_dir, 'postgresql.conf'
+    attr_reader :service, :data_dir, :conf_dir, :conf_path
+    def initialize
+      case inspec.os[:family]
+      when 'ubuntu', 'debian'
+        @service = 'postgresql'
+        @data_dir = '/var/lib/postgresql'
+        @version = inspec.command('ls /etc/postgresql/').stdout.chomp
+        @conf_dir = "/etc/postgresql/#{@version}/main"
+        @conf_path = File.join @conf_dir, 'postgresql.conf'
 
-    when 'arch'
-      @service = 'postgresql'
-      @data_dir = '/var/lib/postgres/data'
-      @conf_dir = '/var/lib/postgres/data'
-      @conf_path = File.join @conf_dir, 'postgresql.conf'
+      when 'arch'
+        @service = 'postgresql'
+        @data_dir = '/var/lib/postgres/data'
+        @conf_dir = '/var/lib/postgres/data'
+        @conf_path = File.join @conf_dir, 'postgresql.conf'
 
-    else
-      @service = 'postgresql'
-      @data_dir = '/var/lib/postgresql'
-      @conf_dir = '/var/lib/pgsql/data'
-      @conf_path = File.join @conf_dir, 'postgresql.conf'
+      else
+        @service = 'postgresql'
+        @data_dir = '/var/lib/postgresql'
+        @conf_dir = '/var/lib/pgsql/data'
+        @conf_path = File.join @conf_dir, 'postgresql.conf'
+      end
     end
-  end
 
-  def to_s
-    'PostgreSQL'
+    def to_s
+      'PostgreSQL'
+    end
   end
 end

data/lib/resources/postgres_conf.rb

@@ -8,86 +8,88 @@ require 'utils/simpleconfig'
 require 'utils/find_files'
 require 'resources/postgres'
 
-class PostgresConf < Inspec.resource(1)
-  name 'postgres_conf'
-  desc 'Use the postgres_conf InSpec audit resource to test the contents of the configuration file for PostgreSQL, typically located at /etc/postgresql/<version>/main/postgresql.conf or /var/lib/postgres/data/postgresql.conf, depending on the platform.'
-  example "
-    describe postgres_conf do
-      its('max_connections') { should eq '5' }
-    end
-  "
+module Inspec::Resources
+  class PostgresConf < Inspec.resource(1)
+    name 'postgres_conf'
+    desc 'Use the postgres_conf InSpec audit resource to test the contents of the configuration file for PostgreSQL, typically located at /etc/postgresql/<version>/main/postgresql.conf or /var/lib/postgres/data/postgresql.conf, depending on the platform.'
+    example "
+      describe postgres_conf do
+        its('max_connections') { should eq '5' }
+      end
+    "
 
-  include FindFiles
+    include FindFiles
 
-  def initialize(conf_path = nil)
-    @conf_path = conf_path || inspec.postgres.conf_path
-    @conf_dir = File.expand_path(File.dirname(@conf_path))
-    @files_contents = {}
-    @content = nil
-    @params = nil
-    read_content
-  end
+    def initialize(conf_path = nil)
+      @conf_path = conf_path || inspec.postgres.conf_path
+      @conf_dir = File.expand_path(File.dirname(@conf_path))
+      @files_contents = {}
+      @content = nil
+      @params = nil
+      read_content
+    end
 
-  def content
-    @content ||= read_content
-  end
+    def content
+      @content ||= read_content
+    end
 
-  def params(*opts)
-    @params || read_content
-    res = @params
-    opts.each do |opt|
-      res = res[opt] unless res.nil?
+    def params(*opts)
+      @params || read_content
+      res = @params
+      opts.each do |opt|
+        res = res[opt] unless res.nil?
+      end
+      res
     end
-    res
-  end
 
-  def read_content
-    @content = ''
-    @params = {}
+    def read_content
+      @content = ''
+      @params = {}
 
-    # skip if the main configuration file doesn't exist
-    if !inspec.file(@conf_path).file?
-      return skip_resource "Can't find file \"#{@conf_path}\""
-    end
-    raw_conf = read_file(@conf_path)
-    if raw_conf.empty? && inspec.file(@conf_path).size > 0
-      return skip_resource("Can't read file \"#{@conf_path}\"")
-    end
+      # skip if the main configuration file doesn't exist
+      if !inspec.file(@conf_path).file?
+        return skip_resource "Can't find file \"#{@conf_path}\""
+      end
+      raw_conf = read_file(@conf_path)
+      if raw_conf.empty? && inspec.file(@conf_path).size > 0
+        return skip_resource("Can't read file \"#{@conf_path}\"")
+      end
 
-    to_read = [@conf_path]
-    until to_read.empty?
-      raw_conf = read_file(to_read[0])
-      @content += raw_conf
+      to_read = [@conf_path]
+      until to_read.empty?
+        raw_conf = read_file(to_read[0])
+        @content += raw_conf
 
-      params = SimpleConfig.new(raw_conf).params
-      @params.merge!(params)
+        params = SimpleConfig.new(raw_conf).params
+        @params.merge!(params)
 
-      to_read = to_read.drop(1)
-      # see if there is more config files to include
+        to_read = to_read.drop(1)
+        # see if there is more config files to include
 
-      to_read += include_files(params).find_all do |fp|
-        not @files_contents.key? fp
+        to_read += include_files(params).find_all do |fp|
+          not @files_contents.key? fp
+        end
       end
+      @content
     end
-    @content
-  end
 
-  def include_files(params)
-    include_files = params['include'] || []
-    include_files += params['include_if_exists'] || []
-    dirs = params['include_dir'] || []
-    dirs.each do |dir|
-      dir = File.join(@conf_dir, dir) if dir[0] != '/'
-      include_files += find_files(dir, depth: 1, type: 'file')
+    def include_files(params)
+      include_files = params['include'] || []
+      include_files += params['include_if_exists'] || []
+      dirs = params['include_dir'] || []
+      dirs.each do |dir|
+        dir = File.join(@conf_dir, dir) if dir[0] != '/'
+        include_files += find_files(dir, depth: 1, type: 'file')
+      end
+      include_files
     end
-    include_files
-  end
 
-  def read_file(path)
-    @files_contents[path] ||= inspec.file(path).content
-  end
+    def read_file(path)
+      @files_contents[path] ||= inspec.file(path).content
+    end
 
-  def to_s
-    'PostgreSQL Configuration'
+    def to_s
+      'PostgreSQL Configuration'
+    end
   end
 end

data/lib/resources/postgres_session.rb

@@ -4,59 +4,61 @@
 # author: Christoph Hartmann
 # license: All rights reserved
 
-class Lines
-  attr_reader :output
+module Inspec::Resources
+  class Lines
+    attr_reader :output
 
-  def initialize(raw, desc)
-    @output = raw
-    @desc = desc
-  end
+    def initialize(raw, desc)
+      @output = raw
+      @desc = desc
+    end
 
-  def lines
-    output.split("\n")
-  end
+    def lines
+      output.split("\n")
+    end
 
-  def to_s
-    @desc
+    def to_s
+      @desc
+    end
   end
-end
 
-class PostgresSession < Inspec.resource(1)
-  name 'postgres_session'
-  desc 'Use the postgres_session InSpec audit resource to test SQL commands run against a PostgreSQL database.'
-  example "
-    sql = postgres_session('username', 'password')
+  class PostgresSession < Inspec.resource(1)
+    name 'postgres_session'
+    desc 'Use the postgres_session InSpec audit resource to test SQL commands run against a PostgreSQL database.'
+    example "
+      sql = postgres_session('username', 'password')
 
-    describe sql.query('SELECT * FROM pg_shadow WHERE passwd IS NULL;') do
-      its('output') { should eq('') }
-    end
-  "
+      describe sql.query('SELECT * FROM pg_shadow WHERE passwd IS NULL;') do
+        its('output') { should eq('') }
+      end
+    "
 
-  def initialize(user, pass)
-    @user = user || 'postgres'
-    @pass = pass
-  end
+    def initialize(user, pass)
+      @user = user || 'postgres'
+      @pass = pass
+    end
 
-  def query(query, db = [])
-    dbs = db.map { |x| "-d #{x}" }.join(' ')
-    # TODO: simple escape, must be handled by a library
-    # that does this securely
-    escaped_query = query.gsub(/\\/, '\\\\').gsub(/"/, '\\"').gsub(/\$/, '\\$')
-    # run the query
-    cmd = inspec.command("PGPASSWORD='#{@pass}' psql -U #{@user} #{dbs} -h localhost -c \"#{escaped_query}\"")
-    out = cmd.stdout + "\n" + cmd.stderr
-    if cmd.exit_status != 0 or
-       out =~ /could not connect to .*/ or
-       out.downcase =~ /^error/
-      # skip this test if the server can't run the query
-      skip_resource "Can't read run query #{query.inspect} on postgres_session: #{out}"
-    else
-      # remove the whole header (i.e. up to the first ^-----+------+------$)
-      # remove the tail
-      lines = cmd.stdout
-                 .sub(/(.*\n)+([-]+[+])*[-]+\n/, '')
-                 .sub(/\n[^\n]*\n\n$/, '')
-      Lines.new(lines.strip, "PostgreSQL query: #{query}")
+    def query(query, db = [])
+      dbs = db.map { |x| "-d #{x}" }.join(' ')
+      # TODO: simple escape, must be handled by a library
+      # that does this securely
+      escaped_query = query.gsub(/\\/, '\\\\').gsub(/"/, '\\"').gsub(/\$/, '\\$')
+      # run the query
+      cmd = inspec.command("PGPASSWORD='#{@pass}' psql -U #{@user} #{dbs} -h localhost -c \"#{escaped_query}\"")
+      out = cmd.stdout + "\n" + cmd.stderr
+      if cmd.exit_status != 0 or
+         out =~ /could not connect to .*/ or
+         out.downcase =~ /^error/
+        # skip this test if the server can't run the query
+        skip_resource "Can't read run query #{query.inspect} on postgres_session: #{out}"
+      else
+        # remove the whole header (i.e. up to the first ^-----+------+------$)
+        # remove the tail
+        lines = cmd.stdout
+                   .sub(/(.*\n)+([-]+[+])*[-]+\n/, '')
+                   .sub(/\n[^\n]*\n\n$/, '')
+        Lines.new(lines.strip, "PostgreSQL query: #{query}")
+      end
     end
   end
 end

data/lib/resources/processes.rb

@@ -4,70 +4,72 @@
 # author: Christoph Hartmann
 # license: All rights reserved
 
-class Processes < Inspec.resource(1)
-  name 'processes'
-  desc 'Use the processes InSpec audit resource to test properties for programs that are running on the system.'
-  example "
-    describe processes('mysqld') do
-      its('list.length') { should eq 1 }
-      its('users') { should eq ['mysql'] }
-      its('states') { should include 'S' }
-    end
-  "
+module Inspec::Resources
+  class Processes < Inspec.resource(1)
+    name 'processes'
+    desc 'Use the processes InSpec audit resource to test properties for programs that are running on the system.'
+    example "
+      describe processes('mysqld') do
+        its('list.length') { should eq 1 }
+        its('users') { should eq ['mysql'] }
+        its('states') { should include 'S' }
+      end
+    "
 
-  attr_reader :list,
-              :users,
-              :states
+    attr_reader :list,
+                :users,
+                :states
 
-  def initialize(grep)
-    # turn into a regexp if it isn't one yet
-    if grep.class == String
-      grep = '(/[^/]*)*'+grep if grep[0] != '/'
-      grep = Regexp.new('^' + grep + '(\s|$)')
-    end
+    def initialize(grep)
+      # turn into a regexp if it isn't one yet
+      if grep.class == String
+        grep = '(/[^/]*)*'+grep if grep[0] != '/'
+        grep = Regexp.new('^' + grep + '(\s|$)')
+      end
 
-    all_cmds = ps_aux
-    @list = all_cmds.find_all do |hm|
-      hm[:command] =~ grep
-    end
+      all_cmds = ps_aux
+      @list = all_cmds.find_all do |hm|
+        hm[:command] =~ grep
+      end
 
-    { users: :user,
-      states: :stat }.each do |var, key|
-      instance_variable_set("@#{var}", @list.map { |l| l[key] }.uniq)
+      { users: :user,
+        states: :stat }.each do |var, key|
+        instance_variable_set("@#{var}", @list.map { |l| l[key] }.uniq)
+      end
     end
-  end
 
-  def to_s
-    'Processes'
-  end
+    def to_s
+      'Processes'
+    end
 
-  private
+    private
 
-  def ps_aux
-    # get all running processes
-    cmd = inspec.command('ps aux')
-    all = cmd.stdout.split("\n")[1..-1]
-    return [] if all.nil?
+    def ps_aux
+      # get all running processes
+      cmd = inspec.command('ps aux')
+      all = cmd.stdout.split("\n")[1..-1]
+      return [] if all.nil?
 
-    lines = all.map do |line|
-      # user   32296  0.0  0.0  42592  7972 pts/15   Ss+  Apr06   0:00 zsh
-      line.match(/^([^ ]+)\s+([^ ]+)\s+([^ ]+)\s+([^ ]+)\s+([^ ]+)\s+([^ ]+)\s+([^ ]+)\s+([^ ]+)\s+([^ ]+)\s+([^ ]+)\s+(.*)$/)
-    end.compact
+      lines = all.map do |line|
+        # user   32296  0.0  0.0  42592  7972 pts/15   Ss+  Apr06   0:00 zsh
+        line.match(/^([^ ]+)\s+([^ ]+)\s+([^ ]+)\s+([^ ]+)\s+([^ ]+)\s+([^ ]+)\s+([^ ]+)\s+([^ ]+)\s+([^ ]+)\s+([^ ]+)\s+(.*)$/)
+      end.compact
 
-    lines.map do |m|
-      {
-        user: m[1],
-        pid: m[2],
-        cpu: m[3],
-        mem: m[4],
-        vsz: m[5],
-        rss: m[6],
-        tty: m[7],
-        stat: m[8],
-        start: m[9],
-        time: m[10],
-        command: m[11],
-      }
+      lines.map do |m|
+        {
+          user: m[1],
+          pid: m[2],
+          cpu: m[3],
+          mem: m[4],
+          vsz: m[5],
+          rss: m[6],
+          tty: m[7],
+          stat: m[8],
+          start: m[9],
+          time: m[10],
+          command: m[11],
+        }
+      end
     end
   end
 end

data/lib/resources/registry_key.rb

@@ -10,174 +10,176 @@ require 'json'
 #   its('Start') { should eq 2 }
 # end
 
-class RegistryKey < Inspec.resource(1)
-  name 'registry_key'
-  desc 'Use the registry_key InSpec audit resource to test key values in the Microsoft Windows registry.'
-  example "
-    describe registry_key('path\to\key') do
-      its('name') { should eq 'value' }
+module Inspec::Resources
+  class RegistryKey < Inspec.resource(1)
+    name 'registry_key'
+    desc 'Use the registry_key InSpec audit resource to test key values in the Microsoft Windows registry.'
+    example "
+      describe registry_key('path\to\key') do
+        its('name') { should eq 'value' }
+      end
+    "
+
+    attr_accessor :reg_key
+
+    def initialize(name, reg_key = nil)
+      # if we have one parameter, we use it as name
+      reg_key ||= name
+      @name = name
+      @reg_key = reg_key
+
+      return skip_resource 'The `registry_key` resource is not supported on your OS yet.' if !inspec.os.windows?
     end
-  "
 
-  attr_accessor :reg_key
-
-  def initialize(name, reg_key = nil)
-    # if we have one parameter, we use it as name
-    reg_key ||= name
-    @name = name
-    @reg_key = reg_key
-
-    return skip_resource 'The `registry_key` resource is not supported on your OS yet.' if !inspec.os.windows?
-  end
-
-  def exists?
-    !registry_key(@reg_key).nil?
-  end
-
-  def has_value?(value)
-    val = registry_key(@reg_key)
-    !val.nil? && registry_property_value(val, '(default)') == value ? true : false
-  end
+    def exists?
+      !registry_key(@reg_key).nil?
+    end
 
-  def has_property?(property_name, property_type = nil)
-    val = registry_key(@reg_key)
-    !val.nil? && registry_property_exists(val, property_name) && (property_type.nil? || registry_property_type(val, property_name) == map2type(property_type)) ? true : false
-  end
+    def has_value?(value)
+      val = registry_key(@reg_key)
+      !val.nil? && registry_property_value(val, '(default)') == value ? true : false
+    end
 
-  # deactivate rubocop, because we need to stay compatible with Serverspe
-  # rubocop:disable Style/OptionalArguments
-  def has_property_value?(property_name, property_type = nil, value)
-    # rubocop:enable Style/OptionalArguments
-    val = registry_key(@reg_key)
+    def has_property?(property_name, property_type = nil)
+      val = registry_key(@reg_key)
+      !val.nil? && registry_property_exists(val, property_name) && (property_type.nil? || registry_property_type(val, property_name) == map2type(property_type)) ? true : false
+    end
 
-    # convert value to binary if required
-    value = value.bytes if !property_type.nil? && map2type(property_type) == 3 && !value.is_a?(Array)
+    # deactivate rubocop, because we need to stay compatible with Serverspe
+    # rubocop:disable Style/OptionalArguments
+    def has_property_value?(property_name, property_type = nil, value)
+      # rubocop:enable Style/OptionalArguments
+      val = registry_key(@reg_key)
 
-    !val.nil? && registry_property_value(val, property_name) == value && (property_type.nil? || registry_property_type(val, property_name) == map2type(property_type)) ? true : false
-  end
+      # convert value to binary if required
+      value = value.bytes if !property_type.nil? && map2type(property_type) == 3 && !value.is_a?(Array)
 
-  # returns nil, if not existant or value
-  def method_missing(meth)
-    # get data
-    val = registry_key(@reg_key)
-    registry_property_value(val, meth)
-  end
+      !val.nil? && registry_property_value(val, property_name) == value && (property_type.nil? || registry_property_type(val, property_name) == map2type(property_type)) ? true : false
+    end
 
-  def to_s
-    "Registry Key #{@name}"
-  end
+    # returns nil, if not existant or value
+    def method_missing(meth)
+      # get data
+      val = registry_key(@reg_key)
+      registry_property_value(val, meth)
+    end
 
-  private
+    def to_s
+      "Registry Key #{@name}"
+    end
 
-  def prep_prop(property)
-    property.to_s.downcase
-  end
+    private
 
-  def registry_property_exists(regkey, property)
-    return false if regkey.nil? || property.nil?
-    # always ensure the key is lower case
-    !regkey[prep_prop(property)].nil?
-  end
+    def prep_prop(property)
+      property.to_s.downcase
+    end
 
-  def registry_property_value(regkey, property)
-    return nil if !registry_property_exists(regkey, property)
-    # always ensure the key is lower case
-    regkey[prep_prop(property)]['value']
-  end
+    def registry_property_exists(regkey, property)
+      return false if regkey.nil? || property.nil?
+      # always ensure the key is lower case
+      !regkey[prep_prop(property)].nil?
+    end
 
-  def registry_property_type(regkey, property)
-    return nil if !registry_property_exists(regkey, property)
-    # always ensure the key is lower case
-    regkey[prep_prop(property)]['type']
-  end
+    def registry_property_value(regkey, property)
+      return nil if !registry_property_exists(regkey, property)
+      # always ensure the key is lower case
+      regkey[prep_prop(property)]['value']
+    end
 
-  def registry_key(path)
-    return @registry_cache if defined?(@registry_cache)
-
-    # load registry key and all properties
-    script = <<-EOH
-    $reg = Get-Item 'Registry::#{path}'
-    $object = New-Object -Type PSObject
-    $reg.Property | ForEach-Object {
-        $key = $_
-        if ("(default)".Equals($key)) { $key = '' }
-        $value = New-Object psobject -Property @{
-          "value" =  $reg.GetValue($key);
-          "type"  = $reg.GetValueKind($key);
-        }
-        $object | Add-Member –MemberType NoteProperty –Name $_ –Value $value
-    }
-    $object | ConvertTo-Json
-    EOH
-
-    cmd = inspec.script(script)
-
-    # cannot rely on exit code for now, successful command returns exit code 1
-    # return nil if cmd.exit_status != 0, try to parse json
-    begin
-      @registry_cache = JSON.parse(cmd.stdout)
-      # convert keys to lower case
-      @registry_cache = Hash[@registry_cache.map do |key, value|
-        [key.downcase, value]
-      end]
-    rescue JSON::ParserError => _e
-      @registry_cache = nil
+    def registry_property_type(regkey, property)
+      return nil if !registry_property_exists(regkey, property)
+      # always ensure the key is lower case
+      regkey[prep_prop(property)]['type']
     end
 
-    @registry_cache
-  end
+    def registry_key(path)
+      return @registry_cache if defined?(@registry_cache)
+
+      # load registry key and all properties
+      script = <<-EOH
+      $reg = Get-Item 'Registry::#{path}'
+      $object = New-Object -Type PSObject
+      $reg.Property | ForEach-Object {
+          $key = $_
+          if ("(default)".Equals($key)) { $key = '' }
+          $value = New-Object psobject -Property @{
+            "value" =  $reg.GetValue($key);
+            "type"  = $reg.GetValueKind($key);
+          }
+          $object | Add-Member –MemberType NoteProperty –Name $_ –Value $value
+      }
+      $object | ConvertTo-Json
+      EOH
+
+      cmd = inspec.script(script)
+
+      # cannot rely on exit code for now, successful command returns exit code 1
+      # return nil if cmd.exit_status != 0, try to parse json
+      begin
+        @registry_cache = JSON.parse(cmd.stdout)
+        # convert keys to lower case
+        @registry_cache = Hash[@registry_cache.map do |key, value|
+          [key.downcase, value]
+        end]
+      rescue JSON::ParserError => _e
+        @registry_cache = nil
+      end
+
+      @registry_cache
+    end
 
-  # Registry key value types
-  # @see https://msdn.microsoft.com/en-us/library/windows/desktop/ms724884(v=vs.85).aspx
-  # REG_NONE 0
-  # REG_SZ 1
-  # REG_EXPAND_SZ 2
-  # REG_BINARY 3
-  # REG_DWORD 4
-  # REG_DWORD_LITTLE_ENDIAN 4
-  # REG_DWORD_BIG_ENDIAN 5
-  # REG_LINK 6
-  # REG_MULTI_SZ 7
-  # REG_RESOURCE_LIST 8
-  # REG_FULL_RESOURCE_DESCRIPTOR 9
-  # REG_RESOURCE_REQUIREMENTS_LIST 10
-  # REG_QWORD 11
-  # REG_QWORD_LITTLE_ENDIAN 11
-  def map2type(symbol)
-    options = {}
-
-    # chef symbols, we prefer those
-    options[:binary] = 3
-    options[:string] = 1
-    options[:multi_string] = 7
-    options[:expand_string] = 2
-    options[:dword] = 4
-    options[:dword_big_endian] = 5
-    options[:qword] = 11
-
-    # serverspec symbols
-    options[:type_string] = 1
-    options[:type_binary] = 3
-    options[:type_dword] = 4
-    options[:type_qword] = 11
-    options[:type_multistring] = 7
-    options[:type_expandstring] = 2
-
-    options[symbol]
+    # Registry key value types
+    # @see https://msdn.microsoft.com/en-us/library/windows/desktop/ms724884(v=vs.85).aspx
+    # REG_NONE 0
+    # REG_SZ 1
+    # REG_EXPAND_SZ 2
+    # REG_BINARY 3
+    # REG_DWORD 4
+    # REG_DWORD_LITTLE_ENDIAN 4
+    # REG_DWORD_BIG_ENDIAN 5
+    # REG_LINK 6
+    # REG_MULTI_SZ 7
+    # REG_RESOURCE_LIST 8
+    # REG_FULL_RESOURCE_DESCRIPTOR 9
+    # REG_RESOURCE_REQUIREMENTS_LIST 10
+    # REG_QWORD 11
+    # REG_QWORD_LITTLE_ENDIAN 11
+    def map2type(symbol)
+      options = {}
+
+      # chef symbols, we prefer those
+      options[:binary] = 3
+      options[:string] = 1
+      options[:multi_string] = 7
+      options[:expand_string] = 2
+      options[:dword] = 4
+      options[:dword_big_endian] = 5
+      options[:qword] = 11
+
+      # serverspec symbols
+      options[:type_string] = 1
+      options[:type_binary] = 3
+      options[:type_dword] = 4
+      options[:type_qword] = 11
+      options[:type_multistring] = 7
+      options[:type_expandstring] = 2
+
+      options[symbol]
+    end
   end
-end
 
-# for compatability with serverspec
-# this is deprecated syntax and will be removed in future versions
-class WindowsRegistryKey < RegistryKey
-  name 'windows_registry_key'
+  # for compatability with serverspec
+  # this is deprecated syntax and will be removed in future versions
+  class WindowsRegistryKey < RegistryKey
+    name 'windows_registry_key'
 
-  def initialize(name)
-    deprecated
-    super(name)
-  end
+    def initialize(name)
+      deprecated
+      super(name)
+    end
 
-  def deprecated
-    warn '[DEPRECATION] `windows_registry_key(reg_key)` is deprecated.  Please use `registry_key(\'path\to\key\')` instead.'
+    def deprecated
+      warn '[DEPRECATION] `windows_registry_key(reg_key)` is deprecated.  Please use `registry_key(\'path\to\key\')` instead.'
+    end
   end
 end