diff --git a/DISCLAIMER b/DISCLAIMER index e6182adf16a..683826fd0cc 100644 --- a/DISCLAIMER +++ b/DISCLAIMER @@ -5,7 +5,7 @@ serving as the upstream development environment for Red Hat Product STIGS. As a result of the upstream/downstream relationship between the SCAP Security Guide project and the official DISA FSO STIG baseline, users should expect variance between SSG and DISA FSO content. For official DISA FSO STIG content, -refer to http://iase.disa.mil/stigs/Pages/index.aspx. +refer to https://public.cyber.mil/stigs/. While this profile is packaged by Red Hat as part of the SCAP Security Guide package, please note that commercial support of this SCAP content is NOT diff --git a/build-scripts/verify_references.py b/build-scripts/verify_references.py index 4bbdbc22120..69b3e2d1f74 100755 --- a/build-scripts/verify_references.py +++ b/build-scripts/verify_references.py @@ -43,7 +43,7 @@ # we use these strings to look for references within the XCCDF rules nist_ref_href = "http://nvlpubs.nist.gov/nistpubs/SpecialPublications/NIST.SP.800-53r4.pdf" -disa_ref_href = "http://iase.disa.mil/stigs/cci/Pages/index.aspx" +disa_ref_href = "https://public.cyber.mil/stigs/cci/" # default exit value - success exit_value = 0 diff --git a/chromium/profiles/stig.profile b/chromium/profiles/stig.profile index bd98e52491a..71355a5546b 100644 --- a/chromium/profiles/stig.profile +++ b/chromium/profiles/stig.profile @@ -8,7 +8,7 @@ description: |- As a result of the upstream/downstream relationship between the SCAP Security Guide project and the official DISA FSO STIG baseline, users should expect variance between SSG and DISA FSO content. - For official DISA FSO STIG content, refer to http://iase.disa.mil/stigs/app-security/browser-guidance/Pages/index.aspx. + For official DISA FSO STIG content, refer to https://public.cyber.mil/stigs/downloads/?_dl_facet_stigs=app-security%2Cbrowser-guidance. While this profile is packaged by Red Hat as part of the SCAP Security Guide package, please note that commercial support of this SCAP content is NOT available. This profile is provided as example diff --git a/docs/man_page_template.jinja b/docs/man_page_template.jinja index 4b6c5ea5309..08959bf5e60 100644 --- a/docs/man_page_template.jinja +++ b/docs/man_page_template.jinja @@ -145,11 +145,12 @@ process, the content of the Red Hat Enterprise Linux 6 STIG should mirrot the SC content with only minor divergence as updates from multiple sources work through the concensus process." -The DoD STIG for Red Hat Enterprise Linux 6 was released June 2013. Currently, the -DoD Red Hat Enterprise Linux 6 STIG contains only XCCDF content and is available online: -http://iase.disa.mil/stigs/os/unix-linux/Pages/red-hat.aspx +The DoD STIG for Red Hat Enterprise Linux 7, revision V2R3, was released in April 2019 +Currently, the DoD Red Hat Enterprise Linux 7 STIG contains only XCCDF content and is +available online: +https://public.cyber.mil/stigs/downloads/?_dl_facet_stigs=operating-systems%2Cunix-linux -Content published against the iase.disa.mil website is authoritative +Content published against the public.cyber.mil website is authoritative STIG content. The SCAP Security Guide project, as noted in the STIG overview, is considered upstream content. Unlike DISA FSO, the SCAP Security Guide project does publish OVAL automation content. Individual programs and C&A evaluators diff --git a/docs/manual/user_guide.adoc b/docs/manual/user_guide.adoc index f51f394e7c8..99201a48197 100644 --- a/docs/manual/user_guide.adoc +++ b/docs/manual/user_guide.adoc @@ -42,10 +42,11 @@ image::logos-400x400-disa-300x300.jpg[align="left"] The http://www.disa.mil/About/Our-Organization-Structure/OD-Field-Office/Field-Security-Operations[U.S. Defense Information Systems Agency, Field Security Operations] (DISA FSO) authors hardening guidance known as Security Technical -Implementation Guides (http://iase.disa.mil/stigs/index.html[STIGs]). These +Implementation Guides (https://public.cyber.mil/stigs/[STIGs]). These documents, used throughout the U.S. military to harden systems, establish formal security compliance baselines. The ComplianceAsCode project serves as -the usptream development source for http://iase.disa.mil/stigs/os/unix-linux/Pages/red-hat.aspx[Red Hat STIG content] +the usptream development source for +https://public.cyber.mil/stigs/downloads/?_dl_facet_stigs=operating-systems%2Cunix-linux[Red Hat STIG content] and helps DISA FSO move towards their business objective of utilizing SCAP-based formats to automate security compliance across U.S. military organizations. diff --git a/firefox/profiles/stig.profile b/firefox/profiles/stig.profile index 12fb86a7c76..eb3e2c3d304 100644 --- a/firefox/profiles/stig.profile +++ b/firefox/profiles/stig.profile @@ -8,7 +8,7 @@ description: |- As a result of the upstream/downstream relationship between the SCAP Security Guide project and the official DISA FSO STIG baseline, users should expect variance between SSG and DISA FSO content. - For official DISA FSO STIG content, refer to http://iase.disa.mil/stigs/app-security/browser-guidance/Pages/index.aspx. + For official DISA FSO STIG content, refer to https://public.cyber.mil/stigs/downloads/?_dl_facet_stigs=app-security%2Cbrowser-guidance. While this profile is packaged by Red Hat as part of the SCAP Security Guide package, please note that commercial support of this SCAP content is NOT available. This profile is provided as example diff --git a/shared/transforms/shared_constants.xslt b/shared/transforms/shared_constants.xslt index bde8083ba07..266884f9424 100644 --- a/shared/transforms/shared_constants.xslt +++ b/shared/transforms/shared_constants.xslt @@ -11,15 +11,15 @@ https://www.fbi.gov/file-repository/cjis-security-policy-v5_5_20160601-2-1.pdf http://www.cnss.gov/Assets/pdf/CNSSI-1253.pdf not_officially_available -http://iase.disa.mil/stigs/app-security/app-servers/Pages/general.aspx -http://iase.disa.mil/stigs/cci/Pages/index.aspx -http://iase.disa.mil/stigs/os/general/Pages/index.aspx -http://iase.disa.mil/stigs/app-security/app-security/Pages/index.aspx -http://iase.disa.mil/stigs/app-security/app-servers/Pages/index.aspx -http://iase.disa.mil/stigs/app-security/browser-guidance/Pages/index.aspx -http://iase.disa.mil/stigs/app-security/web-servers/Pages/index.aspx -http://iase.disa.mil/stigs/os/mainframe/Pages/index.aspx -http://iase.disa.mil/stigs/os/unix-linux/Pages/index.aspx +https://public.cyber.mil/stigs/downloads/?_dl_facet_stigs=application-servers +https://public.cyber.mil/stigs/cci/ +https://public.cyber.mil/stigs/downloads/?_dl_facet_stigs=operating-systems%2Cgeneral-purpose-os +https://public.cyber.mil/stigs/downloads/?_dl_facet_stigs=app-security%2Capp-security-dev +https://public.cyber.mil/stigs/downloads/?_dl_facet_stigs=app-security%2Capplication-servers +https://public.cyber.mil/stigs/downloads/?_dl_facet_stigs=app-security%2Cbrowser-guidance +https://public.cyber.mil/stigs/downloads/?_dl_facet_stigs=app-security%2Cweb-servers +https://public.cyber.mil/stigs/downloads/?_dl_facet_stigs=operating-systems%2Cmainframe +https://public.cyber.mil/stigs/downloads/?_dl_facet_stigs=operating-systems%2Cunix-linux https://iase.disa.mil/stigs/os/virtualization/Pages/index.aspx https://www.gpo.gov/fdsys/pkg/CFR-2007-title45-vol1/pdf/CFR-2007-title45-vol1-chapA-subchapC.pdf https://www.iso.org/standard/54534.html diff --git a/shared/transforms/shared_xccdf2html.xslt b/shared/transforms/shared_xccdf2html.xslt index 18a72434aec..a698ae110ab 100644 --- a/shared/transforms/shared_xccdf2html.xslt +++ b/shared/transforms/shared_xccdf2html.xslt @@ -553,6 +553,9 @@ + + DISA CCI- + DISA CCI- @@ -661,6 +664,9 @@ + + DISA CCI- + DISA CCI- diff --git a/ssg/constants.py b/ssg/constants.py index ad139da8fb8..c4e8e9d5be8 100644 --- a/ssg/constants.py +++ b/ssg/constants.py @@ -31,10 +31,9 @@ puppet_system = "urn:xccdf:fix:script:puppet" anaconda_system = "urn:redhat:anaconda:pre" cce_uri = "https://nvd.nist.gov/cce/index.cfm" -stig_ns = "http://iase.disa.mil/stigs/Pages/stig-viewing-guidance.aspx" -stig_refs = 'http://iase.disa.mil/stigs/' -disa_cciuri = "http://iase.disa.mil/stigs/cci/Pages/index.aspx" -disa_srguri = "http://iase.disa.mil/stigs/srgs/Pages/index.aspx" +stig_ns = "https://public.cyber.mil/stigs/srg-stig-tools/" +stig_refs = 'https://public.cyber.mil/stigs/' +disa_cciuri = "https://public.cyber.mil/stigs/cci/" ssg_version_uri = \ "https://github.com/OpenSCAP/scap-security-guide/releases/latest" OSCAP_VENDOR = "org.ssgproject" diff --git a/utils/create-stig-overlay.py b/utils/create-stig-overlay.py index ab0710078bd..2ce79a9b1cc 100755 --- a/utils/create-stig-overlay.py +++ b/utils/create-stig-overlay.py @@ -13,9 +13,9 @@ owner = "disastig" -stig_ns = ["http://iase.disa.mil/stigs/os/unix-linux/Pages/index.aspx", - "http://iase.disa.mil/stigs/os/general/Pages/index.aspx", - "http://iase.disa.mil/stigs/app-security/app-servers/Pages/index.aspx"] +stig_ns = ["https://public.cyber.mil/stigs/downloads/?_dl_facet_stigs=operating-systems%2Cunix-linux", + "https://public.cyber.mil/stigs/downloads/?_dl_facet_stigs=operating-systems%2Cgeneral-purpose-os", + "https://public.cyber.mil/stigs/downloads/?_dl_facet_stigs=app-security%2Capplication-servers"] xccdf_ns = "http://checklists.nist.gov/xccdf/1.1" dc_ns = "http://purl.org/dc/elements/1.1/" outfile = "stig_overlay.xml"