Blame SOURCES/scap-security-guide-0.1.55-better_align_anssi_ks-PR_6589.patch

618a7c
From fad3761eff3a3857bb4201ac90642dfc37217a2a Mon Sep 17 00:00:00 2001
618a7c
From: Watson Sato <wsato@redhat.com>
618a7c
Date: Tue, 2 Feb 2021 09:41:26 +0100
618a7c
Subject: [PATCH 1/4] Remove extra configurations from ANSSI minimal ks
618a7c
618a7c
- No need to restrict IPv6
618a7c
- Root login is not restricted
618a7c
- Simplify boot command
618a7c
- Simplify paritioning
618a7c
- No requirement to enforce use of SELinux
618a7c
---
618a7c
 .../ssg-rhel7-anssi_nt28_minimal-ks.cfg       | 46 ++--------------
618a7c
 .../ssg-rhel8-anssi_bp28_minimal-ks.cfg       | 53 +------------------
618a7c
 2 files changed, 5 insertions(+), 94 deletions(-)
618a7c
618a7c
diff --git a/rhel7/kickstart/ssg-rhel7-anssi_nt28_minimal-ks.cfg b/rhel7/kickstart/ssg-rhel7-anssi_nt28_minimal-ks.cfg
618a7c
index 4160ac094c..9bc4eae44f 100644
618a7c
--- a/rhel7/kickstart/ssg-rhel7-anssi_nt28_minimal-ks.cfg
618a7c
+++ b/rhel7/kickstart/ssg-rhel7-anssi_nt28_minimal-ks.cfg
618a7c
@@ -54,7 +54,7 @@ keyboard us
618a7c
 #       "--bootproto=static" must be used. For example:
618a7c
 # network --bootproto=static --ip=10.0.2.15 --netmask=255.255.255.0 --gateway=10.0.2.254 --nameserver 192.168.2.1,192.168.3.1
618a7c
 #
618a7c
-network --onboot yes --device eth0 --bootproto dhcp --noipv6
618a7c
+network --onboot yes --device eth0 --bootproto dhcp
618a7c
 
618a7c
 # Set the system's root password (required)
618a7c
 # Plaintext password is: server
618a7c
@@ -62,26 +62,12 @@ network --onboot yes --device eth0 --bootproto dhcp --noipv6
618a7c
 # encrypted password form for different plaintext password
618a7c
 rootpw --iscrypted $6$/0RYeeRdK70ynvYz$jH2ZN/80HM6DjndHMxfUF9KIibwipitvizzXDH1zW.fTjyD3RD3tkNdNUaND18B/XqfAUW3vy1uebkBybCuIm0
618a7c
 
618a7c
-# The selected profile will restrict root login
618a7c
-# Add a user that can login and escalate privileges
618a7c
-# Plaintext password is: admin123
618a7c
-user --name=admin --groups=wheel --password=$6$Ga6ZnIlytrWpuCzO$q0LqT1USHpahzUafQM9jyHCY9BiE5/ahXLNWUMiVQnFGblu0WWGZ1e6icTaCGO4GNgZNtspp1Let/qpM7FMVB0 --iscrypted
618a7c
-
618a7c
-# Configure firewall settings for the system (optional)
618a7c
-# --enabled	reject incoming connections that are not in response to outbound requests
618a7c
-# --ssh		allow sshd service through the firewall
618a7c
-firewall --enabled --ssh
618a7c
-
618a7c
 # Set up the authentication options for the system (required)
618a7c
 # --enableshadow	enable shadowed passwords by default
618a7c
 # --passalgo		hash / crypt algorithm for new passwords
618a7c
 # See the manual page for authconfig for a complete list of possible options.
618a7c
 authconfig --enableshadow --passalgo=sha512
618a7c
 
618a7c
-# State of SELinux on the installed system (optional)
618a7c
-# Defaults to enforcing
618a7c
-selinux --enforcing
618a7c
-
618a7c
 # Set the system time zone (required)
618a7c
 timezone --utc America/New_York
618a7c
 
618a7c
@@ -89,7 +75,7 @@ timezone --utc America/New_York
618a7c
 # Plaintext password is: password
