New Updates for Merge

controls/SV-221584.rb

@@ -21,4 +21,14 @@
   tag legacy: ["SV-57639","V-44805"]
   tag cci: ["CCI-002605"]
   tag nist: ["SI-2 c"]
+
+  current_chrome_version_command  = <<-EOH
+    #find version
+    $version = (Get-Item (Get-ItemProperty 'HKLM:\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\chrome.exe').'(Default)').VersionInfo.ProductVersion
+    echo $version
+  EOH
+
+  describe powershell(current_chrome_version_command) do
+    its('stdout') { should cmp >= input('google_chrome_version')  }
+  end
 end

controls/SV-221588.rb

@@ -56,4 +56,22 @@
   tag legacy: ["SV-94635","V-79931"]
   tag cci: ["CCI-000169"]
   tag nist: ["AU-12 a"]
+
+  if sensitive_system
+    impact 0.0
+    describe 'This Control is Not Applicable to systems for Sensitive Networks.' do
+      skip 'This Control is Not Applicable to systems for Sensitive Networks.'
+    end
+  else
+    describe.one do
+        describe registry_key('HKEY_LOCAL_MACHINE\Software\Policies\Google\Chrome') do
+          it { should have_property 'DownloadRestrictions' }
+          its('DownloadRestrictions') { should cmp 1 }
+        end
+        describe registry_key('HKEY_LOCAL_MACHINE\Software\Policies\Google\Chrome') do
+          it { should have_property 'DownloadRestrictions' }
+          its('DownloadRestrictions') { should cmp 2 }
+        end
+     end
+  end
 end

controls/SV-221590.rb

@@ -42,4 +42,9 @@
   tag legacy: ["SV-96299","V-81585"]
   tag cci: ["CCI-001166"]
   tag nist: ["SC-18 (1)"]
+
+  describe registry_key('HKEY_LOCAL_MACHINE\Software\Policies\Google\Chrome') do
+    it { should have_property 'SafeBrowsingExtendedReportingEnabled'}
+    its('SafeBrowsingExtendedReportingEnabled') { should cmp 0 }
+  end
 end

controls/SV-221591.rb

@@ -38,4 +38,9 @@
   tag legacy: ["SV-96301","V-81587"]
   tag cci: ["CCI-000381"]
   tag nist: ["CM-7 a"]
+
+  describe registry_key('HKEY_LOCAL_MACHINE\Software\Policies\Google\Chrome') do
+    it { should have_property 'DefaultWebUsbGuardSetting'}
+    its('DefaultWebUsbGuardSetting') { should cmp 2 }
+  end
 end

controls/SV-221592.rb

@@ -38,4 +38,9 @@
   tag legacy: ["SV-96305","V-81591"]
   tag cci: ["CCI-000169"]
   tag nist: ["AU-12 a"]
+
+  describe registry_key('HKEY_LOCAL_MACHINE\Software\Policies\Google\Chrome') do
+    it { should have_property 'ChromeCleanupEnabled'}
+    its('ChromeCleanupEnabled') { should cmp 0 }
+  end
 end

controls/SV-221593.rb

@@ -48,4 +48,9 @@
   tag legacy: ["SV-96307","V-81593"]
   tag cci: ["CCI-000169"]
   tag nist: ["AU-12 a"]
+
+  describe registry_key('HKEY_LOCAL_MACHINE\Software\Policies\Google\Chrome') do
+    it { should have_property 'ChromeCleanupReportingEnabled'}
+    its('ChromeCleanupReportingEnabled') { should cmp 0 }
+  end
 end

controls/SV-221594.rb

@@ -35,4 +35,9 @@
   tag legacy: ["SV-96311","V-81597"]
   tag cci: ["CCI-000381"]
   tag nist: ["CM-7 a"]
+
+  describe registry_key('HKEY_LOCAL_MACHINE\Software\Policies\Google\Chrome') do
+    it { should have_property 'EnableMediaRouter'}
+    its('EnableMediaRouter') { should cmp 0 }
+  end
 end

