Revert "Revert "Merge branch 'docker_vuln'""

This reverts commit 50a8a91.

Author: jbarnett-r7

Vagrantfile

@@ -48,7 +48,7 @@ Vagrant.configure("2") do |config|
 
       chef.json = { 'metasploitable' => {
           # Customizations here
-      }
+        }
       }
 
       chef.add_recipe "metasploitable::mysql"
@@ -69,4 +69,4 @@ Vagrant.configure("2") do |config|
       chef.add_recipe "metasploitable::drupal"
     end
   end
-end
+end

chef/cookbooks/compat_resource/CHANGELOG.md

@@ -0,0 +1,48 @@
+# compat_resource Cookbook CHANGELOG
+
+This file is used to list changes made in each version of the compat_resource cookbook.
+
+## 12.16.2 (2016-11-09)
+
+- Sync chef-client changes from Chef 12.16.42
+
+## 12.16.1 (2016-10-20)
+
+- add delayed_action helper
+
+## 12.16.0 (2016-10-19)
+
+- Sync chef-client changes from Chef 12.16.14
+
+## 12.14.7 (2016-09-26)
+
+- Update to 12.14.89 Chef
+- Fix autoload by applying fix from #106
+
+## 12.14.6 (2016-09-20)
+
+- Update backported codebase to Chef 12.14.77 which brings in yum_repository updates and why-run enabled by default in custom resources
+
+## 12.14.5 (2016-09-19)
+
+- Prevent spamming messages in Chefspec runs for cookbooks that depend on compat_resource
+
+## 12.14.4 (2016-09-19)
+
+- Fix delayed notifications cloning
+
+## 12.14.3 (2016-09-12)
+
+- Fix subscribes notifications
+
+## 12.14.2 (2016-09-09)
+
+- Improve documentation
+- keep ChefCompat::Resource defined even if we don't load
+
+## 12.14.1 (2016-09-07)
+
+- add yum_repository resource from Chef 12.14
+- Update the minimum chef version in the metadata to 12.1
+- Added maintainers files
+- suppress constant redef warnings when running chefspec

chef/cookbooks/compat_resource/CONTRIBUTING.md

@@ -0,0 +1,2 @@
+Please refer to
+https://github.com/chef-cookbooks/community_cookbook_documentation/blob/master/CONTRIBUTING.MD

chef/cookbooks/compat_resource/MAINTAINERS.md