618a7c
 # Refer to e.g. https://pykickstart.readthedocs.io/en/latest/commands.html#rootpw to see how to create
618a7c
 # encrypted password form for different plaintext password
618a7c
-bootloader --location=mbr --append="crashkernel=auto rhgb quiet" --password=$6$zCPaBARiNlBYUAS7$40phthWpqvaPVz3QUeIK6n5qoazJDJD5Nlc9OKy5SyYoX9Rt4jFaLjzqJCwpgR4RVAEFSADsqQot0WKs5qNto0
618a7c
+bootloader --location=mbr
618a7c
 
618a7c
 # Initialize (format) all disks (optional)
618a7c
 zerombr
618a7c
@@ -103,33 +89,7 @@ zerombr
618a7c
 clearpart --linux --initlabel
618a7c
 
618a7c
 # Create primary system partitions (required for installs)
618a7c
-part /boot --fstype=xfs --size=512
618a7c
-part pv.01 --grow --size=1
618a7c
-
618a7c
-# Create a Logical Volume Management (LVM) group (optional)
618a7c
-volgroup VolGroup --pesize=4096 pv.01
618a7c
-
618a7c
-# Create particular logical volumes (optional)
618a7c
-logvol / --fstype=xfs --name=LogVol06 --vgname=VolGroup --size=4216 --grow
618a7c
-# Ensure /usr Located On Separate Partition
618a7c
-logvol /usr --fstype=xfs --name=LogVol08 --vgname=VolGroup --size=5000 --fsoptions="nodev"
618a7c
-# Ensure /opt Located On Separate Partition
618a7c
-logvol /opt --fstype=xfs --name=LogVol09 --vgname=VolGroup --size=1024 --fsoptions="nodev,nosuid"
618a7c
-# Ensure /srv Located On Separate Partition
618a7c
-logvol /srv --fstype=xfs --name=LogVol10 --vgname=VolGroup --size=1024 --fsoptions="nodev,nosuid"
618a7c
-# Ensure /home Located On Separate Partition
618a7c
-logvol /home --fstype=xfs --name=LogVol02 --vgname=VolGroup --size=1024 --fsoptions="nodev"
618a7c
-# Ensure /tmp Located On Separate Partition
618a7c
-logvol /tmp --fstype=xfs --name=LogVol01 --vgname=VolGroup --size=1024 --fsoptions="nodev,noexec,nosuid"
618a7c
-# Ensure /var/tmp Located On Separate Partition
618a7c
-logvol /var/tmp --fstype=xfs --name=LogVol7 --vgname=VolGroup --size=1024 --fsoptions="nodev,nosuid,noexec"
618a7c
-# Ensure /var Located On Separate Partition
618a7c
-logvol /var --fstype=xfs --name=LogVol03 --vgname=VolGroup --size=2048 --fsoptions="nodev"
618a7c
-# Ensure /var/log Located On Separate Partition
618a7c
-logvol /var/log --fstype=xfs --name=LogVol04 --vgname=VolGroup --size=1024 --fsoptions="nodev"
618a7c
-# Ensure /var/log/audit Located On Separate Partition
618a7c
-logvol /var/log/audit --fstype=xfs --name=LogVol05 --vgname=VolGroup --size=512 --fsoptions="nodev"
618a7c
-logvol swap --name=lv_swap --vgname=VolGroup --size=2016
618a7c
+autopart
618a7c
 
618a7c
 # Despite the ID referencing NT-28, the profile is aligned to BP-028
618a7c
 %addon org_fedora_oscap
618a7c
diff --git a/rhel8/kickstart/ssg-rhel8-anssi_bp28_minimal-ks.cfg b/rhel8/kickstart/ssg-rhel8-anssi_bp28_minimal-ks.cfg
618a7c
index 7fc4945518..1d62b55d55 100644
618a7c
--- a/rhel8/kickstart/ssg-rhel8-anssi_bp28_minimal-ks.cfg
618a7c
+++ b/rhel8/kickstart/ssg-rhel8-anssi_bp28_minimal-ks.cfg
618a7c
@@ -6,9 +6,6 @@
618a7c
 # https://pykickstart.readthedocs.io/en/latest/
