| 1 |
commit: 5537d423834693b5b9eb704f5ae6fba34b068e98 |
| 2 |
Author: Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be> |
| 3 |
AuthorDate: Sat Feb 1 14:22:43 2014 +0000 |
| 4 |
Commit: Sven Vermeulen <swift <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 1 14:22:43 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-docs.git;a=commit;h=5537d423 |
| 7 |
|
| 8 |
Fix check values |
| 9 |
|
| 10 |
--- |
| 11 |
xml/SCAP/gentoo-oval.xml | 40 ++++++++++++++++++++++++++++++++++++++-- |
| 12 |
1 file changed, 38 insertions(+), 2 deletions(-) |
| 13 |
|
| 14 |
diff --git a/xml/SCAP/gentoo-oval.xml b/xml/SCAP/gentoo-oval.xml |
| 15 |
index e4d183c..a031348 100644 |
| 16 |
--- a/xml/SCAP/gentoo-oval.xml |
| 17 |
+++ b/xml/SCAP/gentoo-oval.xml |
| 18 |
@@ -532,6 +532,21 @@ |
| 19 |
</criteria> |
| 20 |
</definition> |
| 21 |
|
| 22 |
+ <definition id="oval:org.gentoo.dev.swift:def:32" version="1" class="compliance"> |
| 23 |
+ <metadata> |
| 24 |
+ <title>In /etc/securetty only console and tty# exists</title> |
| 25 |
+ <affected family="unix"> |
| 26 |
+ <platform>Gentoo Linux</platform> |
| 27 |
+ </affected> |
| 28 |
+ <description> |
| 29 |
+ The /etc/securetty file only contains console and tty# entries |
| 30 |
+ </description> |
| 31 |
+ </metadata> |
| 32 |
+ <criteria> |
| 33 |
+ <criterion test_ref="oval:org.gentoo.dev.swift:tst:33" comment="In /etc/securetty, only console and tty# are defined" /> |
| 34 |
+ </criteria> |
| 35 |
+ </definition> |
| 36 |
+ |
| 37 |
</definitions> |
| 38 |
|
| 39 |
<tests> |
| 40 |
@@ -783,7 +798,7 @@ |
| 41 |
</ind-def:textfilecontent54_test> |
| 42 |
|
| 43 |
<ind-def:textfilecontent54_test id="oval:org.gentoo.dev.swift:tst:31" |
| 44 |
- version="1" check="at least one" check_existence="all_exist" |
| 45 |
+ version="1" check="all" check_existence="all_exist" |
| 46 |
comment="Tests that webrsync-gpg is set in make.conf FEATURES"> |
| 47 |
<!-- FEATURES declaration in make.conf --> |
| 48 |
<ind-def:object object_ref="oval:org.gentoo.dev.swift:obj:18" /> |
| 49 |
@@ -792,7 +807,7 @@ |
| 50 |
</ind-def:textfilecontent54_test> |
| 51 |
|
| 52 |
<ind-def:textfilecontent54_test id="oval:org.gentoo.dev.swift:tst:32" |
| 53 |
- version="1" check="at least one" check_existence="all_exist" |
| 54 |
+ version="1" check="all" check_existence="all_exist" |
| 55 |
comment="Tests that PORTAGE_GPG_DIR is non-empty"> |
| 56 |
<!-- PORTAGE_GPG_DIR declaration in make.conf --> |
| 57 |
<ind-def:object object_ref="oval:org.gentoo.dev.swift:obj:19" /> |
| 58 |
@@ -800,6 +815,15 @@ |
| 59 |
<ind-def:state state_ref="oval:org.gentoo.dev.swift:ste:12" /> |
| 60 |
</ind-def:textfilecontent54_test> |
| 61 |
|
| 62 |
+ <ind-def:textfilecontent54_test id="oval:org.gentoo.dev.swift:tst:33" |
| 63 |
+ version="1" check="all" check_existence="all_exist" |
| 64 |
+ comment="Tests that securetty only contains console and tty#"> |
| 65 |
+ <!-- /etc/securetty file --> |
| 66 |
+ <ind-def:object object_ref="oval:org.gentoo.dev.swift:obj:20" /> |
| 67 |
+ <!-- console or tty# --> |
| 68 |
+ <ind-def:state state_ref="oval:org.gentoo.dev.swift:ste:13" /> |
| 69 |
+ </ind-def:textfilecontent54_test> |
| 70 |
+ |
| 71 |
</tests> |
| 72 |
|
| 73 |
<objects> |
| 74 |
@@ -913,6 +937,13 @@ |
| 75 |
<ind-def:instance operation="greater than or equal" datatype="int">1</ind-def:instance> |
| 76 |
</ind-def:textfilecontent54_object> |
| 77 |
|
| 78 |
+ <ind-def:textfilecontent54_object id="oval:org.gentoo.dev.swift:obj:20" |
| 79 |
+ version="1" comment="/etc/securetty contains only console and tty##"> |
| 80 |
+ <ind-def:filepath>/etc/securetty</ind-def:filepath> |
| 81 |
+ <ind-def:pattern operation="pattern match">^[^#]+</ind-def:pattern> |
| 82 |
+ <ind-def:instance operation="greater than or equal" datatype="int">1</ind-def:instance> |
| 83 |
+ </ind-def:textfilecontent54_object> |
| 84 |
+ |
| 85 |
</objects> |
| 86 |
|
| 87 |
<states> |
| 88 |
@@ -977,6 +1008,11 @@ |
| 89 |
<ind-def:subexpression datatype="string" operation="pattern match" entity_check="all">[\S]+</ind-def:subexpression> |
| 90 |
</ind-def:textfilecontent54_state> |
| 91 |
|
| 92 |
+ <ind-def:textfilecontent54_state id="oval:org.gentoo.dev.swift:ste:13" |
| 93 |
+ version="1" comment="Matches console or tty[0-9]"> |
| 94 |
+ <ind-def:text datatype="string" operation="pattern match" entity_check="all">(console|tty[[:digit:]]+)</ind-def:text> |
| 95 |
+ </ind-def:textfilecontent54_state> |
| 96 |
+ |
| 97 |
</states> |
| 98 |
|
| 99 |
<variables> |
Archives