Add new finding lists (CIS), minor corrections

README.md

@@ -227,20 +227,32 @@ HardeningKitty can be used to audit systems against the following baselines / be
 | CIS Microsoft Windows 10 Enterprise (User) | 21H1 | 1.11.0 |
 | CIS Microsoft Windows 10 Enterprise (Machine) | 21H2 | 1.12.0 |
 | CIS Microsoft Windows 10 Enterprise (User) | 21H2 | 1.12.0 |
+| CIS Microsoft Windows 10 Enterprise (Machine) | 22H2 | 2.0.0 |
+| CIS Microsoft Windows 10 Enterprise (User) | 22H2 | 2.0.0 |
 | CIS Microsoft Windows 11 Enterprise (Machine) | 21H2 | 1.0.0 |
 | CIS Microsoft Windows 11 Enterprise (User) | 21H2 | 1.0.0 |
+| CIS Microsoft Windows 11 Enterprise (Machine) | 22H2 | 2.0.0 |
+| CIS Microsoft Windows 11 Enterprise (User) | 22H2 | 2.0.0 |
 | CIS Microsoft Windows Server 2012 R2 (Machine) | R2 | 2.4.0 |
 | CIS Microsoft Windows Server 2012 R2 (User) | R2 | 2.4.0 |
+| CIS Microsoft Windows Server 2012 R2 (Machine) | R2 | 2.6.0 |
+| CIS Microsoft Windows Server 2012 R2 (User) | R2 | 2.6.0 |
 | CIS Microsoft Windows Server 2016 (Machine) | 1607 | 1.2.0 |
 | CIS Microsoft Windows Server 2016 (User) | 1607 | 1.2.0 |
 | CIS Microsoft Windows Server 2016 (Machine) | 1607 | 1.3.0 |
 | CIS Microsoft Windows Server 2016 (User) | 1607 | 1.3.0 |
+| CIS Microsoft Windows Server 2016 (Machine) | 1607 | 2.0.0 |
+| CIS Microsoft Windows Server 2016 (User) | 1607 | 2.0.0 |
 | CIS Microsoft Windows Server 2019 (Machine) | 1809 | 1.1.0 |
 | CIS Microsoft Windows Server 2019 (User) | 1809 | 1.1.0 |
 | CIS Microsoft Windows Server 2019 (Machine) | 1809 | 1.2.1 |
 | CIS Microsoft Windows Server 2019 (User) | 1809 | 1.2.1 |
+| CIS Microsoft Windows Server 2019 (Machine) | 1809 | 2.0.0 |
+| CIS Microsoft Windows Server 2019 (User) | 1809 | 2.0.0 |
 | CIS Microsoft Windows Server 2022 (Machine) | 21H2 | 1.0.0 |
 | CIS Microsoft Windows Server 2022 (User) | 21H2 | 1.0.0 |
+| CIS Microsoft Windows Server 2022 (Machine) | 22H2 | 2.0.0 |
+| CIS Microsoft Windows Server 2022 (User) | 22H2 | 2.0.0 |
 | DoD Microsoft Windows 10 STIG (Machine) | 20H2 | v2r1 |
 | DoD Microsoft Windows 10 STIG (User) | 20H2 | v2r1 |
 | DoD Windows Server 2019 Domain Controller STIG (Machine) | 20H2 | v2r1 |

lists/finding_list_cis_microsoft_windows_10_enterprise_22h2_user.csv

@@ -0,0 +1,16 @@
+ID,Category,Name,Method,MethodArgument,RegistryPath,RegistryItem,ClassName,Namespace,Property,DefaultValue,RecommendedValue,Operator,Severity
+19.1.3.1,"Administrative Templates: Control Panel","Enable screen saver",Registry,,"HKCU:\Software\Policies\Microsoft\Windows\Control Panel\Desktop",ScreenSaveActive,,,,,1,=,Medium
+19.1.3.2,"Administrative Templates: Control Panel","Password protect the screen saver",Registry,,"HKCU:\Software\Policies\Microsoft\Windows\Control Panel\Desktop",ScreenSaverIsSecure,,,,,1,=,Medium
+19.1.3.3,"Administrative Templates: Control Panel","Screen saver timeout",Registry,,"HKCU:\Software\Policies\Microsoft\Windows\Control Panel\Desktop",ScreenSaveTimeOut,,,,,900,<=!0,Medium
+19.5.1.1,"Administrative Templates: Start Menu and Taskbar","Notifications: Turn off toast notifications on the lock screen",Registry,,HKCU:\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\PushNotifications,NoToastApplicationNotificationOnLockScreen,,,,0,1,=,Medium
+19.6.6.1.1,"Administrative Templates: System","Internet Communication Management: Internet Communication Settings: Turn off Help Experience Improvement Program",Registry,,HKCU:\Software\Policies\Microsoft\Assistance\Client\1.0,NoImplicitFeedback,,,,0,1,=,Medium
+19.7.4.1,"Administrative Templates: Windows Components","Attachment Manager: Do not preserve zone information in file attachments",Registry,,HKCU:\Software\Microsoft\Windows\CurrentVersion\Policies\Attachments,SaveZoneInformation,,,,,2,=,Medium
+19.7.4.2,"Administrative Templates: Windows Components","Attachment Manager: Notify antivirus programs when opening attachments",Registry,,HKCU:\Software\Microsoft\Windows\CurrentVersion\Policies\Attachments,ScanWithAntiVirus,,,,,3,=,Medium
+19.7.7.1,"Administrative Templates: Windows Components","Cloud Content: Configure Windows spotlight on lock screen",Registry,,HKCU:\Software\Policies\Microsoft\Windows\CloudContent,ConfigureWindowsSpotlight,,,,,2,=,Medium
+19.7.7.2,"Administrative Templates: Windows Components","Cloud Content: Do not suggest third-party content in Windows spotlight",Registry,,HKCU:\Software\Policies\Microsoft\Windows\CloudContent,DisableThirdPartySuggestions,,,,0,1,=,Medium
+19.7.7.3,"Administrative Templates: Windows Components","Cloud Content: Do not use diagnostic data for tailored experiences",Registry,,HKCU:\Software\Policies\Microsoft\Windows\CloudContent,DisableTailoredExperiencesWithDiagnosticData,,,,0,1,=,Medium
+19.7.7.4,"Administrative Templates: Windows Components","Cloud Content: Turn off all Windows spotlight features",Registry,,HKCU:\Software\Policies\Microsoft\Windows\CloudContent,DisableWindowsSpotlightFeatures,,,,0,1,=,Medium
+19.7.7.5,"Administrative Templates: Windows Components","Cloud Content: Turn off Spotlight collection on Desktop",Registry,,HKCU:\Software\Policies\Microsoft\Windows\CloudContent,DisableSpotlightCollectionOnDesktop,,,,,1,=,Medium
+19.7.25.1,"Administrative Templates: Windows Components","Network Sharing: Prevent users from sharing files within their profile",Registry,,HKCU:\Software\Microsoft\Windows\CurrentVersion\Policies\Explorer,NoInplaceSharing,,,,0,1,=,Medium
+19.7.40.1,"Administrative Templates: Windows Components","Windows Installer: Always install with elevated privileges",Registry,,HKCU:\Software\Policies\Microsoft\Windows\Installer,AlwaysInstallElevated,,,,0,0,=,Medium
+19.7.42.2.1,"Administrative Templates: Windows Components","Windows Media Player: Playback: Prevent Codec Download",Registry,,HKCU:\Software\Policies\Microsoft\WindowsMediaPlayer,PreventCodecDownload,,,,,1,=,Medium