until CIS 17.2.4

Signed-off-by: Patrick Münch <[email protected]>

.kitchen.yml

@@ -7,6 +7,7 @@ verifier:
 
 provisioner:
   name: chef_zero
+  require_chef_omnibus: 14.12.9
 
 platforms:
   - name: windows-2012R2
@@ -35,3 +36,7 @@ suites:
         rights:
           SeNetworkLogonRight: '*S-1-1-0, *S-1-5-32-544, *S-1-5-32-545, *S-1-5-32-551'
           SeRemoteInteractiveLogonRight: '*S-1-1-0, *S-1-5-32-544, *S-1-5-32-545, *S-1-5-32-551'
+      firewall:
+        activate: true
+        rules_on: true
+        rules: [{'name':'rdp','local_port': 3389,'protocol': 'TCP', 'action': 'allow'},{'name':'winrm','local_port': 5985,'protocol': 'TCP', 'action': 'allow'}]

LICENSE

@@ -0,0 +1,175 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.

README.md

@@ -1,24 +1,24 @@
 # windows-hardening (Chef Cookbook)
 
-This cookbook provides recipes for ensuring that a Windows 2012 R2 system is compliant with the [DevSec Windows Baseline](https://github.com/dev-sec/windows-baseline).
+This cookbook provides recipes for ensuring that a Windows 2012 R2 and 2016 system is compliant with the [DevSec Windows Baseline](https://github.com/dev-sec/windows-baseline). The [DevSec Windows Baseline](https://github.com/dev-sec/windows-baseline) checks the complete CIS documents and also some additions.
 
 ### Platforms
 
 - Windows Server 2012
 - Windows Server 2012 R2
 - Windows Server 2016
-- Windows Server 2016 Nano Server
-
-### Roadmap
-
-This cookbook aims to be the go-to-resource to implement hardening for Windows environments. In order to achieve that plan to cover the requirements of
-
-- CIS Windows 2012R2
-- CIS Windows 2016
-- STIG Windows 2012R2
-
-Any contributions to achieve that are welcome!
-
+- Windows Server 2016 Nano Server
+
+### Roadmap
+
+This cookbook aims to be the go-to-resource to implement hardening for Windows environments. In order to achieve that plan to cover the requirements of
+
+- CIS Windows 2012R2
+- CIS Windows 2016
+- STIG Windows 2012R2
+
+Any contributions to achieve that are welcome!
+
 ## Coding guidelines
 
 Use Chef resources wherever possible. Some Chef resources we use to manage Windows:
@@ -63,15 +63,15 @@ This cookbook is currently in development. It does not cover all requirements to
 * Alex Pop [alexpop](https://github.com/alexpop)
 * Yvo Van Doorn [yvovandoorn](https://github.com/yvovandoorn)
 * Matthew Tunny [MattTunny](https://github.com/matttunny)
-
+* Patrick Muench [arlimus](https://github.com/atomic111)
 
 ## Contributing
 
 See [contributor guideline](CONTRIBUTING.md).
 
-
 ## License and Author
 
+* Author:: Patrick Muench <[email protected]>
 * Author:: Joe Gardiner <[email protected]> <[email protected]>
 * Author:: Christoph Hartmann <[email protected]> <[email protected]>
 * Author:: Chef Software Ltd

Rakefile

@@ -1,4 +1,3 @@
-#!/usr/bin/env rake
 # encoding: utf-8
 
 require 'foodcritic'

metadata.rb

@@ -1,11 +1,31 @@
+# frozen_string_literal: true
+
+#
+# Copyright 2019, DevSec Hardening Framework Team
+#
+# 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.
+#
+
 name 'windows-hardening'
 maintainer 'Joe Gardiner'
 maintainer_email '[email protected]'
-license 'Apache 2.0'
-description 'Hardening cookbook for Windows 2012 R2'
+license 'Apache-2.0'
+description 'Hardening cookbook for Windows 2012 R2 and 2016'
 long_description 'Remediates critical issues identified by the DevSec Windows baseline'
 version '0.9.1'
 source_url 'https://github.com/dev-sec/chef-windows-hardening' if respond_to?(:source_url)
 issues_url 'https://github.com/dev-sec/chef-windows-hardening/issues' if respond_to?(:issues_url)
+chef_version '>= 14'
 supports 'windows'
 depends 'windows-security-policy'
+cookbook 'windows_firewall'

recipes/access.rb

@@ -2,64 +2,13 @@
 # Cookbook Name:: windows-hardening
 # Recipe:: access
 #
+# Copyright (c) 2019 Patrick Muench, All Rights Reserved.
 # Copyright (c) 2016 Joe Gardiner, All Rights Reserved.
 
 return unless node['platform_family'] == 'windows'
 
 # Anonymous Access to Windows Shares and Named Pipes is Disallowed
 # windows-baseline: windows-base-102
-registry_key 'HKLM\\System\\CurrentControlSet\\Services\\LanManServer\\Parameters' do
-  values [{
-    name: 'RestrictNullSessAccess',
-    type: :dword,
-    data: 1
-  }]
-  action :create_if_missing
-end
-
-# All Shares are Configured to Prevent Anonymous Access
-# windows-baseline: windows-base-103
-registry_key 'HKLM\\System\\CurrentControlSet\\Services\\LanManServer\\Parameters' do
-  values [{
-    name: 'NullSessionShares',
-    type: :multi_string,
-    data: ['']
-  }]
-  action :create_if_missing
-end
-
-# Strong Windows NTLMv2 Authentication Enabled; Weak LM Disabled
-# windows-baseline: windows-base-103
-registry_key 'HKLM\\System\\CurrentControlSet\\Control\\Lsa' do
-  values [{
-    name: 'LmCompatibilityLevel',
-    type: :dword,
-    data: 4
-  }]
-  action :create
-end
-
-# Enable Strong Encryption for Windows Network Sessions on Clients
-# windows-baseline: windows-base-201
-registry_key 'HKLM\\System\\CurrentControlSet\\Control\\Lsa\\MSV1_0' do
-  values [{
-    name: 'NtlmMinClientSec',
-    type: :dword,
-    data: 537_395_200
-  }]
-  action :create
-end
-
-# Enable Strong Encryption for Windows Network Sessions on Servers
-# windows-baseline: windows-base-202
-registry_key 'HKLM\\System\\CurrentControlSet\\Control\\Lsa\\MSV1_0' do
-  values [{
-    name: 'NtlmMinServerSec',
-    type: :dword,
-    data: 537_395_200
-  }]
-  action :create
-end
 
 if node['windows_hardening']['smbv1']['disable'] == true
   registry_key 'HKLM\\System\\CurrentControlSet\\Services\\LanManServer\\Parameters' do

recipes/accounts.rb

@@ -2,7 +2,7 @@
 # Cookbook Name:: windows-hardening
 # Recipe:: account_status
 #
-# Copyright (c) 2019 The Authors, All Rights Reserved.
+# Copyright (c) 2019 Patrick Muench, All Rights Reserved.
 
 return unless node['platform_family'] == 'windows'
 
@@ -67,29 +67,3 @@
     action :set
   end
 end
-
-# Ensure \'Audit: Force audit policy subcategory settings (Windows Vista or later) to override audit policy category settings\' is set to \'Enabled\'
-# tag 'CIS Microsoft Windows Server 2012 R2 Benchmark v2.3.0 - 03-30-2018': '2.3.2.1'
-# tag 'CIS Microsoft Windows Server 2016 RTM (Release 1607) Benchmark v1.1.0 - 10-31-2018': '2.3.2.1'
-registry_key 'HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Lsa' do
-  values [{
-    name: 'SCENoApplyLegacyAuditPolicy',
-    type: :dword,
-    data: 1
-  }]
-  action :create
-  recursive true
-end
-
-# Ensure \'Audit: Shut down system immediately if unable to log security audits\' is set to \'Disabled\'
-# tag 'CIS Microsoft Windows Server 2012 R2 Benchmark v2.3.0 - 03-30-2018': '2.3.2.2'
-# tag 'CIS Microsoft Windows Server 2016 RTM (Release 1607) Benchmark v1.1.0 - 10-31-2018': '2.3.2.2'
-registry_key 'HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Lsa' do
-  values [{
-    name: 'CrashOnAuditFail',
-    type: :dword,
-    data: 0
-  }]
-  action :create
-  recursive true
-end