Skip to content

Commit 19dc6cd

Browse files
ssokolicssokolic
authored
Merge branch 'dev' into dependabot/github_actions/dev/megalinter/megalinter-7
2 parents 89fea96 + 44c779e commit 19dc6cd

File tree

166 files changed

+1587
-6378
lines changed

Some content is hidden

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

166 files changed

+1587
-6378
lines changed

‎.github/workflows/commit-message-validator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
commitlint:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v3
9+
- uses: actions/checkout@v4
1010
with:
1111
fetch-depth: 0
1212
- uses: wagoid/commitlint-github-action@v5

‎.github/workflows/dependabot.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
steps:
1212
- name: Dependabot metadata
1313
id: dependabot-metadata
14-
uses: dependabot/fetch-metadata@v1.5.1
14+
uses: dependabot/fetch-metadata@v1.6.0
1515
with:
1616
github-token: ${{ secrets.GITHUB_TOKEN }}
1717
- name: Approve a PR

‎.github/workflows/megalinter.yaml

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Checkout Code
15-
uses: actions/checkout@v3
15+
uses: actions/checkout@v4
1616
with:
1717
token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }}
1818
fetch-depth: 0
19-
- name: MegaLinter
20-
id: ml
21-
uses: megalinter/megalinter/flavors/terraform@v7
22-
env:
23-
VALIDATE_ALL_CODEBASE: true
24-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
25-
DISABLE: COPYPASTE,SPELL
26-
DISABLE_LINTERS: TERRAFORM_TERRASCAN
27-
- name: Archive production artifacts
28-
if: ${{ success() }} || ${{ failure() }}
29-
uses: actions/upload-artifact@v3
30-
with:
31-
name: MegaLinter reports
32-
path: |
33-
report
34-
mega-linter.log

‎.github/workflows/tagging.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Checkout
15-
uses: actions/checkout@v3
15+
uses: actions/checkout@v4
1616
with:
1717
token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }}
1818
fetch-depth: 0

