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

Ubuntu 24.04: Implement 2.1.21 Ensure mail transfer agent is configured for local-only mode #12818

Merged
merged 4 commits into from
Jan 16, 2025
Merged

Ubuntu 24.04: Implement 2.1.21 Ensure mail transfer agent is configured for local-only mode #12818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b26c0db
Add variable var_postfix_inet_interfaces into Ubuntu2404
alanmcanonical Jan 13, 2025
05a8ae3
Add oval check logic for has_nonlocal_mta to also check port 465 587
alanmcanonical Jan 13, 2025
25f3399
Use macro to generate oval listen port parts
alanmcanonical Jan 13, 2025
cef0292
Avoid systemd in container environment
alanmcanonical Jan 13, 2025
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
6 changes: 3 additions & 3 deletions controls/cis_ubuntu2404.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -865,11 +865,11 @@ controls:
levels:
- l1_server
- l1_workstation
related_rules:
rules:
- has_nonlocal_mta
- var_postfix_inet_interfaces=loopback-only
- postfix_network_listening_disabled
status: planned
notes: TODO. Partial/incorrect implementation exists.See related rules. Analogous to ubuntu2204/2.2.15.
status: automated

- id: 2.1.22
title: Ensure only approved services are listening on a network interface (Manual)
Expand Down
50 changes: 36 additions & 14 deletions linux_os/guide/services/mail/has_nonlocal_mta/oval/shared.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,49 @@
{{% macro generate_criteria_listening_port(port) %}}
<criterion test_ref="tst_nothing_listening_external_mta_port_{{{ port }}}"
comment="mta is not listening on any non-loopbackaddress for port {{{ port }}}" />
{{% endmacro %}}

<def-group>
<definition class="compliance" id="{{{ rule_id }}}" version="1">
{{{ oval_metadata("Verify MTA is not listening on any non-loopback address") }}}
<criteria>
<criterion test_ref="tst_nothing_listening_external_mta_port"
comment="mta is not listening on any non-loopbackaddress" />
<criteria operator="AND">
{{{ generate_criteria_listening_port("25")}}}
{{% if 'ubuntu' in product %}}
{{{ generate_criteria_listening_port("465")}}}
{{{ generate_criteria_listening_port("587")}}}
{{% endif %}}
</criteria>
</definition>
<linux:inetlisteningservers_object id="obj_listening_port_25" version="1">

<linux:inetlisteningservers_state id="ste_not_on_localhost" version="1">
<linux:local_address operation="equals">::1</linux:local_address>
</linux:inetlisteningservers_state>

{{% macro generate_test_listening_port(port) %}}

<linux:inetlisteningservers_object id="obj_listening_port_{{{ port }}}" version="1">
<linux:protocol>tcp</linux:protocol>
<linux:local_address operation="not equal">127.0.0.1</linux:local_address>
<linux:local_port datatype="int">25</linux:local_port>
<filter action="exclude">ste_not_port_25</filter>
<linux:local_port datatype="int">{{{ port }}}</linux:local_port>
<filter action="exclude">ste_not_port_{{{ port }}}</filter>
<filter action="exclude">ste_not_on_localhost</filter>
</linux:inetlisteningservers_object>
<linux:inetlisteningservers_state id="ste_not_port_25" version="1">
<linux:local_port datatype="int" operation="not equal">25</linux:local_port>
</linux:inetlisteningservers_state>
<linux:inetlisteningservers_state id="ste_not_on_localhost" version="1">
<linux:local_address operation="equals">::1</linux:local_address>

<linux:inetlisteningservers_state id="ste_not_port_{{{ port }}}" version="1">
<linux:local_port datatype="int" operation="not equal">{{{ port }}}</linux:local_port>
</linux:inetlisteningservers_state>

<linux:inetlisteningservers_test check="all" check_existence="none_exist"
id="tst_nothing_listening_external_mta_port" version="1"
comment="mta is not listening on any non-loopback address">
<linux:object object_ref="obj_listening_port_25" />
id="tst_nothing_listening_external_mta_port_{{{ port }}}" version="1"
comment="mta is not listening on any non-loopback address {{{ port }}}">
<linux:object object_ref="obj_listening_port_{{{ port }}}" />
</linux:inetlisteningservers_test>

{{% endmacro %}}

{{{ generate_test_listening_port("25") }}}
{{% if 'ubuntu' in product %}}
{{{ generate_test_listening_port("465")}}}
{{{ generate_test_listening_port("587")}}}
{{% endif %}}
</def-group>
2 changes: 1 addition & 1 deletion linux_os/guide/services/mail/has_nonlocal_mta/tests/correct.pass.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# packages = postfix

echo "inet_interfaces = localhost" > /etc/postfix/main.cf
systemctl restart postfix
postfix reload || postfix start
2 changes: 1 addition & 1 deletion linux_os/guide/services/mail/has_nonlocal_mta/tests/wrong.fail.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
# remediation = none

echo "inet_interfaces = all" > /etc/postfix/main.cf
systemctl restart postfix
postfix reload || postfix start
Loading