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.

Sign up for GitHub

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

Jump to bottom

Updated Convert and Testing code to address TABs #867

Merged
merged 7 commits into from
Apr 29, 2021
Merged

Updated Convert and Testing code to address TABs #867

merged 7 commits into from
Apr 29, 2021

Conversation

hinderjd
Copy link
Collaborator

@hinderjd hinderjd commented Mar 25, 2021 •
edited
Loading

Pull Request (PR) description:
Remove TAB's during conversion from DISA STIG to PowerStig format.
Ignore Archive folder during HQRM testing.

This Pull Request (PR) fixes the following issues:

  1. Manual changes to DISA files have been performed in the past to remove TAB's, this change automates the process.
  2. Ignore Archive folder as the original DISA file will retain TAB's and fail testing.

This fixes #
#864
Task list:

  • Change details added to Unreleased section of CHANGELOG.md (Not required for Convert modules)?
  • [X ] Added/updated documentation, comment-based help and descriptions where appropriate?
  • Examples appropriately updated?
  • New/changed code adheres to Style Guidelines?
  • Unit and (optional) Integration tests created/updated where possible?

This change is Reviewable

@hinderjd hinderjd added the enhancement New feature or request label Mar 25, 2021
@hinderjd hinderjd added this to the 4.9.0 milestone Mar 25, 2021
@hinderjd hinderjd self-assigned this Mar 25, 2021
@hinderjd hinderjd changed the base branch from dev to 4.9.0 March 26, 2021 00:23
@hinderjd hinderjd linked an issue Mar 26, 2021 that may be closed by this pull request
Convert TABS to SPACES during STIG conversion. #864
Closed
erjenkin
erjenkin approved these changes Mar 26, 2021
View reviewed changes
build.yaml Outdated Show resolved Hide resolved
@bcwilhite bcwilhite merged commit b4515ba into 4.9.0 Apr 29, 2021
@hinderjd hinderjd deleted the Hinderjd#864 branch April 30, 2021 05:31
bcwilhite added a commit that referenced this pull request Jun 1, 2021
@bcwilhite @hinderjd
@japatton @addavenp1 @erjenkin
4.9.0 PR to Dev for Release (#911)
b6c4278 
* updated AccessControlList to an array (#869)

* Remove CodeCov due to lack of use

* Updated Convert and Testing code to address TABs (#867)

* Updated Convert and Testing code to address TABs

* Updated changelog

* Testing SQL 2016 Stig convert -  no manual actions

* Corrected paths in Build.yaml

* Added missing comment about for ExcludeModuleFile

* Fixes comments with space after #

Co-authored-by: Brian Wilhite <bcwilhite@live.com>

* Parse Chrome STIG 2.3 and fix tab issue in desc

* Updated Changelog.md

* Updated comment about TAB replace in code

* Updated Hard coded rule

* Add SQL Server 2016 STIG Vulnerability ID's. (#874)

* ConvertFactory - Added SQLServerDscRule

* SQLServerDscRule : Added rule, convert, and method files.

* LoadFactory : Added SQLServerDscRule

* SQLServerSchema : Added SQLServerConfiguration resource script

* SQLServerConfiguration : Added resource script

* PowerStig.Convert : Added SQLServerDsc convert rule

* Data.ps1 : Added SQLServerDscRule

* SQLServerConfiguration : Made changes to follow style guidelines

* Added SQLServerDscRule unit testing

* Added remaining SQLServerDsc Configurations to unit test

* SQLServerDscRule:: Added exceptionhelp notes

* SQLServerDscRule.tests: Reworked pester tests for v4.

* SQlServerDScRule.tests: Removed commented out code.

* SQLServerDscRule.tests: PowerShell style guide fix

* SQLServerDscRule.Integration: Added integration tests

* Changelog.md: Updated changelog

* SqlServerDscRule: Removed upper case letters for guideline compliance

* SQLServerDscRule.Integration: Added last empty line

* Methods: Added last empty line

* Loadfactory: Removed tab

* SQLServerDscRule.Convert: Added last empty line

* SQLServerDscRule: Fixed upper case style

* SQLServerDSCRule: Resolved class typo

* Style guidelines fix and rename class to SQLServerConfigurationRule

* SqlServer XML: Updated XML with new ID's

* Fixed V-213975 to match STIG; Recreated XML for SQL 2016 2VR2 / 2VR1

* Converted SQL 2012 XML

* Updated SQLServerConfiguration rule pester tests

* Methods.ps1:: Code consolidation for checkcontent.

* Data.ps1 :: Fixed spacing

* Fixed style guideline issues :: Updated unit tests for SqlServerConfigurationRule

* Rename SQLServerConfigurationRule.tests.ps1 to SqlServerConfigurationRule.tests.ps1

* Rename SQLServerConfigurationRule.Integration.tests.ps1 to SqlServerConfigurationRule.Integration.tests.ps1

* SqlServerConfigurationRule:: Updated unit pester test formatting.

* style guideline fixes.

Co-authored-by: Brian Wilhite <bcwilhite@live.com>

* Update PowerSTIG to successfully parse/apply Microsoft IIS 8.5 SITE/SERVER STIG - Ver 2, Rel 2 (#886)

* updated to add support for iis 8.5 v2r2

* updated to add IIS site/server 8.5

* Update PowerSTIG to successfully parse/apply Red Hat Enterprise Linux 7 STIG - Ver 2, Rel 2 (#892)

* added support for RHEL7 V3R3

* added new line to archive STIG xml

* Update PowerSTIG to successfully parse/apply Microsoft Windows Server 2019 STIG - Ver 2, Rel 2 (#895)

* added Windows 2019 DC / MS V2R2

* removed old processed 2019 STIGs

* added support for 2016 V2R2 (#899)

* Update PowerSTIG to successfully parse/apply Microsoft Windows 2012 R2 MS STIG - Ver 3, Rel 2 (#901)

* added support for 2012 MS V3R2

* removed old 2012 MS 2.19 processed STIG

* updated to add support for sql 2016 instance v2r3 (#906)

Co-authored-by: Brian Wilhite <bcwilhite@live.com>

* Update PowerSTIG to successfully parse/apply Microsoft Windows 2012 Server Domain Name System STIG - Ver 2, Rel 2 #896 (#898)

* Parse Windows DNS 2012 ver 2.2

* removed 1.15 2012 DNS

Co-authored-by: Brian Wilhite <bcwilhite@live.com>

* Update PowerSTIG to successfully parse/apply Microsoft IIS 10.0 SITE/SERVER STIG - Ver 2, Rel 2 (#907)

* add support for IIS 10 V2R2

* updated org settings

* removed N-2 IIS 10 1.2 processed STIGs

Co-authored-by: Brian Wilhite <bcwilhite@live.com>

* added support for 2012 DC V3R2 (#908)

* Update PowerSTIG to successfully parse/apply Windows 10 STIG V2 R2 (#894)

* updated to add windows 10 v2r2 support

* update based on feedback

Co-authored-by: Brian Wilhite <bcwilhite@live.com>

* Update PowerSTIG to parse/apply Microsoft Office 365 ProPlus STIG - Ver 2, Rel 2 (#889)

* updated to inclue proplus v2r2

* updated org settings

Co-authored-by: Brian Wilhite <bcwilhite@live.com>

* updated changelog and filehash for release

* updated readme.md with addavenp1 as contributor

Co-authored-by: hinderjd <hinderjd@gmail.com>
Co-authored-by: Jason Patton <46757047+japatton@users.noreply.github.com>
Co-authored-by: addavenp1 <82848693+addavenp1@users.noreply.github.com>
Co-authored-by: Eric Jenkins <erjenkin@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bcwilhite bcwilhite bcwilhite approved these changes

@erjenkin erjenkin erjenkin approved these changes

Assignees

@hinderjd hinderjd

Labels
enhancement New feature or request
Projects
None yet
Milestone
4.9.0
Development

Successfully merging this pull request may close these issues.

Convert TABS to SPACES during STIG conversion.
3 participants
@hinderjd @bcwilhite @erjenkin