618a7c
 # http://usgcb.nist.gov/usgcb/content/configuration/workstation-ks.cfg
618a7c
 
618a7c
-# Install a fresh new system (optional)
618a7c
-install
618a7c
-
618a7c
 # Specify installation method to use for installation
618a7c
 # To use a different one comment out the 'url' one below, update
618a7c
 # the selected choice with proper options & un-comment it
618a7c
@@ -61,26 +58,6 @@ network --onboot yes --bootproto dhcp
618a7c
 # to see how to create encrypted password form for different plaintext password
618a7c
 rootpw --iscrypted $6$0WWGZ1e6icT$1KiHZK.Nzp3HQerfiy8Ic3pOeCWeIzA.zkQ7mkvYT3bNC5UeGK2ceE5b6TkSg4D/kiSudkT04QlSKknsrNE220
618a7c
 
618a7c
-# The selected profile will restrict root login
618a7c
-# Add a user that can login and escalate privileges
618a7c
-# Plaintext password is: admin123
618a7c
-user --name=admin --groups=wheel --password=$6$Ga6ZnIlytrWpuCzO$q0LqT1USHpahzUafQM9jyHCY9BiE5/ahXLNWUMiVQnFGblu0WWGZ1e6icTaCGO4GNgZNtspp1Let/qpM7FMVB0 --iscrypted
618a7c
-
618a7c
-# Configure firewall settings for the system (optional)
618a7c
-# --enabled	reject incoming connections that are not in response to outbound requests
618a7c
-# --ssh		allow sshd service through the firewall
618a7c
-firewall --enabled --ssh
618a7c
-
618a7c
-# Set up the authentication options for the system (required)
618a7c
-# --enableshadow	enable shadowed passwords by default
618a7c
-# --passalgo		hash / crypt algorithm for new passwords
618a7c
-# See the manual page for authconfig for a complete list of possible options.
618a7c
-authconfig --enableshadow --passalgo=sha512
618a7c
-
618a7c
-# State of SELinux on the installed system (optional)
618a7c
-# Defaults to enforcing
618a7c
-selinux --enforcing
618a7c
-
618a7c
 # Set the system time zone (required)
618a7c
 timezone --utc America/New_York
618a7c
 
618a7c
@@ -89,7 +66,7 @@ timezone --utc America/New_York
618a7c
 # Refer to e.g.
618a7c
 #   https://pykickstart.readthedocs.io/en/latest/commands.html#rootpw
618a7c
 # to see how to create encrypted password form for different plaintext password
618a7c
-bootloader --location=mbr --append="audit=1 audit_backlog_limit=8192 slub_debug=P page_poison=1 vsyscall=none" --password=$6$zCPaBARiNlBYUAS7$40phthWpqvaPVz3QUeIK6n5qoazJDJD5Nlc9OKy5SyYoX9Rt4jFaLjzqJCwpgR4RVAEFSADsqQot0WKs5qNto0
618a7c
+bootloader --location=mbr
618a7c
 
618a7c
 # Initialize (format) all disks (optional)
618a7c
 zerombr
618a7c
@@ -103,33 +80,7 @@ zerombr
618a7c
 clearpart --linux --initlabel
618a7c
 
618a7c
 # Create primary system partitions (required for installs)
