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

Support all boolean values in dnf.conf #11965

Merged
merged 4 commits into from
May 8, 2024
Merged

Support all boolean values in dnf.conf #11965

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
9ba0ff9
Support all boolean values in dnf.conf
marcusburghardt Apr 5, 2024
cdff641
Include test scenarios for boolean values
marcusburghardt Apr 5, 2024
ad9ab62
Minor updates regarding extra spaces
marcusburghardt Apr 8, 2024
a9d77f3
Fix issue with regex
marcusburghardt May 8, 2024
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 linux_os/guide/system/software/updating/ensure_gpgcheck_globally_activated/oval/shared.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<def-group>

<definition class="compliance" id="ensure_gpgcheck_globally_activated" version="1">
<definition class="compliance" id="{{{ rule_id }}}" version="1">
{{{ oval_metadata("The gpgcheck option should be used to ensure that checking
of an RPM package's signature always occurs prior to its
installation.") }}}
Expand All @@ -22,7 +22,7 @@

<ind:textfilecontent54_object id="object_ensure_gpgcheck_globally_activated" comment="gpgcheck set in {{{ pkg_manager_config_file }}}" version="1">
<ind:filepath>{{{ pkg_manager_config_file }}}</ind:filepath>
<ind:pattern operation="pattern match">^\s*gpgcheck\s*=\s*1\s*$</ind:pattern>
<ind:pattern operation="pattern match">^\s*gpgcheck\s*=\s*(1|True|yes)\s*$</ind:pattern>
<ind:instance datatype="int" operation="equals">1</ind:instance>
</ind:textfilecontent54_object>

Expand All @@ -34,7 +34,7 @@

<ind:textfilecontent54_object id="object_test_ensure_gpgcheck_globally_no_deactivated" comment="0_off_no_false set in {{{ pkg_manager_config_file }}}" version="1">
<ind:filepath>{{{ pkg_manager_config_file }}}</ind:filepath>
<ind:pattern operation="pattern match">^\s*gpgcheck\s*=\s*0|off|no|false\s*$</ind:pattern>
<ind:pattern operation="pattern match">^\s*gpgcheck\s*=\s*(0|off|no|false)\s*$</ind:pattern>
<ind:instance datatype="int" operation="equals">0</ind:instance>
</ind:textfilecontent54_object>

Expand Down
2 changes: 1 addition & 1 deletion ...e/system/software/updating/ensure_gpgcheck_globally_activated/tests/correct_value.pass.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
{{% if 'sle' in product %}}
# packages = libselinux1
{{% else %}}
{{% else %}}
# packages = python3-libselinux
{{% endif %}}

Expand Down
16 changes: 16 additions & 0 deletions ...tem/software/updating/ensure_gpgcheck_globally_activated/tests/correct_value_true.pass.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#!/bin/bash
{{% if 'sle' in product %}}
# packages = libselinux1
{{% else %}}
# packages = python3-libselinux
{{% endif %}}

. $SHARED/group_updating_utils.sh

config_file="$(find_config_file)"

if grep -q "^gpgcheck" "$config_file"; then
sed -i "s/^gpgcheck.*/gpgcheck=True/" "$config_file"
else
echo "gpgcheck=True" >> "$config_file"
fi
16 changes: 16 additions & 0 deletions ...stem/software/updating/ensure_gpgcheck_globally_activated/tests/correct_value_yes.pass.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#!/bin/bash
{{% if 'sle' in product %}}
# packages = libselinux1
{{% else %}}
# packages = python3-libselinux
{{% endif %}}

. $SHARED/group_updating_utils.sh

config_file="$(find_config_file)"

if grep -q "^gpgcheck" "$config_file"; then
sed -i "s/^gpgcheck.*/gpgcheck=yes/" "$config_file"
else
echo "gpgcheck=yes" >> "$config_file"
fi
2 changes: 1 addition & 1 deletion .../system/software/updating/ensure_gpgcheck_globally_activated/tests/line_not_there.fail.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
{{% if 'sle' in product %}}
# packages = libselinux1
{{% else %}}
{{% else %}}
# packages = python3-libselinux
{{% endif %}}

Expand Down
2 changes: 1 addition & 1 deletion ...ide/system/software/updating/ensure_gpgcheck_globally_activated/tests/wrong_value.fail.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
{{% if 'sle' in product %}}
# packages = libselinux1
{{% else %}}
{{% else %}}
# packages = python3-libselinux
{{% endif %}}

Expand Down
2 changes: 1 addition & 1 deletion ...stem/software/updating/ensure_gpgcheck_globally_activated/tests/wrong_value_false.fail.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
{{% if 'sle' in product %}}
# packages = libselinux1
{{% else %}}
{{% else %}}
# packages = python3-libselinux
{{% endif %}}

Expand Down
2 changes: 1 addition & 1 deletion .../system/software/updating/ensure_gpgcheck_globally_activated/tests/wrong_value_no.fail.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
{{% if 'sle' in product %}}
# packages = libselinux1
{{% else %}}
{{% else %}}
# packages = python3-libselinux
{{% endif %}}

Expand Down
2 changes: 1 addition & 1 deletion ...system/software/updating/ensure_gpgcheck_globally_activated/tests/wrong_value_off.fail.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
{{% if 'sle' in product %}}
# packages = libselinux1
{{% else %}}
{{% else %}}
# packages = python3-libselinux
{{% endif %}}

Expand Down
Loading