‎.idea/misc.xml

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎README.md

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,15 @@ Please check the links for more info, including usage information and full docum
2828
- [Twitter](https://twitter.com/xoap_io)
2929
- [LinkedIn](https://www.linkedin.com/company/xoap_io)
3030

31+
This repository hosts some of the most common DSC configurations that we use in our projects.
32+
33+
You will find the following DSC configurations in this repository:
34+
35+
- Citrix infrastructure and Citrix optimizer configurations
36+
- DoD STIG configurations
37+
- general Windows configurations
38+
- Microsoft security baseline configurations
39+
3140
---
3241

3342
## Disclaimer
@@ -36,7 +45,7 @@ Please check the links for more info, including usage information and full docum
3645

3746
Be sure to always test any of those configurations in separated test environment and test clients and servers.
3847

39-
>Some of the available DSC configurations make severe changes to security-related configurations and could leave your Windows operating system in an unusable state.
48+
> Some of the available DSC configurations make severe changes to security-related configurations and could leave your Windows operating system in an unusable state.
4049
4150
So please test once, twice or trice.
4251

@@ -116,15 +125,13 @@ You can download it [here](https://www.microsoft.com/en-us/download/details.aspx
116125

117126
A typical DSC configuration looks like this:
118127

119-
```
120-
Configuration MSTF_SecurityBaseline_Edge_v107_Computer
128+
```PowerShell
129+
Configuration 'MSTF_SecurityBaseline_Edge_v107_Computer'
121130
{
122131
123132
Import-DSCResource -ModuleName 'GPRegistryPolicyDsc' -ModuleVersion '1.2.0'
124-
Import-DSCResource -ModuleName 'AuditPolicyDSC' -ModuleVersion '1.4.0.0'
125-
Import-DSCResource -ModuleName 'SecurityPolicyDSC' -ModuleVersion '2.10.0.0'
126133
127-
Node MSTF_SecurityBaseline_Edge_v107_Computer
134+
Node 'MSTF_SecurityBaseline_Edge_v107_Computer'
128135
{
129136
RegistryPolicyFile 'Registry(POL): HKLM:\Software\Policies\Microsoft\Edge\SitePerProcess'
130137
{
@@ -136,19 +143,20 @@ Configuration MSTF_SecurityBaseline_Edge_v107_Computer
136143
}
137144
}
138145
}
146+
MSTF_SecurityBaseline_Edge_v107_Computer -OutputPath 'C:\MSTF_SecurityBaseline_Edge_v107_Computer'
139147
```
140148

141149
In order to compile this example, you need to take care that all the referenced DSC modules are available locally.
142150

143151
You can check availability with:
144152

145-
```
153+
```PowerShell
146154
Get-DcsResource
147155
```
148156

149157
If DSC modules are missing, you can install them simply by e.g. running:
150158

151-
```
159+
```PowerShell
152160
Install-Module SecurityPolicyDSC
153161
```
154162

@@ -160,15 +168,13 @@ and that you have to trust the PSGallery to be able to install the DSC modules.
160168
161169
Defining the versions of the modules could look like this:
162170

163-
```
164-
Configuration MSTF_SecurityBaseline_Edge_v107_Computer
171+
```PowerShell
172+
Configuration 'MSTF_SecurityBaseline_Edge_v107_Computer'
165173
{
166174
167175
Import-DSCResource -ModuleName 'GPRegistryPolicyDsc' -ModuleVersion '1.2.0' -ModuleVersion '1.2.0'
168-
Import-DSCResource -ModuleName 'AuditPolicyDSC' -ModuleVersion '1.4.0.0' -ModuleVersion '1.4.0.0'
169-
Import-DSCResource -ModuleName 'SecurityPolicyDSC' -ModuleVersion '2.10.0.0' -ModuleVersion '2.1.0.0'
170176
171-
Node MSTF_SecurityBaseline_Edge_v107_Computer
177+
Node 'MSTF_SecurityBaseline_Edge_v107_Computer'
172178
{
173179
RegistryPolicyFile 'Registry(POL): HKLM:\Software\Policies\Microsoft\Edge\SitePerProcess'
174180
{
@@ -185,7 +191,7 @@ Configuration MSTF_SecurityBaseline_Edge_v107_Computer
185191
So now that all DSC modules are available and the module versions are defined,
186192
you need to run the following command in your Powershell to compile it locally:
187193

188-
```
194+
```PowerShell
189195
. PATHTOYOURSCRIPT\MSTF_SecurityBaseline_Edge_v107_Computer.ps1
190196
MSTF_SecurityBaseline_Edge_v107_Computer
191197
```
@@ -194,7 +200,7 @@ You should now have a localhost.mof file in this location.
194200

195201
The last step is to apply this configuration to your local host:
196202

197-
```
203+
```PowerShell
198204
Start-DscConfiguration -Path PATHTOYOURCONFIGURATION\MSTF_SecurityBaseline_Edge_v107_Computer -Verbose -Wait
199205
```
200206

@@ -204,4 +210,4 @@ Start-DscConfiguration -Path PATHTOYOURCONFIGURATION\MSTF_SecurityBaseline_Edge_
204210

205211
### Usage in XOAP and config.XO
206212

207-
Refer to our documentation [here](https://docs.xoap.io/configuration-management/quickstarts/add-configurations/)
213+
Refer to our documentation [here](https://docs.xoap.io/configuration-management/)

‎microsoft/dod_stig_january_2023/DoD_Adobe_Acrobat_Pro_DC_Continuous_STIG_Computer_V2R1.ps1 renamed to ‎STIG/dod_stig_january_2023/DoD_Adobe_Acrobat_Pro_DC_Continuous_STIG_Computer_V2R1.ps1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11

2-
Configuration DoD_Adobe_Acrobat_Pro_DC_Continuous_STIG_Computer_V2R1
2+
Configuration 'DoD_Adobe_Acrobat_Pro_DC_Continuous_STIG_Computer_V2R1'
33
{
4-
5-
Import-DSCResource -ModuleName 'GPRegistryPolicyDsc' -ModuleVersion '1.2.0'
4+
Import-DscResource -ModuleName 'PSDesiredStateConfiguration'
5+
Import-DSCResource -ModuleName 'GPRegistryPolicyDsc' -ModuleVersion '1.2.0'
66
Import-DSCResource -ModuleName 'AuditPolicyDSC' -ModuleVersion '1.4.0.0'
77
Import-DSCResource -ModuleName 'SecurityPolicyDSC' -ModuleVersion '2.10.0.0'
88

9-
Node DoD_Adobe_Acrobat_Pro_DC_Continuous_STIG_Computer_V2R1
9+
Node 'DoD_Adobe_Acrobat_Pro_DC_Continuous_STIG_Computer_V2R1'
1010
{
1111
RegistryPolicyFile 'Registry(POL): HKLM:\SOFTWARE\Adobe\Adobe Acrobat\DC\Installer\DisableMaintenance'
1212
{

‎microsoft/dod_stig_january_2023/DoD_Adobe_Acrobat_Reader_DC_Continuous_STIG_Computer_V2R.ps1 renamed to ‎STIG/dod_stig_january_2023/DoD_Adobe_Acrobat_Reader_DC_Continuous_STIG_Computer_V2R.ps1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11

2-
Configuration DoD_Adobe_Acrobat_Reader_DC_Continuous_STIG_Computer_V2R
2+
Configuration 'DoD_Adobe_Acrobat_Reader_DC_Continuous_STIG_Computer_V2R'
33
{
4-
5-
Import-DSCResource -ModuleName 'GPRegistryPolicyDsc' -ModuleVersion '1.2.0'
4+
Import-DscResource -ModuleName 'PSDesiredStateConfiguration'
5+
Import-DSCResource -ModuleName 'GPRegistryPolicyDsc' -ModuleVersion '1.2.0'
66
Import-DSCResource -ModuleName 'AuditPolicyDSC' -ModuleVersion '1.4.0.0'
77
Import-DSCResource -ModuleName 'SecurityPolicyDSC' -ModuleVersion '2.10.0.0'
88

9-
Node DoD_Adobe_Acrobat_Reader_DC_Continuous_STIG_Computer_V2R
9+
Node 'DoD_Adobe_Acrobat_Reader_DC_Continuous_STIG_Computer_V2R'
1010
{
1111
RegistryPolicyFile 'Registry(POL): HKLM:\SOFTWARE\Adobe\Acrobat Reader\DC\Installer\DisableMaintenance'
1212
{

‎microsoft/dod_stig_january_2023/DoD_Google_Chrome_STIG_Computer_v2r8.ps1 renamed to ‎STIG/dod_stig_january_2023/DoD_Google_Chrome_STIG_Computer_v2r8.ps1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11

2-
Configuration DoD_Google_Chrome_STIG_Computer_v2r8
2+
Configuration 'DoD_Google_Chrome_STIG_Computer_v2r8'
33
{
4-
5-
Import-DSCResource -ModuleName 'GPRegistryPolicyDsc' -ModuleVersion '1.2.0'
4+
Import-DscResource -ModuleName 'PSDesiredStateConfiguration'
5+
Import-DSCResource -ModuleName 'GPRegistryPolicyDsc' -ModuleVersion '1.2.0'
66
Import-DSCResource -ModuleName 'AuditPolicyDSC' -ModuleVersion '1.4.0.0'
77
Import-DSCResource -ModuleName 'SecurityPolicyDSC' -ModuleVersion '2.10.0.0'
88

9-
Node DoD_Google_Chrome_STIG_Computer_v2r8
9+
Node 'DoD_Google_Chrome_STIG_Computer_v2r8'
1010
{
1111
RegistryPolicyFile 'Registry(POL): HKLM:\Software\Policies\Google\Chrome\RemoteAccessHostFirewallTraversal'
1212
{

‎microsoft/dod_stig_january_2023/DoD_InfoPath_2013_STIG_Computer_v1r5.ps1 renamed to ‎STIG/dod_stig_january_2023/DoD_InfoPath_2013_STIG_Computer_v1r5.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11

2-
Configuration DoD_InfoPath_2013_STIG_Computer_v1r5
2+
Configuration 'DoD_InfoPath_2013_STIG_Computer_v1r5'
33
{
4-
4+
Import-DscResource -ModuleName 'PSDesiredStateConfiguration'
55
Import-DSCResource -ModuleName 'GPRegistryPolicyDsc' -ModuleVersion '1.2.0'
66
Import-DSCResource -ModuleName 'AuditPolicyDSC' -ModuleVersion '1.4.0.0'
77
Import-DSCResource -ModuleName 'SecurityPolicyDSC' -ModuleVersion '2.10.0.0'
88

9-
Node DoD_InfoPath_2013_STIG_Computer_v1r5
9+
Node 'DoD_InfoPath_2013_STIG_Computer_v1r5'
1010
{
1111
RegistryPolicyFile 'Registry(POL): HKLM:\software\policies\microsoft\office\15.0\infopath\security\aptca_allowlist'
1212
{

0 commit comments

Comments
 (0)