controls/SV-221595.rb

@@ -37,4 +37,9 @@
   tag legacy: ["SV-96295","V-81581"]
   tag cci: ["CCI-000381"]
   tag nist: ["CM-7 a"]
+
+  describe registry_key('HKEY_LOCAL_MACHINE\Software\Policies\Google\Chrome') do
+    it { should have_property 'AutoplayAllowed'}
+    its('AutoplayAllowed') { should cmp 0 }
+  end
 end

controls/SV-221596.rb

@@ -40,4 +40,11 @@
   tag legacy: ["SV-96303","V-81589"]
   tag cci: ["CCI-001170"]
   tag nist: ["SC-18 (4)"]
+
+  approved_urls = input('administrator_approved_urls')
+
+  describe registry_key('HKEY_LOCAL_MACHINE\Software\Policies\Google\Chrome') do
+    it { should have_property 'AutoplayAllowlist'}
+    its('AutoplayAllowlist') { should cmp approved_urls }
+  end
 end

controls/SV-221597.rb

@@ -41,4 +41,9 @@
   tag legacy: ["SV-101303","V-91203"]
   tag cci: ["CCI-001166"]
   tag nist: ["SC-18 (1)"]
+
+  describe registry_key('HKEY_LOCAL_MACHINE\Software\Policies\Google\Chrome') do
+    it { should have_property 'UrlKeyedAnonymizedDataCollectionEnabled'}
+    its('UrlKeyedAnonymizedDataCollectionEnabled') { should cmp 0 }
+  end
 end

controls/SV-221598.rb

@@ -42,4 +42,9 @@
   tag legacy: ["SV-101305","V-91205"]
   tag cci: ["CCI-001166"]
   tag nist: ["SC-18 (1)"]
+
+  describe registry_key('HKEY_LOCAL_MACHINE\Software\Policies\Google\Chrome') do
+    it { should have_property 'WebRtcEventLogCollectionAllowed'}
+    its('WebRtcEventLogCollectionAllowed') { should cmp 0 }
+  end
 end

controls/SV-221599.rb

@@ -37,4 +37,9 @@
   tag legacy: ["SV-106629","V-97525"]
   tag cci: ["CCI-001312"]
   tag nist: ["SI-11 a"]
+
+  describe registry_key('HKEY_LOCAL_MACHINE\Software\Policies\Google\Chrome') do
+    it { should have_property 'DeveloperToolsAvailability'}
+    its('DeveloperToolsAvailability') { should cmp 2 }
+  end
 end

inspec.yml

@@ -9,18 +9,35 @@ version: 2.6.1
 
 inputs:
   - name: administrator_approved_extension_ids
-    desc: 'This is a list of approved extension ids determined by administrators to decide which extensions should be allowed for their users.'
+    description: 'This is a list of approved extension ids determined by administrators to decide which extensions should be allowed for their users.'
     type: Array
     value:
       - ''
 
   - name: approved_encrypted_search_provider_name
-    desc: "This contains the name of organization approved encrypted search provider that corresponds to the encrypted search provider"
+    description: "This contains the name of organization approved encrypted search provider that corresponds to the encrypted search provider"
     type: String
     value: ''
 
   - name: approved_encrytped_search_string
-    desc: "This details an organization-approved encrypted search string to perform encrypted searches"
+    description: "This details an organization-approved encrypted search string to perform encrypted searches"
     type: String
-    value: ''
-
+    value: ''  
+
+  - name: sensitive_system
+    description: "If this system/machine is on a Sensitive Network(s)"
+    type: Boolean
+    value: false
+
+  - name: google_chrome_version
+    description: "This contains the least acceptable version number for Google Chrome"
+    type: String
+    value: '74.0.0' 
+
+  - name: administrator_approved_urls
+    description: "Administrator approved allowlist of URL patterns that autoplay will always be enabled on"
+    type: Array
+    value: 
+    - ''
+    - ''  
+