From 7eb56cdcf10730c90d572df5a439065e4df63bd1 Mon Sep 17 00:00:00 2001
From: skyanth <skyanth@gmail.com>
Date: Wed, 10 Apr 2019 09:34:14 +0200
Subject: [PATCH] added secrets switch to schema

---
 xml/dtd/pentestreport.xsd | 132 ++++++++++++++++++++------------------
 1 file changed, 71 insertions(+), 61 deletions(-)

diff --git a/xml/dtd/pentestreport.xsd b/xml/dtd/pentestreport.xsd
index 5580ea0..f6dce87 100644
--- a/xml/dtd/pentestreport.xsd
+++ b/xml/dtd/pentestreport.xsd
@@ -2,10 +2,12 @@
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xi="http://www.w3.org/2001/XInclude"
   xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning" vc:minVersion="1.0" vc:maxVersion="1.1">
-  <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd" />
-  <xs:import namespace="http://www.w3.org/2001/XInclude" schemaLocation="http://www.w3.org/2001/XInclude/XInclude.xsd"/>
+  <xs:import namespace="http://www.w3.org/XML/1998/namespace"
+    schemaLocation="http://www.w3.org/2001/xml.xsd"/>
+  <xs:import namespace="http://www.w3.org/2001/XInclude"
+    schemaLocation="http://www.w3.org/2001/XInclude/XInclude.xsd"/>
   <xs:include schemaLocation="common.xsd"/>
-  
+
   <xs:element name="pentest_report">
     <xs:complexType>
       <xs:sequence>
@@ -17,18 +19,26 @@
         <xs:element maxOccurs="unbounded" ref="appendix"/>
       </xs:sequence>
       <xs:attribute name="findingCode" use="required" type="xs:NCName"/>
-      <xs:attribute name="findingNumberingBase" use="optional" default="Report"> 
-        <xs:simpleType> 
-          <xs:restriction base="xs:string"> 
+      <xs:attribute name="findingNumberingBase" use="optional" default="Report">
+        <xs:simpleType>
+          <xs:restriction base="xs:string">
             <xs:enumeration value="Report"/>
             <xs:enumeration value="Section"/>
-          </xs:restriction> 
-        </xs:simpleType> 
+          </xs:restriction>
+        </xs:simpleType>
       </xs:attribute>
-    <xs:attribute ref="xml:lang"/>
+      <xs:attribute name="secrets" use="optional" default="show">
+        <xs:simpleType>
+          <xs:restriction base="xs:string">
+            <xs:enumeration value="hide"/>
+            <xs:enumeration value="show"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute ref="xml:lang"/>
     </xs:complexType>
   </xs:element>
-  
+
   <xs:element name="meta">
     <xs:complexType>
       <xs:sequence>
@@ -45,7 +55,7 @@
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  
+
   <xs:element name="activityinfo">
     <xs:complexType>
       <xs:sequence>
@@ -60,7 +70,7 @@
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  
+
   <xs:element name="collaborators">
     <xs:complexType>
       <xs:sequence>
@@ -70,7 +80,7 @@
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  
+
   <xs:element name="reviewers">
     <xs:complexType>
       <xs:sequence>
@@ -78,9 +88,9 @@
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  
+
   <xs:element name="reviewer" type="xs:string"/>
-  
+
   <xs:element name="approver">
     <xs:complexType>
       <xs:sequence>
@@ -89,7 +99,7 @@
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  
+
   <xs:element name="pentesters">
     <xs:complexType>
       <xs:sequence>
@@ -97,7 +107,7 @@
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  
+
   <xs:element name="pentester">
     <xs:complexType>
       <xs:sequence>
@@ -106,10 +116,10 @@
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  
+
   <xs:element name="bio" type="xs:string"/>
   <xs:element name="classification" type="xs:NCName"/>
-  
+
   <xs:element name="appendix">
     <xs:complexType>
       <xs:sequence>
@@ -128,10 +138,10 @@
       </xs:sequence>
       <xs:attribute name="id" use="required" type="xs:ID"/>
       <xs:attribute ref="visibility" use="optional"/>
-    <xs:attribute ref="xml:lang"/>
+      <xs:attribute ref="xml:lang"/>
     </xs:complexType>
   </xs:element>
-  
+
   <xs:complexType name="block" mixed="true">
     <xs:choice maxOccurs="unbounded">
       <xs:group ref="inline-all"/>
@@ -139,11 +149,11 @@
     </xs:choice>
     <xs:attribute ref="xml:base"/>
   </xs:complexType>
-  
+
   <xs:element name="generate_testteam">
     <xs:complexType/>
   </xs:element>
-  
+
   <xs:element name="section">
     <xs:complexType>
       <xs:sequence>
@@ -170,10 +180,10 @@
       <xs:attribute ref="visibility" use="optional"/>
       <xs:attribute ref="inexecsummary" use="optional"/>
       <xs:attribute ref="xml:base"/>
-    <xs:attribute ref="xml:lang"/>
+      <xs:attribute ref="xml:lang"/>
     </xs:complexType>
   </xs:element>
-  
+
   <xs:element name="generate_piechart">
     <xs:complexType>
       <xs:attribute ref="pieAttr" use="required"/>
