Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated Convert and Testing code to address TABs #867

Merged
merged 7 commits into from
Apr 29, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## [Unreleased]

* Update PowerSTIG to remove old rule Ids in Hard Coded Framework: [#864](https://github.com/microsoft/PowerStig/issues/864)
* Fixed: PowerShell v7 Fix: AccessControlDsc/RegistryAccessEntry & NTFSAccessEntry "AccessControlList" should be an Array

## [4.8.0] - 2021-03-01
Expand Down
3 changes: 2 additions & 1 deletion build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,9 @@ DscTest:
Tag:
ExcludeSourceFile:
- output
- StigData/Archive # added to ignore orginal DISA STIG files duiring HQRM test due to TAB's causing test failure
ExcludeModuleFile:

- StigData/Archive # added to ignore orginal DISA STIG files duiring HQRM test due to TAB's causing test failure
Resolve-Dependency:
Gallery: 'PSGallery'
AllowPrerelease: false
Expand Down
3 changes: 3 additions & 0 deletions source/Module/Common/Functions.XccdfXml.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,9 @@ function Get-StigRuleList
{
foreach ($stigRule in $StigGroupList)
{
#Replace TAB's from in Rules to 3 spaces
$stigRule.rule.Check.('check-content') = $stigRule.rule.Check.('check-content') -replace("`t"," ")

# This is to address STIG Rule V-18395 that has multiple rules that are exactly the same under that rule ID.
if ($stigRule.Rule.Count -gt 1)
{
Expand Down

Large diffs are not rendered by default.

Loading