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

Improve sshd_use_approved_kex_ordered_stig #11053

Merged
merged 5 commits into from
Sep 18, 2023
Merged

Improve sshd_use_approved_kex_ordered_stig #11053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5051a0d
sshd_use_strong_kex: Fix OVAL variable comment
dodys Sep 6, 2023
fe36388
sshd_use_approved_kex_ordered_stig: oval: Fix regex and improve comment
dodys Sep 7, 2023
8967385
Add UBTU-20-010045 for enforcing proper kex exchange algorithms
dexterle Jul 6, 2023
3164759
sshd_use_approved_kex_ordered_stig: tests: Fix typo in correct_scrambled
dodys Sep 7, 2023
12df498
sshd_use_approved_kex_ordered_stig: tests: Fix logic in correct_scram…
dodys Sep 7, 2023
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
11 changes: 6 additions & 5 deletions linux_os/guide/services/ssh/ssh_server/sshd_use_approved_kex_ordered_stig/oval/shared.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
"diffie-hellman-group-exchange-sha256"] %}}
{{% endif %}}

{{% set kex_algos_regex=prefix_conf %}}
{{% set kex_algos_regex=prefix_conf ~ "(?=[\w-])" "(\\b" ~ kex_algos|join("\\b,?)?(\\b") ~ ")?" ~
sufix_conf ~ "[\\s]*(?:#.*)?$" %}}

<def-group>
<definition class="compliance" id="{{{ rule_id }}}" version="1">
Expand All @@ -26,21 +27,21 @@
<extend_definition comment="sshd is not required or requirement is unset"
definition_ref="sshd_not_required_or_unset" />
{{% if product in ['sle12', 'sle15'] %}}
<extend_definition comment="rpm package openssh removed"
<extend_definition comment="package openssh removed"
definition_ref="package_openssh_removed" />
{{% else %}}
<extend_definition comment="rpm package openssh-server removed"
<extend_definition comment="package openssh-server removed"
definition_ref="package_openssh-server_removed" />
{{% endif %}}
</criteria>
<criteria comment="sshd is installed and configured" operator="AND">
<extend_definition comment="sshd is required or requirement is unset"
definition_ref="sshd_required_or_unset" />
{{% if product in ['sle12', 'sle15'] %}}
<extend_definition comment="rpm package openssh installed"
<extend_definition comment="package openssh installed"
definition_ref="package_openssh_installed" />
{{% else %}}
<extend_definition comment="rpm package openssh-server installed"
<extend_definition comment="package openssh-server installed"
definition_ref="package_openssh-server_installed" />
{{% endif %}}
<criterion comment="Check Kex in {{{ path }}}"
Expand Down
2 changes: 1 addition & 1 deletion ...os/guide/services/ssh/ssh_server/sshd_use_approved_kex_ordered_stig/tests/comment.fail.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# platform = multi_platform_ol,multi_platform_rhel,multi_platform_sle
# platform = multi_platform_ol,multi_platform_rhel,multi_platform_sle,multi_platform_ubuntu

source common.sh

Expand Down
2 changes: 1 addition & 1 deletion linux_os/guide/services/ssh/ssh_server/sshd_use_approved_kex_ordered_stig/tests/common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ CONF_PREFIX="CRYPTO_POLICY='-oKexAlgorithms="
KEX_ALGOS="ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,diffie-hellman-group-exchange-sha256,diffie-hellman-group14-sha256,diffie-hellman-group16-sha512,diffie-hellman-group18-sha512"
CONF_SUFIX="'"
CONF_PREFIX_REGEX="^\s*CRYPTO_POLICY"
{{% elif product in ['ol7','rhel7','sle12','sle15'] %}}
{{% elif product in ['ol7','rhel7','sle12','sle15','ubuntu2004'] %}}
FILE_PATH='/etc/ssh/sshd_config'
CONF_PREFIX="KexAlgorithms "
KEX_ALGOS="ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,diffie-hellman-group-exchange-sha256"
Expand Down
2 changes: 1 addition & 1 deletion ...ices/ssh/ssh_server/sshd_use_approved_kex_ordered_stig/tests/correct_reduced_list.pass.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# platform = multi_platform_ol,multi_platform_rhel,multi_platform_sle
# platform = multi_platform_ol,multi_platform_rhel,multi_platform_sle,multi_platform_ubuntu

source common.sh

Expand Down
4 changes: 2 additions & 2 deletions ...ervices/ssh/ssh_server/sshd_use_approved_kex_ordered_stig/tests/correct_scrambled.fail.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#!/bin/bash
# platform = multi_platform_ol,multi_platform_rhel,multi_platform_sle
# platform = multi_platform_ol,multi_platform_rhel,multi_platform_sle,multi_platform_ubuntu
dodys marked this conversation as resolved.
Show resolved Hide resolved

source common.sh

readarray -t KEX_ALGOS_ARR < <(echo $KEX_ALGOS | tr "," "\n")

#swap first and second algorithms

KEX_ALGOS_SCRAMBLED=$(echo ${KEY_ALGOS_ARR[0]},${KEY_ALGOS_ARR[1]},$(echo ${KEY_ALGOS_ARR[@]:2} | tr " " ","))
KEX_ALGOS_SCRAMBLED=$(echo ${KEX_ALGOS_ARR[1]},${KEX_ALGOS_ARR[0]},$(echo ${KEX_ALGOS_ARR[@]:2} | tr " " ","))

CONF="${CONF_PREFIX}${KEX_ALGOS_SCRAMBLED}${CONF_SUFIX}"

Expand Down
2 changes: 1 addition & 1 deletion ...de/services/ssh/ssh_server/sshd_use_approved_kex_ordered_stig/tests/correct_value.pass.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# platform = multi_platform_ol,multi_platform_rhel,multi_platform_sle
# platform = multi_platform_ol,multi_platform_rhel,multi_platform_sle,multi_platform_ubuntu

source common.sh

Expand Down
2 changes: 1 addition & 1 deletion ...e/services/ssh/ssh_server/sshd_use_approved_kex_ordered_stig/tests/line_not_there.fail.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
# platform = multi_platform_ol,multi_platform_rhel,multi_platform_sle
# platform = multi_platform_ol,multi_platform_rhel,multi_platform_sle,multi_platform_ubuntu

source common.sh
2 changes: 1 addition & 1 deletion ...de/services/ssh/ssh_server/sshd_use_approved_kex_ordered_stig/tests/no_parameters.fail.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# platform = multi_platform_ol,multi_platform_rhel,multi_platform_sle
# platform = multi_platform_ol,multi_platform_rhel,multi_platform_sle,multi_platform_ubuntu

source common.sh

Expand Down
2 changes: 1 addition & 1 deletion ...uide/services/ssh/ssh_server/sshd_use_approved_kex_ordered_stig/tests/wrong_value.fail.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# platform = multi_platform_ol,multi_platform_rhel,multi_platform_sle
# platform = multi_platform_ol,multi_platform_rhel,multi_platform_sle,multi_platform_ubuntu

source common.sh

Expand Down
2 changes: 1 addition & 1 deletion linux_os/guide/services/ssh/ssh_server/sshd_use_strong_kex/oval/shared.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<ind:instance datatype="int">1</ind:instance>
</ind:textfilecontent54_object>

<local_variable id="var_sshd_config_kex" datatype="string" version="1" comment="MACs values splitted on comma">
<local_variable id="var_sshd_config_kex" datatype="string" version="1" comment="KEXs values splitted on comma">
<split delimiter=",">
<object_component item_field="subexpression" object_ref="obj_sshd_config_kex" />
</split>
Expand Down
Loading