618a7c
-part /boot --fstype=xfs --size=512
618a7c
-part pv.01 --grow --size=1
618a7c
-
618a7c
-# Create a Logical Volume Management (LVM) group (optional)
618a7c
-volgroup VolGroup --pesize=4096 pv.01
618a7c
-
618a7c
-# Create particular logical volumes (optional)
618a7c
-logvol / --fstype=xfs --name=LogVol06 --vgname=VolGroup --size=3192 --grow
618a7c
-# Ensure /usr Located On Separate Partition
618a7c
-logvol /usr --fstype=xfs --name=LogVol08 --vgname=VolGroup --size=5000 --fsoptions="nodev"
618a7c
-# Ensure /opt Located On Separate Partition
618a7c
-logvol /opt --fstype=xfs --name=LogVol09 --vgname=VolGroup --size=1024 --fsoptions="nodev,nosuid"
618a7c
-# Ensure /srv Located On Separate Partition
618a7c
-logvol /srv --fstype=xfs --name=LogVol10 --vgname=VolGroup --size=1024 --fsoptions="nodev,nosuid"
618a7c
-# Ensure /home Located On Separate Partition
618a7c
-logvol /home --fstype=xfs --name=home --vgname=VolGroup --size=1024 --fsoptions="nodev"
618a7c
-# Ensure /tmp Located On Separate Partition
618a7c
-logvol /tmp --fstype=xfs --name=tmp --vgname=VolGroup --size=1024 --fsoptions="nodev,nosuid,noexec"
618a7c
-# Ensure /var/tmp Located On Separate Partition
618a7c
-logvol /var/tmp --fstype=xfs --name=vartmp --vgname=VolGroup --size=1024 --fsoptions="nodev,nosuid,noexec"
618a7c
-# Ensure /var Located On Separate Partition
618a7c
-logvol /var --fstype=xfs --name=var --vgname=VolGroup --size=3072 --fsoptions="nodev"
618a7c
-# Ensure /var/log Located On Separate Partition
618a7c
-logvol /var/log --fstype=xfs --name=log --vgname=VolGroup --size=1024 --fsoptions="nodev,nosuid,noexec"
618a7c
-# Ensure /var/log/audit Located On Separate Partition
618a7c
-logvol /var/log/audit --fstype=xfs --name=audit --vgname=VolGroup --size=512 --fsoptions="nodev,nosuid,noexec"
618a7c
-logvol swap --name=swap --vgname=VolGroup --size=2016
618a7c
+autopart
618a7c
 
618a7c
 # The OpenSCAP installer add-on is used to apply SCAP (Security Content Automation Protocol)
618a7c
 # content - security policies - on the installed system.This add-on has been enabled by default
618a7c
618a7c
From 3884ae59b59d69c928acb1d3d52a3f68834aa709 Mon Sep 17 00:00:00 2001
618a7c
From: Watson Sato <wsato@redhat.com>
618a7c
Date: Tue, 2 Feb 2021 09:53:20 +0100
618a7c
Subject: [PATCH 2/4] Align ANSSI kickstarts with intermediary level
618a7c
618a7c
- Simplify boot command
618a7c
- No requirement to enforce use of SELinux
618a7c
---
618a7c
 .../ssg-rhel7-anssi_nt28_intermediary-ks.cfg    |  6 +-----
618a7c
 .../ssg-rhel8-anssi_bp28_intermediary-ks.cfg    | 17 ++---------------
618a7c
 2 files changed, 3 insertions(+), 20 deletions(-)
618a7c
618a7c
diff --git a/rhel7/kickstart/ssg-rhel7-anssi_nt28_intermediary-ks.cfg b/rhel7/kickstart/ssg-rhel7-anssi_nt28_intermediary-ks.cfg
618a7c
index ab654410b5..20c4c59a78 100644
618a7c
--- a/rhel7/kickstart/ssg-rhel7-anssi_nt28_intermediary-ks.cfg
618a7c
+++ b/rhel7/kickstart/ssg-rhel7-anssi_nt28_intermediary-ks.cfg
618a7c
@@ -78,10 +78,6 @@ firewall --enabled --ssh
618a7c
 # See the manual page for authconfig for a complete list of possible options.
618a7c
 authconfig --enableshadow --passalgo=sha512
618a7c
 
618a7c
-# State of SELinux on the installed system (optional)
618a7c
-# Defaults to enforcing
618a7c
-selinux --enforcing
618a7c
-
618a7c
 # Set the system time zone (required)
618a7c
 timezone --utc America/New_York
618a7c
 
618a7c
@@ -89,7 +85,7 @@ timezone --utc America/New_York
618a7c
 # Plaintext password is: password
618a7c
 # Refer to e.g. https://pykickstart.readthedocs.io/en/latest/commands.html#rootpw to see how to create
618a7c
 # encrypted password form for different plaintext password