@@ -183,13 +193,13 @@
       <xs:attribute ref="threshold" use="required"/>
     </xs:complexType>
   </xs:element>
-  
+
   <xs:attribute name="pieAttr" type="xs:string"/>
   <xs:attribute name="pieElem" type="xs:string"/>
   <xs:attribute name="pieHeight" type="xs:integer"/>
   <xs:attribute name="status" type="xs:string"/>
   <xs:attribute name="threshold" type="xs:integer"/>
-  
+
   <xs:attribute name="inexecsummary">
     <xs:simpleType>
       <xs:restriction base="xs:string">
@@ -198,21 +208,21 @@
       </xs:restriction>
     </xs:simpleType>
   </xs:attribute>
-  
+
   <xs:attribute name="threatLevel" default="N/A">
-        <xs:simpleType> 
-          <xs:restriction base="xs:string"> 
-            <xs:enumeration value="N/A"/>
-            <xs:enumeration value="Unknown"/>
-            <xs:enumeration value="Low"/>
-            <xs:enumeration value="Moderate"/>
-            <xs:enumeration value="Elevated"/>
-            <xs:enumeration value="High"/>
-            <xs:enumeration value="Extreme"/>
-          </xs:restriction> 
-        </xs:simpleType>
-      </xs:attribute>
-  
+    <xs:simpleType>
+      <xs:restriction base="xs:string">
+        <xs:enumeration value="N/A"/>
+        <xs:enumeration value="Unknown"/>
+        <xs:enumeration value="Low"/>
+        <xs:enumeration value="Moderate"/>
+        <xs:enumeration value="Elevated"/>
+        <xs:enumeration value="High"/>
+        <xs:enumeration value="Extreme"/>
+      </xs:restriction>
+    </xs:simpleType>
+  </xs:attribute>
+
   <xs:element name="non-finding">
     <xs:complexType>
       <xs:sequence>
@@ -232,19 +242,19 @@
       <xs:attribute ref="xml:base"/>
     </xs:complexType>
   </xs:element>
-  
-  
+
+
   <xs:element name="generate_recommendations">
     <xs:complexType>
       <xs:attribute name="Ref" use="optional" type="xs:IDREF"/>
       <xs:attribute name="status" use="optional">
-        <xs:simpleType> 
-          <xs:restriction base="xs:string"> 
+        <xs:simpleType>
+          <xs:restriction base="xs:string">
             <xs:enumeration value="new"/>
             <xs:enumeration value="resolved"/>
             <xs:enumeration value="unresolved"/>
             <xs:enumeration value="not_retested"/>
-          </xs:restriction> 
+          </xs:restriction>
         </xs:simpleType>
       </xs:attribute>
     </xs:complexType>
@@ -253,13 +263,13 @@
     <xs:complexType>
       <xs:attribute name="Ref" use="optional" type="xs:IDREF"/>
       <xs:attribute name="status" use="optional">
-        <xs:simpleType> 
-          <xs:restriction base="xs:string"> 
+        <xs:simpleType>
+          <xs:restriction base="xs:string">
             <xs:enumeration value="new"/>
             <xs:enumeration value="resolved"/>
             <xs:enumeration value="unresolved"/>
             <xs:enumeration value="not_retested"/>
-          </xs:restriction> 
+          </xs:restriction>
         </xs:simpleType>
       </xs:attribute>
     </xs:complexType>
@@ -285,22 +295,22 @@
       <xs:attribute name="id" use="required" type="xs:ID"/>
       <xs:attribute ref="threatLevel" use="optional" default="N/A"/>
       <xs:attribute name="status" use="optional">
-        <xs:simpleType> 
-          <xs:restriction base="xs:string"> 
+        <xs:simpleType>
+          <xs:restriction base="xs:string">
             <xs:enumeration value="new"/>
             <xs:enumeration value="resolved"/>
             <xs:enumeration value="unresolved"/>
             <xs:enumeration value="not_retested"/>
-          </xs:restriction> 
+          </xs:restriction>
         </xs:simpleType>
       </xs:attribute>
       <xs:attribute name="type" use="required"/>
       <xs:attribute name="break" use="optional">
-        <xs:simpleType> 
-          <xs:restriction base="xs:string"> 
+        <xs:simpleType>
+          <xs:restriction base="xs:string">
             <xs:enumeration value="before"/>
             <xs:enumeration value="after"/>
-          </xs:restriction> 
+          </xs:restriction>
         </xs:simpleType>
       </xs:attribute>
       <xs:attribute ref="xml:base"/>
@@ -339,7 +349,7 @@
       </xs:choice>
     </xs:complexType>
   </xs:element>
- 
+
   <xs:element name="impact">
     <xs:complexType mixed="true">
       <xs:choice maxOccurs="unbounded" minOccurs="0">
@@ -373,8 +383,8 @@
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  
-    <!-- Placeholders -->
+
+  <!-- Placeholders -->
   <xs:group name="placeholders">
     <xs:choice>
       <xs:element name="client_long"/>
@@ -408,7 +418,7 @@
       </xs:element>
       <xs:element name="todo"/>
     </xs:choice>
-    
-</xs:group>
-  
+
+  </xs:group>
+
 </xs:schema>