Skip to content

Commit 9ddd4cc

Browse files
athaynesathaynes
authored
Release
This PR is automatically completed.
2 parents baf104c + 53aafef commit 9ddd4cc

File tree

312 files changed

+49150
-99096
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

312 files changed

+49150
-99096
lines changed

‎.NuspecFileList.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,5 @@
3030
{
3131
"src": "Module\\Stig*\\**",
3232
"target": "Module"
33-
},
34-
{
35-
"src": "Module\\Document*\\**",
36-
"target": "Module"
3733
}
3834
]

‎CHANGELOG.md

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,31 @@
22

33
## Unreleased
44

5+
## 2.3.0.0
6+
7+
* Windows 10 Fixes
8+
* V-63795 - Changed from manual to registry rule ## HIGH IMPACT CHANGE ##
9+
10+
* Windows Server 2012R2 Fixes
11+
* V-1089 - Corrected text
12+
* V-21954 - Changed from manual to registry rule ## HIGH IMPACT CHANGE ##
13+
* V-26070 - Corrected key path
14+
* V-36657 - Corrected key path
15+
* V-36681 - Corrected key path
16+
17+
* Added the following STIGs
18+
* IIS Server 8.5 STIG V1R5
19+
* Microsoft Outlook 2013 STIG V1R13
20+
* DotNet Framework 4.0 STIG V1R6
21+
* IIS Site 8.5 STIG V1R5
22+
* Windows Domain V2R11
23+
* FireFox 4.23 STIG
24+
* Windows Server 2012R2 DC V2R14
25+
* Windows Server 2012R2 MS V2R14
26+
* Windows 10 V1R15
27+
528
## 2.2.0.0
6-
29+
730
* Added the following STIGs
831
* IIS Site 8.5 STIG V1R2
932
* IIS Site 8.5 STIG V1R3

‎DSCResources/Browser/Browser.schema.psm1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ Configuration Browser
8080
$technology = [Technology]::Windows
8181
$technologyVersion = [TechnologyVersion]::New( 'All', $technology )
8282
$technologyRole = [TechnologyRole]::New( $BrowserVersion, $technologyVersion )
83-
$stigDataObject = [StigData]::New( $StigVersion, $OrgSettings, $technology,
83+
$stigDataObject = [STIG]::New( $StigVersion, $OrgSettings, $technology,
8484
$technologyRole, $technologyVersion, $Exception,
8585
$SkipRuleType, $SkipRule )
8686
#### BEGIN DO NOT MODIFY ####
@@ -95,9 +95,9 @@ Configuration Browser
9595
. "$resourcePath\windows.Script.skip.ps1"
9696
##### END DO NOT MODIFY #####
9797

98-
Import-DscResource -ModuleName xPSDesiredStateConfiguration -ModuleVersion 8.3.0.0
99-
. "$resourcePath\windows.xRegistry.ps1"
100-
10198
Import-DscResource -ModuleName PolicyFileEditor -ModuleVersion 3.0.1
10299
. "$resourcePath\windows.cAdministrativeTemplateSetting.ps1"
100+
101+
Import-DscResource -ModuleName xPSDesiredStateConfiguration -ModuleVersion 8.3.0.0
102+
. "$resourcePath\windows.xRegistry.ps1"
103103
}

‎DSCResources/DotNetFramework/DotNetFramework.schema.psm1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Configuration DotNetFramework
4343
$FrameworkVersion,
4444