618a7c
-bootloader --location=mbr --append="crashkernel=auto rhgb quiet" --password=$6$zCPaBARiNlBYUAS7$40phthWpqvaPVz3QUeIK6n5qoazJDJD5Nlc9OKy5SyYoX9Rt4jFaLjzqJCwpgR4RVAEFSADsqQot0WKs5qNto0
618a7c
+bootloader --location=mbr --password=$6$zCPaBARiNlBYUAS7$40phthWpqvaPVz3QUeIK6n5qoazJDJD5Nlc9OKy5SyYoX9Rt4jFaLjzqJCwpgR4RVAEFSADsqQot0WKs5qNto0
618a7c
 
618a7c
 # Initialize (format) all disks (optional)
618a7c
 zerombr
618a7c
diff --git a/rhel8/kickstart/ssg-rhel8-anssi_bp28_intermediary-ks.cfg b/rhel8/kickstart/ssg-rhel8-anssi_bp28_intermediary-ks.cfg
618a7c
index 981d291847..3a241b06f4 100644
618a7c
--- a/rhel8/kickstart/ssg-rhel8-anssi_bp28_intermediary-ks.cfg
618a7c
+++ b/rhel8/kickstart/ssg-rhel8-anssi_bp28_intermediary-ks.cfg
618a7c
@@ -6,9 +6,6 @@
618a7c
 # https://pykickstart.readthedocs.io/en/latest/
618a7c
 # http://usgcb.nist.gov/usgcb/content/configuration/workstation-ks.cfg
618a7c
 
618a7c
-# Install a fresh new system (optional)
618a7c
-install
618a7c
-
618a7c
 # Specify installation method to use for installation
618a7c
 # To use a different one comment out the 'url' one below, update
618a7c
 # the selected choice with proper options & un-comment it
618a7c
@@ -52,7 +49,7 @@ keyboard us
618a7c
 #       "--bootproto=static" must be used. For example:
618a7c
 # network --bootproto=static --ip=10.0.2.15 --netmask=255.255.255.0 --gateway=10.0.2.254 --nameserver 192.168.2.1,192.168.3.1
618a7c
 #
618a7c
-network --onboot yes --bootproto dhcp
618a7c
+network --onboot yes --bootproto dhcp --noipv6
618a7c
 
618a7c
 # Set the system's root password (required)
618a7c
 # Plaintext password is: server
618a7c
@@ -71,16 +68,6 @@ user --name=admin --groups=wheel --password=$6$Ga6ZnIlytrWpuCzO$q0LqT1USHpahzUaf
618a7c
 # --ssh		allow sshd service through the firewall
618a7c
 firewall --enabled --ssh
618a7c
 
618a7c
-# Set up the authentication options for the system (required)
618a7c
-# --enableshadow	enable shadowed passwords by default
618a7c
-# --passalgo		hash / crypt algorithm for new passwords
618a7c
-# See the manual page for authconfig for a complete list of possible options.
618a7c
-authconfig --enableshadow --passalgo=sha512
618a7c
-
618a7c
-# State of SELinux on the installed system (optional)
618a7c
-# Defaults to enforcing
618a7c
-selinux --enforcing
618a7c
-
618a7c
 # Set the system time zone (required)
618a7c
 timezone --utc America/New_York
618a7c
 
618a7c
@@ -89,7 +76,7 @@ timezone --utc America/New_York
618a7c
 # Refer to e.g.
618a7c
 #   https://pykickstart.readthedocs.io/en/latest/commands.html#rootpw
618a7c
 # to see how to create encrypted password form for different plaintext password
618a7c
-bootloader --location=mbr --append="audit=1 audit_backlog_limit=8192 slub_debug=P page_poison=1 vsyscall=none" --password=$6$zCPaBARiNlBYUAS7$40phthWpqvaPVz3QUeIK6n5qoazJDJD5Nlc9OKy5SyYoX9Rt4jFaLjzqJCwpgR4RVAEFSADsqQot0WKs5qNto0
618a7c
+bootloader --location=mbr
618a7c
 
618a7c
 # Initialize (format) all disks (optional)
618a7c
 zerombr
