From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-651232-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id 27CFB138247
	for <garchives@archives.gentoo.org>; Fri, 20 Dec 2013 14:25:30 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id ABCE6E0A82;
	Fri, 20 Dec 2013 14:25:29 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 299EDE0A82
	for <gentoo-commits@lists.gentoo.org>; Fri, 20 Dec 2013 14:25:29 +0000 (UTC)
Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163])
	(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 3310B33F4C4
	for <gentoo-commits@lists.gentoo.org>; Fri, 20 Dec 2013 14:25:28 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by hornbill.gentoo.org (Postfix) with ESMTP id AB73EE575E
	for <gentoo-commits@lists.gentoo.org>; Fri, 20 Dec 2013 14:25:26 +0000 (UTC)
From: "Sven Vermeulen" <swift@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sven Vermeulen" <swift@gentoo.org>
Message-ID: <1387549428.3de2a55862c4aac01ae2e7e5e858e89104970fa5.swift@gentoo>
Subject: [gentoo-commits] proj/hardened-docs:master commit in: xml/SCAP/
X-VCS-Repository: proj/hardened-docs
X-VCS-Files: xml/SCAP/gentoo-oval.xml xml/SCAP/gentoo-xccdf.xml
X-VCS-Directories: xml/SCAP/
X-VCS-Committer: swift
X-VCS-Committer-Name: Sven Vermeulen
X-VCS-Revision: 3de2a55862c4aac01ae2e7e5e858e89104970fa5
X-VCS-Branch: master
Date: Fri, 20 Dec 2013 14:25:26 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: a3fdfe08-9ff7-43bb-a53c-8c238bf25676
X-Archives-Hash: e1699c04487328e2e0563cdc3a933702

commit:     3de2a55862c4aac01ae2e7e5e858e89104970fa5
Author:     Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be>
AuthorDate: Fri Dec 20 14:23:48 2013 +0000
Commit:     Sven Vermeulen <swift <AT> gentoo <DOT> org>
CommitDate: Fri Dec 20 14:23:48 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-docs.git;a=commit;h=3de2a558

Add test for PORTAGE_GPG_DIR

---
 xml/SCAP/gentoo-oval.xml  | 36 ++++++++++++++++++++++++++++++++++++
 xml/SCAP/gentoo-xccdf.xml | 12 ++++++++++++
 2 files changed, 48 insertions(+)

diff --git a/xml/SCAP/gentoo-oval.xml b/xml/SCAP/gentoo-oval.xml
index 7e1a184..5bd0272 100644
--- a/xml/SCAP/gentoo-oval.xml
+++ b/xml/SCAP/gentoo-oval.xml
@@ -517,6 +517,21 @@
     </criteria>
   </definition>
 
+  <definition id="oval:org.gentoo.dev.swift:def:31" version="1" class="compliance">
+    <metadata>
+      <title>In make.conf PORTAGE_GPG_DIR is set</title>
+      <affected family="unix">
+        <platform>Gentoo Linux</platform>
+      </affected>
+      <description>
+        The PORTAGE_GPG_DIR declaration in make.conf has a non-empty value.
+      </description>
+    </metadata>
+    <criteria>
+      <criterion test_ref="oval:org.gentoo.dev.swift:tst:32" comment="In make.conf PORTAGE_GPG_DIR is non-empty" />
+    </criteria>
+  </definition>
+
 </definitions>
 
 <tests>
@@ -776,6 +791,15 @@
     <ind-def:state state_ref="oval:org.gentoo.dev.swift:ste:11" />
   </ind-def:textfilecontent54_test>
 
+  <ind-def:textfilecontent54_test id="oval:org.gentoo.dev.swift:tst:32"
+    version="1" check="at least one" check_existence="all_exist"
+    comment="Tests that PORTAGE_GPG_DIR is non-empty">
+    <!-- PORTAGE_GPG_DIR declaration in make.conf -->
+    <ind-def:object object_ref="oval:org.gentoo.dev.swift:obj:19" />
+    <!-- Match for non-empty value -->
+    <ind-def:state state_ref="oval:org.gentoo.dev.swift:ste:12" />
+  </ind-def:textfilecontent54_test>
+
 </tests>
 
 <objects>
@@ -882,6 +906,13 @@
     <ind-def:instance operation="greater than or equal" datatype="int">1</ind-def:instance>
   </ind-def:textfilecontent54_object>
 
+  <ind-def:textfilecontent54_object id="oval:org.gentoo.dev.swift:obj:19"
+    version="1" comment="Portage make.conf PORTAGE_GPG_DIR settings">
+    <ind-def:filepath var_ref="oval:org.gentoo.dev.swift:var:1" />
+    <ind-def:pattern operation="pattern match">^PORTAGE_GPG_DIR="(.*)"</ind-def:pattern>
+    <ind-def:instance operation="greater than or equal" datatype="int">1</ind-def:instance>
+  </ind-def:textfilecontent54_object>
+
 </objects>
 
 <states>
@@ -941,6 +972,11 @@
     <ind-def:text datatype="string" operation="pattern match" entity_check="all">( |")webrsync-gpg( |")</ind-def:text>
   </ind-def:textfilecontent54_state>
 
+  <ind-def:textfilecontent54_state id="oval:org.gentoo.dev.swift:ste:12"
+    version="1" comment="Has a non-empty value">
+    <ind-def:subexpression datatype="string" operation="pattern match" entity_check="all">[\S]+</ind-def:subexpression>
+  </ind-def:textfilecontent54_state>
+
 </states>
 
 <variables>

diff --git a/xml/SCAP/gentoo-xccdf.xml b/xml/SCAP/gentoo-xccdf.xml
index fa9c357..548993c 100644
--- a/xml/SCAP/gentoo-xccdf.xml
+++ b/xml/SCAP/gentoo-xccdf.xml
@@ -97,6 +97,8 @@
     <select idref="xccdf_org.gentoo.dev.swift_rule_USE-ssl" selected="true" />
     <!-- Make sure FEATURES=webrsync-gpg is set -->
     <select idref="xccdf_org.gentoo.dev.swift_rule_FEATURES-webrsync-gpg" selected="true" />
+    <!-- Make sure PORTAGE_GPG_DIR is set -->
+    <select idref="xccdf_org.gentoo.dev.swift_rule_PORTAGE_GPG_DIR-nonempty" selected="true" />
   </Profile>
   <Profile id="xccdf_org.gentoo.dev.swift_profile_default" extends="xccdf_org.gentoo.dev.swift_profile_default-oval">
     <title>Default server setup settings</title>
@@ -1345,6 +1347,16 @@ SYNC=""</h:pre>
 	    <check-content-ref name="oval:org.gentoo.dev.swift:def:30" href="gentoo-oval.xml" />
 	  </check>
 	</Rule>
+        <Rule id="xccdf_org.gentoo.dev.swift_rule_PORTAGE_GPG_DIR-nonempty" selected="false" severity="low" weight="0.0">
+	  <title>PORTAGE_GPG_DIR is set</title>
+	  <fixtext fixref="xccdf_org.gentoo.dev.swift_fix_PORTAGE_GPG_DIR-nonempty">
+	    Edit /etc/portage/make.conf and make sure that PORTAGE_GPG_DIR is set correctly.
+	  </fixtext>
+	  <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+	    <check-content-ref name="oval:org.gentoo.dev.swift:def:31" href="gentoo-oval.xml" />
+	  </check>
+	</Rule>
+
       </Group>
     </Group>
     <Group id="xccdf_org.gentoo.dev.swift_group_system-kernel">