4545
[Parameter()]
46-
[ValidateSet('1.4')]
46+
[ValidateSet('1.4', '1.6')]
4747
[ValidateNotNullOrEmpty()]
4848
[version]
4949
$StigVersion,
@@ -83,7 +83,7 @@ Configuration DotNetFramework
8383
$technology = [Technology]::Windows
8484
$technologyVersion = [TechnologyVersion]::New( "All", $technology )
8585
$technologyRole = [TechnologyRole]::New( $FrameworkVersion, $technologyVersion )
86-
$stigDataObject = [StigData]::New( $StigVersion, $orgSettingsObject, $technology,
86+
$stigDataObject = [STIG]::New( $StigVersion, $orgSettingsObject, $technology,
8787
$technologyRole, $technologyVersion, $Exception,
8888
$SkipRuleType, $SkipRule )
8989
#### BEGIN DO NOT MODIFY ####

‎DSCResources/FireFox/FireFox.schema.psm1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Configuration FireFox
3939
$InstallDirectory = "$env:ProgramFiles\Mozilla Firefox",
4040

4141
[Parameter()]
42-
[ValidateSet('4.21')]
42+
[ValidateSet('4.21', '4.23')]
4343
[ValidateNotNullOrEmpty()]
4444
[version]
4545
$StigVersion,
@@ -76,7 +76,7 @@ Configuration FireFox
7676
$technology = [Technology]::Mozilla
7777
$technologyVersion = [TechnologyVersion]::New( 'All', $technology )
7878
$technologyRole = [TechnologyRole]::New( 'FireFox', $technologyVersion )
79-
$stigDataObject = [StigData]::New( $StigVersion, $OrgSettings, $technology,
79+
$stigDataObject = [STIG]::New( $StigVersion, $OrgSettings, $technology,
8080
$technologyRole, $technologyVersion, $Exception,
8181
$SkipRuleType, $SkipRule )
8282
#### BEGIN DO NOT MODIFY ####

‎DSCResources/IisServer/IisServer.schema.psm1

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,23 @@ using module ..\..\PowerStig.psm1
1212
The version of the server operating system STIG to apply and monitor
1313
1414
.PARAMETER LogPath
15-
The path to store log information
15+
The path to store log information
1616
1717
.PARAMETER StigVersion
1818
The version of the IIS Server STIG to apply and/or monitor
1919
2020
.PARAMETER Exception
21-
A hashtable of StigId=Value key pairs that are injected into the STIG data and applied to
22-
the target node. The title of STIG settings are tagged with the text ‘Exception’ to identify
21+
A hashtable of StigId=Value key pairs that are injected into the STIG data and applied to
22+
the target node. The title of STIG settings are tagged with the text ‘Exception’ to identify
2323
the exceptions to policy across the data center when you centralize DSC log collection.
2424
2525
.PARAMETER OrgSettings
26-
The path to the xml file that contains the local organizations preferred settings for STIG
26+
The path to the xml file that contains the local organizations preferred settings for STIG
2727
items that have allowable ranges.
2828
2929
.PARAMETER SkipRule
3030
The SkipRule Node is injected into the STIG data and applied to the taget node. The title
31-
of STIG settings are tagged with the text 'Skip' to identify the skips to policy across the
31+
of STIG settings are tagged with the text 'Skip' to identify the skips to policy across the
3232
data center when you centralize DSC log collection.
3333
3434
.PARAMETER SkipRuleType
@@ -64,7 +64,7 @@ Configuration IisServer
6464
$LogPath,
6565

6666
[Parameter()]
67-
[ValidateSet('1.3')]
67+
[ValidateSet('1.3','1.5')]
6868
[ValidateNotNullOrEmpty()]
6969
[version]
7070
$StigVersion,
@@ -73,7 +73,7 @@ Configuration IisServer
7373
[ValidateNotNullOrEmpty()]
7474
[psobject]
7575
$Exception,
76-
76+
7777
[Parameter()]
7878
[ValidateNotNullOrEmpty()]
7979
[psobject]
@@ -105,7 +105,7 @@ Configuration IisServer
105105
$technology = [Technology]::Windows
106106
$technologyVersion = [TechnologyVersion]::New( $OsVersion, $technology )
107107
$technologyRole = [TechnologyRole]::New( 'IISServer', $technologyVersion )
108-
$stigDataObject = [StigData]::New( $StigVersion, $orgSettingsObject, $technology, $technologyRole, $technologyVersion, $exceptionsObject , $skipRuleTypeObject, $skipRuleObject )
108+
$stigDataObject = [STIG]::New( $StigVersion, $orgSettingsObject, $technology, $technologyRole, $technologyVersion, $exceptionsObject , $skipRuleTypeObject, $skipRuleObject )
109109

110110
#### BEGIN DO NOT MODIFY ####
111111
# $StigData is used in the resources that are dot sourced below
@@ -118,18 +118,18 @@ Configuration IisServer
118118
. "$resourcePath\windows.Script.skip.ps1"
119119
##### END DO NOT MODIFY #####
120120

121+
Import-DscResource -ModuleName AccessControlDsc -ModuleVersion 1.1.0.0
122+
. "$resourcePath\windows.AccessControl.ps1"
123+
121124
Import-DscResource -ModuleName PSDesiredStateConfiguration -ModuleVersion 1.1
122125
. "$resourcePath\windows.WindowsFeature.ps1"
123126

124127
Import-DscResource -ModuleName xPSDesiredStateConfiguration -ModuleVersion 8.3.0.0
125128
. "$resourcePath\windows.xRegistry.ps1"
126-
129+
127130
Import-DscResource -ModuleName xWebAdministration -ModuleVersion 2.2.0.0
128131
. "$resourcePath\windows.xIisMimeTypeMapping.ps1"
129132
. "$resourcePath\windows.WebConfigProperty.ps1"
130133
. "$resourcePath\windows.xIisLogging.ps1"
131-
132-
Import-DscResource -ModuleName AccessControlDsc -ModuleVersion 1.1.0.0
133-
. "$resourcePath\windows.AccessControl.ps1"
134134
}
135135
#endregion Composite

‎DSCResources/IisSite/IisSite.schema.psm1

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,17 @@ using module ..\..\PowerStig.psm1
2222
The version of the IIS Site STIG version to apply and monitor
2323
2424
.PARAMETER Exception
25-
A hashtable of StigId=Value key pairs that are injected into the STIG data and applied to
26-
the target node. The title of STIG settings are tagged with the text ‘Exception’ to identify
25+
A hashtable of StigId=Value key pairs that are injected into the STIG data and applied to
26+
the target node. The title of STIG settings are tagged with the text ‘Exception’ to identify
2727
the exceptions to policy across the data center when you centralize DSC log collection.
2828
2929
.PARAMETER OrgSettings
30-
The path to the xml file that contains the local organizations preferred settings for STIG
30+
The path to the xml file that contains the local organizations preferred settings for STIG
3131
items that have allowable ranges.
3232
3333
.PARAMETER SkipRule
3434
The SkipRule Node is injected into the STIG data and applied to the taget node. The title
35-
of STIG settings are tagged with the text 'Skip' to identify the skips to policy across the
35+
of STIG settings are tagged with the text 'Skip' to identify the skips to policy across the
3636
data center when you centralize DSC log collection.
3737
3838
.PARAMETER SkipRuleType
@@ -74,7 +74,7 @@ Configuration IisSite
7474
$OsVersion,
7575

7676
[Parameter()]
77-
[ValidateSet('1.2')]
77+
[ValidateSet('1.2','1.5')]
7878
[ValidateNotNullOrEmpty()]
7979
[version]
8080
$StigVersion,
@@ -115,7 +115,7 @@ Configuration IisSite
115115
$technology = [Technology]::Windows
116116
$technologyVersion = [TechnologyVersion]::New( $OsVersion, $technology )
117117
$technologyRole = [TechnologyRole]::New( "IISSite", $technologyVersion )
118-
$stigDataObject = [StigData]::New( $StigVersion, $orgSettingsObject, $technology, $technologyRole, $technologyVersion, $exceptionsObject , $skipRuleTypeObject, $skipRuleObject )
118+
$stigDataObject = [STIG]::New( $StigVersion, $orgSettingsObject, $technology, $technologyRole, $technologyVersion, $exceptionsObject , $skipRuleTypeObject, $skipRuleObject )
119119

120120
#### BEGIN DO NOT MODIFY ####
121121
# $StigData is used in the resources that are dot sourced below

‎DSCResources/Office/Office.schema.psm1

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Configuration Office
4343
$OfficeApp,
4444

4545
[Parameter()]
46-
[ValidateSet('1.6', '1.7', '1.12')]
46+
[ValidateSet('1.6', '1.7', '1.12', '1.13')]
4747
[ValidateNotNullOrEmpty()]
4848
[version]
4949
$StigVersion,
@@ -83,7 +83,7 @@ Configuration Office
8383
$technology = [Technology]::Windows
8484
$technologyVersion = [TechnologyVersion]::New( "All", $technology )
8585
$technologyRole = [TechnologyRole]::New( $OfficeApp, $technologyVersion )
86-
$stigDataObject = [StigData]::New( $StigVersion, $OrgSettings, $technology,
86+
$stigDataObject = [STIG]::New( $StigVersion, $OrgSettings, $technology,
8787
$technologyRole, $technologyVersion, $Exception,
8888
$SkipRuleType, $SkipRule )
8989
#### BEGIN DO NOT MODIFY ####
@@ -98,9 +98,9 @@ Configuration Office
9898
. "$resourcePath\windows.Script.skip.ps1"
9999
##### END DO NOT MODIFY #####
100100

101-
Import-DscResource -ModuleName xPSDesiredStateConfiguration -ModuleVersion 8.3.0.0
102-
. "$resourcePath\windows.xRegistry.ps1"
103-
104101
Import-DscResource -ModuleName PolicyFileEditor -ModuleVersion 3.0.1
105102
. "$resourcePath\windows.cAdministrativeTemplateSetting.ps1"
103+
104+
Import-DscResource -ModuleName xPSDesiredStateConfiguration -ModuleVersion 8.3.0.0
105+
. "$resourcePath\windows.xRegistry.ps1"
106106
}

‎DSCResources/OracleJRE/OracleJRE.schema.psm1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ Configuration OracleJRE
8989
$technology = [Technology]::Windows
9090
$technologyVersion = [TechnologyVersion]::New( "All", $technology )
9191
$technologyRole = [TechnologyRole]::New( "OracleJRE8", $technologyVersion )
92-
$stigDataObject = [StigData]::New( $StigVersion, $orgSettingsObject, $technology,
92+
$stigDataObject = [STIG]::New( $StigVersion, $orgSettingsObject, $technology,
9393
$technologyRole, $technologyVersion, $Exception,
9494
$SkipRuleType, $SkipRule )
9595
#### BEGIN DO NOT MODIFY ####

‎DSCResources/Resources/SqlServer.ScriptQuery.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (c) Microsoft Corporation. All rights reserved.
22
# Licensed under the MIT License.
33

4-
$rules = Get-RuleClassData -StigData $StigData -Name SqlScriptQueryRule
4+
$rules = Get-RuleClassData -StigData $stigData -Name SqlScriptQueryRule
55

66
foreach ($instance in $ServerInstance)
77
{

0 commit comments

Comments
 (0)