618a7c
618a7c
From 745ec9b02bb45ca89d2705e79b36b17060508765 Mon Sep 17 00:00:00 2001
618a7c
From: Watson Sato <wsato@redhat.com>
618a7c
Date: Tue, 2 Feb 2021 14:03:09 +0100
618a7c
Subject: [PATCH 3/4] Align ANSSI kickstarts with enhanced level
618a7c
618a7c
- Keep restricting IPv6
618a7c
- Audit enabled during boot
618a7c
- No requirement to enforce use of SELinux
618a7c
---
618a7c
 .../ssg-rhel7-anssi_nt28_enhanced-ks.cfg        |  6 +-----
618a7c
 .../ssg-rhel8-anssi_bp28_enhanced-ks.cfg        | 17 ++---------------
618a7c
 2 files changed, 3 insertions(+), 20 deletions(-)
618a7c
618a7c
diff --git a/rhel7/kickstart/ssg-rhel7-anssi_nt28_enhanced-ks.cfg b/rhel7/kickstart/ssg-rhel7-anssi_nt28_enhanced-ks.cfg
618a7c
index 2e75873a28..1d35bedb91 100644
618a7c
--- a/rhel7/kickstart/ssg-rhel7-anssi_nt28_enhanced-ks.cfg
618a7c
+++ b/rhel7/kickstart/ssg-rhel7-anssi_nt28_enhanced-ks.cfg
618a7c
@@ -78,10 +78,6 @@ firewall --enabled --ssh
618a7c
 # See the manual page for authconfig for a complete list of possible options.
618a7c
 authconfig --enableshadow --passalgo=sha512
618a7c
 
618a7c
-# State of SELinux on the installed system (optional)
618a7c
-# Defaults to enforcing
618a7c
-selinux --enforcing
618a7c
-
618a7c
 # Set the system time zone (required)
618a7c
 timezone --utc America/New_York
618a7c
 
618a7c
@@ -89,7 +85,7 @@ timezone --utc America/New_York
618a7c
 # Plaintext password is: password
618a7c
 # Refer to e.g. https://pykickstart.readthedocs.io/en/latest/commands.html#rootpw to see how to create
618a7c
 # encrypted password form for different plaintext password
618a7c
-bootloader --location=mbr --append="crashkernel=auto rhgb quiet" --password=$6$zCPaBARiNlBYUAS7$40phthWpqvaPVz3QUeIK6n5qoazJDJD5Nlc9OKy5SyYoX9Rt4jFaLjzqJCwpgR4RVAEFSADsqQot0WKs5qNto0
618a7c
+bootloader --location=mbr --append="audit=1 audit_backlog_limig=8192" --password=$6$zCPaBARiNlBYUAS7$40phthWpqvaPVz3QUeIK6n5qoazJDJD5Nlc9OKy5SyYoX9Rt4jFaLjzqJCwpgR4RVAEFSADsqQot0WKs5qNto0
618a7c
 
618a7c
 # Initialize (format) all disks (optional)
618a7c
 zerombr
618a7c
diff --git a/rhel8/kickstart/ssg-rhel8-anssi_bp28_enhanced-ks.cfg b/rhel8/kickstart/ssg-rhel8-anssi_bp28_enhanced-ks.cfg
618a7c
index 4e249f61e2..728946ecb7 100644
618a7c
--- a/rhel8/kickstart/ssg-rhel8-anssi_bp28_enhanced-ks.cfg
618a7c
+++ b/rhel8/kickstart/ssg-rhel8-anssi_bp28_enhanced-ks.cfg
618a7c
@@ -6,9 +6,6 @@
618a7c
 # https://pykickstart.readthedocs.io/en/latest/
618a7c
 # http://usgcb.nist.gov/usgcb/content/configuration/workstation-ks.cfg
618a7c
 
618a7c
-# Install a fresh new system (optional)
618a7c
-install
618a7c
-
618a7c
 # Specify installation method to use for installation
618a7c
 # To use a different one comment out the 'url' one below, update
618a7c
 # the selected choice with proper options & un-comment it
618a7c
@@ -52,7 +49,7 @@ keyboard us
618a7c
 #       "--bootproto=static" must be used. For example:
618a7c
 # network --bootproto=static --ip=10.0.2.15 --netmask=255.255.255.0 --gateway=10.0.2.254 --nameserver 192.168.2.1,192.168.3.1
