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

Fix in sudo_require_reauthentication #10216

Merged
merged 11 commits into from
Apr 28, 2023
Merged

Fix in sudo_require_reauthentication #10216

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
565ad17
Fix in sudo_require_reauthentication
rumch-se Feb 16, 2023
ec258b5
A coorecting checkig for sudo package
rumch-se Feb 17, 2023
ab76550
a correction in OVAL part
rumch-se Feb 20, 2023
321f21c
A correction in regex in OVAL
rumch-se Feb 20, 2023
cdf16d9
correction in oval - regexp and tests
rumch-se Feb 21, 2023
3aaa567
New tests added
rumch-se Feb 22, 2023
bd8ea99
New tests added
rumch-se Feb 24, 2023
b2e383b
Missing wrong_value_2.fail.sh test added
rumch-se Apr 6, 2023
c3c9214
Update in OVAL regexp , updates in tests
rumch-se Apr 14, 2023
7f505d1
Update shared.xml
rumch-se Apr 14, 2023
cd002f1
Deletion of 2 tests
rumch-se Apr 24, 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
15 changes: 5 additions & 10 deletions linux_os/guide/system/software/sudo/sudo_require_reauthentication/oval/shared.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,20 @@
<def-group>
<definition class="compliance" id="{{{ rule_id }}}" version="1">
{{{ oval_metadata("'Ensure sudo timestamp_timeout is appropriate - sudo timestamp_timeout") }}}
<criteria comment="The timestamp_timeout should be configured" >
<criteria comment="The timestamp_timeout should be configured">
<criterion comment="check configuration in /etc/sudoers" test_ref="test_sudo_timestamp_timeout" />
</criteria>
</definition>

<!-- Define test for sudo timestamp. -->
<ind:textfilecontent54_test check="all" check_existence="only_one_exists" comment="check correct configuration in /etc/sudoers" id="test_sudo_timestamp_timeout" version="1">
<ind:object object_ref="obj_sudo_timestamp_timeout"/>
<ind:state state_ref="state_sudo_timestamp_timeout" />
</ind:textfilecontent54_test>

<ind:textfilecontent54_object id="obj_sudo_timestamp_timeout" version="1">
<ind:filepath operation="pattern match">^/etc/sudoers(\.d/.*)?$</ind:filepath>
<ind:pattern operation="pattern match">^[\s]*Defaults[\s]+timestamp_timeout[\s]*=[\s]*([-]?[\d]+)$</ind:pattern>
<ind:instance datatype="int" operation="greater than or equal">1</ind:instance>
<ind:filepath operation="pattern match">^\/etc\/(sudoers|sudoers\.d\/*)$</ind:filepath>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<ind:filepath operation="pattern match">^\/etc\/(sudoers|sudoers\.d\/*)$</ind:filepath>
<ind:filepath operation="pattern match">^\/etc\/(sudoers|sudoers\.d\/.*)$</ind:filepath>

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like it's missing the proper capture all element here

<ind:pattern operation="pattern match">^[\s]*Defaults[\s]+timestamp_timeout[\s]*=\s*[0-9]+$</ind:pattern>
<ind:instance datatype="int" operation="equals">1</ind:instance>
</ind:textfilecontent54_object>

<ind:textfilecontent54_state id="state_sudo_timestamp_timeout"
version="1">
<ind:subexpression datatype="int" operation="greater than or equal">0</ind:subexpression>
</ind:textfilecontent54_state>

</def-group>
2 changes: 2 additions & 0 deletions linux_os/guide/system/software/sudo/sudo_require_reauthentication/rule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,3 +64,5 @@ fixtext: |-
Remove any duplicate or conflicting lines from /etc/sudoers and /etc/sudoers.d/ files.

srg_requirement: '{{{ full_name }}} must require re-authentication when using the "sudo" command.'

platform: package[sudo]