@@ -0,0 +1,16 @@
+<!-- This is a generated file. Please do not edit directly -->
+
+# Maintainers
+
+This file lists how this cookbook project is maintained. When making changes to the system, this file tells you who needs to review your patch - you need a review from an existing maintainer for the cookbook to provide a :+1: on your pull request. Additionally, you need to not receive a veto from a Lieutenant or the Project Lead.
+
+Check out [How Cookbooks are Maintained](https://github.com/chef-cookbooks/community_cookbook_documentation/blob/master/CONTRIBUTING.MD) for details on the process and how to become a maintainer or the project lead.
+
+# Project Maintainer
+* [Lamont Granquist](https://github.com/lamont-granquist)
+
+# Maintainers
+* [Jennifer Davis](https://github.com/sigje)
+* [Tim Smith](https://github.com/tas50)
+* [Thom May](https://github.com/thommay)
+* [Lamont Granquist](https://github.com/lamont-granquist)

chef/cookbooks/compat_resource/README.md

@@ -0,0 +1,60 @@
+# compat_resource cookbook
+
+[![Build Status](https://travis-ci.org/chef-cookbooks/compat_resource.svg?branch=master)](https://travis-ci.org/chef-cookbooks/compat_resource) [![Cookbook Version](https://img.shields.io/cookbook/v/compat_resource.svg)](https://supermarket.chef.io/cookbooks/compat_resource)
+
+This cookbook backports functionality introduced in the latest chef-client releases to any chef-client from 12.1 onwards. This includes [Custom Resource](https://docs.chef.io/custom_resources.html) functionality, notification improvements, as well as new resources added to core chef. It allows for the usage of these new resources in cookbooks without requiring the very latest Chef client release.
+
+## Backported functionality
+
+- [Custom Resources](https://docs.chef.io/custom_resources.html)
+- [apt_repository](https://docs.chef.io/resource_apt_repository.html)
+- [apt_update](https://docs.chef.io/resource_apt_update.html)
+- [systemd_unit](https://docs.chef.io/resource_systemd_unit.html)
+- [yum_repository](https://docs.chef.io/resource_yum_repository.html)
+- [:before notifications](https://docs.chef.io/resources.html#timers)
+
+## Requirements
+
+### Platforms
+
+- All platforms supported by Chef
+
+### Chef
+
+- Chef 12.1+
+
+### Cookbooks
+
+- none
+
+## Usage
+
+To use this cookbook, put `depends 'compat_resource'` in the metadata.rb of your cookbook. Once this is done, you can use all the new custom resource features to define resources. It Just Works.
+
+## Custom Resources?
+
+Curious about how to use custom resources?
+
+- Docs: <https://docs.chef.io/custom_resources.html>
+- Slides: <https://docs.chef.io/decks/custom_resources.html>
+
+## License & Authors
+
+- Author:: Lamont Granquist ([[email protected]](mailto:[email protected]))
+- Author:: John Keiser ([[email protected]](mailto:[email protected]))
+
+```text
+Copyright:: 2015-2016 Chef Software, Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+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.
+```

chef/cookbooks/compat_resource/files/lib/chef_compat/copied_from_chef.rb

@@ -0,0 +1,29 @@
+module ChefCompat
+  module CopiedFromChef
+    def self.extend_chef_module(chef_module, target)
+      target.instance_eval do
+        include chef_module
+        @chef_module = chef_module
+        def self.method_missing(name, *args, &block)
+          @chef_module.send(name, *args, &block)
+        end
+        def self.const_missing(name)
+          @chef_module.const_get(name)
+        end
+      end
+    end
+
+    # This patch to CopiedFromChef's ActionClass is necessary for the include to work
+    require 'chef/resource'
+    class Chef < ::Chef
+      class Resource < ::Chef::Resource
+        module ActionClass
+          def self.use_inline_resources
+          end
+          def self.include_resource_dsl(include_resource_dsl)
+          end
+        end
+      end
+    end
+  end
+end

chef/cookbooks/compat_resource/files/lib/chef_compat/copied_from_chef/chef/constants.rb

@@ -0,0 +1,47 @@
+#
+# NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE
+#
+# THIS IS A FILE AUTOGENERATED BY 'rake update' DO NOT EDIT!!!!
+#
+# NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE
+#
+
+begin
+  require 'chef/constants'
+rescue LoadError; end
+
+require 'chef_compat/copied_from_chef'
+class Chef
+module ::ChefCompat
+module CopiedFromChef
+#
+# Author:: John Keiser <[email protected]>
+# Copyright:: Copyright 2015-2016, Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# 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.
+
+class Chef < (defined?(::Chef) ? ::Chef : Object)
+  NOT_PASSED = Object.new
+  def NOT_PASSED.to_s
+    "NOT_PASSED"
+  end
+
+  def NOT_PASSED.inspect
+    to_s
+  end
+  NOT_PASSED.freeze
+end
+end
+end
+end

chef/cookbooks/compat_resource/files/lib/chef_compat/copied_from_chef/chef/delayed_evaluator.rb

@@ -0,0 +1,40 @@
+#
+# NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE
+#
+# THIS IS A FILE AUTOGENERATED BY 'rake update' DO NOT EDIT!!!!
+#
+# NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE
+#
+
+begin
+  require 'chef/delayed_evaluator'
+rescue LoadError; end
+
+require 'chef_compat/copied_from_chef'
+class Chef
+module ::ChefCompat
+module CopiedFromChef
+#
+# Author:: John Keiser <[email protected]>
+# Copyright:: Copyright 2015-2016, Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# 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.
+
+class Chef < (defined?(::Chef) ? ::Chef : Object)
+  class DelayedEvaluator < (defined?(::Chef::DelayedEvaluator) ? ::Chef::DelayedEvaluator : Proc)
+  end
+end
+end
+end
+end

chef/cookbooks/compat_resource/files/lib/chef_compat/copied_from_chef/chef/dsl/core.rb

@@ -0,0 +1,73 @@
+#
+# NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE
+#
+# THIS IS A FILE AUTOGENERATED BY 'rake update' DO NOT EDIT!!!!
+#
+# NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE
+#
+
+begin
+  require 'chef/dsl/core'
+rescue LoadError; end
+
+require 'chef_compat/copied_from_chef'
+class Chef
+module ::ChefCompat
+module CopiedFromChef
+#--
+# Author:: Adam Jacob (<[email protected]>)
+# Author:: Christopher Walters (<[email protected]>)
+# Copyright:: Copyright 2008-2016 Chef Software, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# 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.
+#
+
+require "chef_compat/copied_from_chef/chef/dsl/declare_resource"
+require "chef_compat/copied_from_chef/chef/dsl/universal"
+require "chef_compat/copied_from_chef/chef/mixin/notifying_block"
+require "chef_compat/copied_from_chef/chef/mixin/lazy_module_include"
+
+class Chef < (defined?(::Chef) ? ::Chef : Object)
+  module DSL
+    CopiedFromChef.extend_chef_module(::Chef::DSL, self) if defined?(::Chef::DSL)
+    # Part of a family of DSL mixins.
+    #
+    # Chef::DSL::Recipe mixes into Recipes and LWRP Providers.
+    #   - this does not target core chef resources and providers.
+    #   - this is restricted to recipe/resource/provider context where a resource collection exists.
+    #   - cookbook authors should typically include modules into here.
+    #
+    # Chef::DSL::Core mixes into Recipes, LWRP Providers and Core Providers
+    #   - this adds cores providers on top of the Recipe DSL.
+    #   - this is restricted to recipe/resource/provider context where a resource collection exists.
+    #   - core chef authors should typically include modules into here.
+    #
+    # Chef::DSL::Universal mixes into Recipes, LWRP Resources+Providers, Core Resources+Providers, and Attributes files.
+    #   - this adds resources and attributes files.
+    #   - do not add helpers which manipulate the resource collection.
+    #   - this is for general-purpose stuff that is useful nearly everywhere.
+    #   - it also pollutes the namespace of nearly every context, watch out.
+    #
+    module Core
+      CopiedFromChef.extend_chef_module(::Chef::DSL::Core, self) if defined?(::Chef::DSL::Core)
+      include Chef::DSL::Universal
+      include Chef::DSL::DeclareResource
+      include Chef::Mixin::NotifyingBlock
+      extend Chef::Mixin::LazyModuleInclude
+    end
+  end
+end
+end
+end
+end