618a7c
 #
618a7c
-network --onboot yes --bootproto dhcp
618a7c
+network --onboot yes --bootproto dhcp --noipv6
618a7c
 
618a7c
 # Set the system's root password (required)
618a7c
 # Plaintext password is: server
618a7c
@@ -71,16 +68,6 @@ user --name=admin --groups=wheel --password=$6$Ga6ZnIlytrWpuCzO$q0LqT1USHpahzUaf
618a7c
 # --ssh		allow sshd service through the firewall
618a7c
 firewall --enabled --ssh
618a7c
 
618a7c
-# Set up the authentication options for the system (required)
618a7c
-# --enableshadow	enable shadowed passwords by default
618a7c
-# --passalgo		hash / crypt algorithm for new passwords
618a7c
-# See the manual page for authconfig for a complete list of possible options.
618a7c
-authconfig --enableshadow --passalgo=sha512
618a7c
-
618a7c
-# State of SELinux on the installed system (optional)
618a7c
-# Defaults to enforcing
618a7c
-selinux --enforcing
618a7c
-
618a7c
 # Set the system time zone (required)
618a7c
 timezone --utc America/New_York
618a7c
 
618a7c
@@ -89,7 +76,7 @@ timezone --utc America/New_York
618a7c
 # Refer to e.g.
618a7c
 #   https://pykickstart.readthedocs.io/en/latest/commands.html#rootpw
618a7c
 # to see how to create encrypted password form for different plaintext password
618a7c
-bootloader --location=mbr --append="audit=1 audit_backlog_limit=8192 slub_debug=P page_poison=1 vsyscall=none" --password=$6$zCPaBARiNlBYUAS7$40phthWpqvaPVz3QUeIK6n5qoazJDJD5Nlc9OKy5SyYoX9Rt4jFaLjzqJCwpgR4RVAEFSADsqQot0WKs5qNto0
618a7c
+bootloader --location=mbr --append="audit=1 audit_backlog_limit=8192" --password=$6$zCPaBARiNlBYUAS7$40phthWpqvaPVz3QUeIK6n5qoazJDJD5Nlc9OKy5SyYoX9Rt4jFaLjzqJCwpgR4RVAEFSADsqQot0WKs5qNto0
618a7c
 
618a7c
 # Initialize (format) all disks (optional)
618a7c
 zerombr
618a7c
618a7c
From 6804cdfbdea9992daf48fe545d8005be9f37bc56 Mon Sep 17 00:00:00 2001
618a7c
From: Watson Sato <wsato@redhat.com>
618a7c
Date: Tue, 2 Feb 2021 14:08:15 +0100
618a7c
Subject: [PATCH 4/4] Align ANSSI Kickstarts with high level
618a7c
618a7c
---
618a7c
 rhel7/kickstart/ssg-rhel7-anssi_nt28_high-ks.cfg |  2 +-
618a7c
 rhel8/kickstart/ssg-rhel8-anssi_bp28_high-ks.cfg | 13 ++-----------
618a7c
 2 files changed, 3 insertions(+), 12 deletions(-)
618a7c
618a7c
diff --git a/rhel7/kickstart/ssg-rhel7-anssi_nt28_high-ks.cfg b/rhel7/kickstart/ssg-rhel7-anssi_nt28_high-ks.cfg
618a7c
index 745dcbd058..73225c2fab 100644
618a7c
--- a/rhel7/kickstart/ssg-rhel7-anssi_nt28_high-ks.cfg
618a7c
+++ b/rhel7/kickstart/ssg-rhel7-anssi_nt28_high-ks.cfg
618a7c
@@ -89,7 +89,7 @@ timezone --utc America/New_York
618a7c
 # Plaintext password is: password
618a7c
 # Refer to e.g. https://pykickstart.readthedocs.io/en/latest/commands.html#rootpw to see how to create
618a7c
 # encrypted password form for different plaintext password
618a7c
-bootloader --location=mbr --append="crashkernel=auto rhgb quiet" --password=$6$zCPaBARiNlBYUAS7$40phthWpqvaPVz3QUeIK6n5qoazJDJD5Nlc9OKy5SyYoX9Rt4jFaLjzqJCwpgR4RVAEFSADsqQot0WKs5qNto0
618a7c
+bootloader --location=mbr --append="audit=1 audit_backlog_limit=8192" --password=$6$zCPaBARiNlBYUAS7$40phthWpqvaPVz3QUeIK6n5qoazJDJD5Nlc9OKy5SyYoX9Rt4jFaLjzqJCwpgR4RVAEFSADsqQot0WKs5qNto0
618a7c
 
618a7c
 # Initialize (format) all disks (optional)
618a7c
 zerombr
618a7c
diff --git a/rhel8/kickstart/ssg-rhel8-anssi_bp28_high-ks.cfg b/rhel8/kickstart/ssg-rhel8-anssi_bp28_high-ks.cfg
618a7c
index a1511b157a..cd0eff2625 100644
618a7c
--- a/rhel8/kickstart/ssg-rhel8-anssi_bp28_high-ks.cfg
618a7c
+++ b/rhel8/kickstart/ssg-rhel8-anssi_bp28_high-ks.cfg
618a7c
@@ -6,9 +6,6 @@
618a7c
 # https://pykickstart.readthedocs.io/en/latest/
618a7c
 # http://usgcb.nist.gov/usgcb/content/configuration/workstation-ks.cfg
618a7c
 
618a7c
-# Install a fresh new system (optional)
618a7c
-install
618a7c
-
618a7c
 # Specify installation method to use for installation
618a7c
 # To use a different one comment out the 'url' one below, update
618a7c
 # the selected choice with proper options & un-comment it
618a7c
@@ -52,7 +49,7 @@ keyboard us
618a7c
 #       "--bootproto=static" must be used. For example:
618a7c
 # network --bootproto=static --ip=10.0.2.15 --netmask=255.255.255.0 --gateway=10.0.2.254 --nameserver 192.168.2.1,192.168.3.1
618a7c
 #
618a7c
-network --onboot yes --bootproto dhcp
618a7c
+network --onboot yes --bootproto dhcp --noipv6
618a7c
 
618a7c
 # Set the system's root password (required)
618a7c
 # Plaintext password is: server
618a7c
@@ -71,12 +68,6 @@ user --name=admin --groups=wheel --password=$6$Ga6ZnIlytrWpuCzO$q0LqT1USHpahzUaf
618a7c
 # --ssh		allow sshd service through the firewall
618a7c
 firewall --enabled --ssh
618a7c
 
618a7c
-# Set up the authentication options for the system (required)
618a7c
-# --enableshadow	enable shadowed passwords by default
618a7c
-# --passalgo		hash / crypt algorithm for new passwords
618a7c
-# See the manual page for authconfig for a complete list of possible options.
618a7c
-authconfig --enableshadow --passalgo=sha512
618a7c
-
618a7c
 # State of SELinux on the installed system (optional)
618a7c
 # Defaults to enforcing
618a7c
 selinux --enforcing
618a7c
@@ -89,7 +80,7 @@ timezone --utc America/New_York
618a7c
 # Refer to e.g.
618a7c
 #   https://pykickstart.readthedocs.io/en/latest/commands.html#rootpw
618a7c
 # to see how to create encrypted password form for different plaintext password
618a7c
-bootloader --location=mbr --append="audit=1 audit_backlog_limit=8192 slub_debug=P page_poison=1 vsyscall=none" --password=$6$zCPaBARiNlBYUAS7$40phthWpqvaPVz3QUeIK6n5qoazJDJD5Nlc9OKy5SyYoX9Rt4jFaLjzqJCwpgR4RVAEFSADsqQot0WKs5qNto0
618a7c
+bootloader --location=mbr --append="audit=1 audit_backlog_limit=8192" --password=$6$zCPaBARiNlBYUAS7$40phthWpqvaPVz3QUeIK6n5qoazJDJD5Nlc9OKy5SyYoX9Rt4jFaLjzqJCwpgR4RVAEFSADsqQot0WKs5qNto0
618a7c
 
618a7c
 # Initialize (format) all disks (optional)
618a7c
 zerombr