DeforaNetworks/pentext
3
0
Fork 0
Code Releases Activity

Renamed pentestinfo to activityinfo

Browse Source
This commit is contained in:
skyanth
2017-05-17 10:53:11 +02:00
parent 89dc3fefdb
commit 28f486d856
16 changed files with 67 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
xml/doc/examples/exampleofferte.xml
View File

@@ -27,7 +27,7 @@
<country>US</country> <country>US</country>
</party> </party>
</permission_parties> </permission_parties>
<pentestinfo> <activityinfo>
<duration>10</duration> <duration>10</duration>
<!--duration of pentest, in working days--> <!--duration of pentest, in working days-->
<test_planning>August 1st, 2016, lasting until August 13th, 2016</test_planning> <test_planning>August 1st, 2016, lasting until August 13th, 2016</test_planning>
@@ -42,7 +42,7 @@
<!--(euro|dollar)--> <!--(euro|dollar)-->
<target_application>FishInABarrel</target_application> <target_application>FishInABarrel</target_application>
<!--name of application/service to be tested (if any; if none, DELETE target_application element)--> <!--name of application/service to be tested (if any; if none, DELETE target_application element)-->
</pentestinfo> </activityinfo>
<version_history><!--needed for date on frontpage and in signature boxes; it is possible to add a new <version> after each review; in that case, make sure to update the date/time--> <version_history><!--needed for date on frontpage and in signature boxes; it is possible to add a new <version> after each review; in that case, make sure to update the date/time-->
<version number="auto" date="2016-07-08T10:00:00"><!--actual date-time here; you can leave the number attribute alone--> <version number="auto" date="2016-07-08T10:00:00"><!--actual date-time here; you can leave the number attribute alone-->
<v_author>ROS Writer</v_author> <v_author>ROS Writer</v_author>

6
xml/doc/offerte/Offerte Writing Procedure.md
View File

@@ -113,11 +113,11 @@ Example:
### Pentest Info ### Pentest Info
The `<pentestinfo>` element contains some data about the pentest itself. This element is useful as you can refer to its content using placeholders, allowing e.g. for standard referrals to the tested application name, pentest type or pentest duration. The `<activityinfo>` element contains some data about the pentest itself. This element is useful as you can refer to its content using placeholders, allowing e.g. for standard referrals to the tested application name, pentest type or pentest duration.
Example: Example:
<pentestinfo> <activityinfo>
<duration>10</duration><!-- duration of pentest, in working days --> <duration>10</duration><!-- duration of pentest, in working days -->
<test_planning>January 1st until January 12th, 2015</test_planning> <!-- date or date range in text, e.g. May 18th until May 25th, 2015 --> <test_planning>January 1st until January 12th, 2015</test_planning> <!-- date or date range in text, e.g. May 18th until May 25th, 2015 -->
<report_writing>January 15th until January 20th, 2015</report_writing> <!-- date or date range in text, e.g. May 18th until May 25th, 2015 --> <report_writing>January 15th until January 20th, 2015</report_writing> <!-- date or date range in text, e.g. May 18th until May 25th, 2015 -->
@@ -127,7 +127,7 @@ Example:
<fee>50000</fee><!-- euro is added automatically in the document --> <fee>50000</fee><!-- euro is added automatically in the document -->
<target_application>FishInABarrel</target_application><!-- name of application to be tested (if any) --> <target_application>FishInABarrel</target_application><!-- name of application to be tested (if any) -->
<target_application_producer>H4ckers 'R' Us</target_application_producer> <target_application_producer>H4ckers 'R' Us</target_application_producer>
</pentestinfo> </activityinfo>
### Version History ### Version History

6
xml/doc/offerte/offerte.html
View File

@@ -66,9 +66,9 @@
&lt;target&gt;Sitting Duck&#39;s support staff&lt;/target&gt; &lt;target&gt;Sitting Duck&#39;s support staff&lt;/target&gt;
&lt;targets&gt;</code></pre> &lt;targets&gt;</code></pre>
<h3 id="pentest-info">Pentest Info</h3> <h3 id="pentest-info">Pentest Info</h3>
<p>The <code>&lt;pentestinfo&gt;</code> element contains some data about the pentest itself. This element is useful as you can refer to its content using placeholders, allowing e.g. for standard referrals to the tested application name, pentest type or pentest duration.</p> <p>The <code>&lt;activityinfo&gt;</code> element contains some data about the pentest itself. This element is useful as you can refer to its content using placeholders, allowing e.g. for standard referrals to the tested application name, pentest type or pentest duration.</p>
<p>Example:</p> <p>Example:</p>
<pre><code>&lt;pentestinfo&gt; <pre><code>&lt;activityinfo&gt;
&lt;duration&gt;10&lt;/duration&gt;&lt;!-- duration of pentest, in working days --&gt; &lt;duration&gt;10&lt;/duration&gt;&lt;!-- duration of pentest, in working days --&gt;
&lt;test_planning&gt;January 1st until January 12th, 2015&lt;/test_planning&gt; &lt;!-- date or date range in text, e.g. May 18th until May 25th, 2015 --&gt; &lt;test_planning&gt;January 1st until January 12th, 2015&lt;/test_planning&gt; &lt;!-- date or date range in text, e.g. May 18th until May 25th, 2015 --&gt;
&lt;report_writing&gt;January 15th until January 20th, 2015&lt;/report_writing&gt; &lt;!-- date or date range in text, e.g. May 18th until May 25th, 2015 --&gt; &lt;report_writing&gt;January 15th until January 20th, 2015&lt;/report_writing&gt; &lt;!-- date or date range in text, e.g. May 18th until May 25th, 2015 --&gt;
@@ -78,7 +78,7 @@
&lt;fee&gt;50000&lt;/fee&gt;&lt;!-- euro is added automatically in the document --&gt; &lt;fee&gt;50000&lt;/fee&gt;&lt;!-- euro is added automatically in the document --&gt;
&lt;target_application&gt;FishInABarrel&lt;/target_application&gt;&lt;!-- name of application to be tested (if any) --&gt; &lt;target_application&gt;FishInABarrel&lt;/target_application&gt;&lt;!-- name of application to be tested (if any) --&gt;
&lt;target_application_producer&gt;H4ckers &#39;R&#39; Us&lt;/target_application_producer&gt; &lt;target_application_producer&gt;H4ckers &#39;R&#39; Us&lt;/target_application_producer&gt;
&lt;/pentestinfo&gt;</code></pre> &lt;/activityinfo&gt;</code></pre>
<h3 id="version-history">Version History</h3> <h3 id="version-history">Version History</h3>
<p>The <code>&lt;version_history&gt;</code> element contains one or more <code>&lt;version&gt;</code> elements, one for each version of the document you create. Whenever you start a new version, add a <code>&lt;version&gt;</code> element to the list.</p> <p>The <code>&lt;version_history&gt;</code> element contains one or more <code>&lt;version&gt;</code> elements, one for each version of the document you create. Whenever you start a new version, add a <code>&lt;version&gt;</code> element to the list.</p>
<p>The <code>&lt;version&gt;</code> element should contain the following:</p> <p>The <code>&lt;version&gt;</code> element should contain the following:</p>

8
xml/doc/report/Report Writing - Procedure.md
View File

@@ -50,7 +50,7 @@ TODO
- The document title, in the `<title>` element - The document title, in the `<title>` element
- Client information, in the `<client>` element - Client information, in the `<client>` element
- Targets listing, in the `<targets>` element - Targets listing, in the `<targets>` element
- (Optionally) Pentest-related information, in the `<pentestinfo>` element - (Optionally) Pentest-related information, in the `<activityinfo>` element
- People who worked on the pentest and/or report, in the - People who worked on the pentest and/or report, in the
`<collaborators>` element `<collaborators>` element
- Document classification, in the `<classification>` element - Document classification, in the `<classification>` element
@@ -102,11 +102,11 @@ Example:
### Pentest Info ### Pentest Info
The `<pentestinfo>` element contains some data about the pentest itself. This element is optional, but may be useful as you can refer to its content using placeholders, allowing e.g. for standard referrals to the tested application name, pentest type or pentest duration. The `<activityinfo>` element contains some data about the pentest itself. This element is optional, but may be useful as you can refer to its content using placeholders, allowing e.g. for standard referrals to the tested application name, pentest type or pentest duration.
Example: Example:
<pentestinfo> <activityinfo>
<duration>10</duration><!-- duration of pentest, in working days --> <duration>10</duration><!-- duration of pentest, in working days -->
<test_planning>January 1st until January 12th, 2015</test_planning> <!-- date or date range in text, e.g. May 18th until May 25th, 2015 --> <test_planning>January 1st until January 12th, 2015</test_planning> <!-- date or date range in text, e.g. May 18th until May 25th, 2015 -->
<report_writing>January 15th until January 20th, 2015</report_writing> <!-- date or date range in text, e.g. May 18th until May 25th, 2015 --> <report_writing>January 15th until January 20th, 2015</report_writing> <!-- date or date range in text, e.g. May 18th until May 25th, 2015 -->
@@ -115,7 +115,7 @@ Example:
<type>black-box</type><!-- please choose one of the following: black-box, grey-box, crystal-box --> <type>black-box</type><!-- please choose one of the following: black-box, grey-box, crystal-box -->
<target_application>FishInABarrel</target_application><!-- name of application to be tested (if any) --> <target_application>FishInABarrel</target_application><!-- name of application to be tested (if any) -->
<target_application_producer>H4ckers 'R' Us</target_application_producer> <target_application_producer>H4ckers 'R' Us</target_application_producer>
</pentestinfo> </activityinfo>
### Collaborators ### Collaborators

8
xml/doc/report/report.html
View File

@@ -23,7 +23,7 @@
<li>The document title, in the <code>&lt;title&gt;</code> element</li> <li>The document title, in the <code>&lt;title&gt;</code> element</li>
<li>Client information, in the <code>&lt;client&gt;</code> element</li> <li>Client information, in the <code>&lt;client&gt;</code> element</li>
<li>Targets listing, in the <code>&lt;targets&gt;</code> element</li> <li>Targets listing, in the <code>&lt;targets&gt;</code> element</li>
<li>(Optionally) Pentest-related information, in the <code>&lt;pentestinfo&gt;</code> element</li> <li>(Optionally) Pentest-related information, in the <code>&lt;activityinfo&gt;</code> element</li>
<li>People who worked on the pentest and/or report, in the <code>&lt;collaborators&gt;</code> element</li> <li>People who worked on the pentest and/or report, in the <code>&lt;collaborators&gt;</code> element</li>
<li>Document classification, in the <code>&lt;classification&gt;</code> element</li> <li>Document classification, in the <code>&lt;classification&gt;</code> element</li>
<li>The document's version history, in the <code>&lt;version_history&gt;</code> element</li> <li>The document's version history, in the <code>&lt;version_history&gt;</code> element</li>
@@ -53,9 +53,9 @@
&lt;target&gt;Sitting Duck&#39;s support staff&lt;/target&gt; &lt;target&gt;Sitting Duck&#39;s support staff&lt;/target&gt;
&lt;targets&gt;</code></pre> &lt;targets&gt;</code></pre>
<h3 id="pentest-info">Pentest Info</h3> <h3 id="pentest-info">Pentest Info</h3>
<p>The <code>&lt;pentestinfo&gt;</code> element contains some data about the pentest itself. This element is optional, but may be useful as you can refer to its content using placeholders, allowing e.g. for standard referrals to the tested application name, pentest type or pentest duration.</p> <p>The <code>&lt;activityinfo&gt;</code> element contains some data about the pentest itself. This element is optional, but may be useful as you can refer to its content using placeholders, allowing e.g. for standard referrals to the tested application name, pentest type or pentest duration.</p>
<p>Example:</p> <p>Example:</p>
<pre><code>&lt;pentestinfo&gt; <pre><code>&lt;activityinfo&gt;
&lt;duration&gt;10&lt;/duration&gt;&lt;!-- duration of pentest, in working days --&gt; &lt;duration&gt;10&lt;/duration&gt;&lt;!-- duration of pentest, in working days --&gt;
&lt;test_planning&gt;January 1st until January 12th, 2015&lt;/test_planning&gt; &lt;!-- date or date range in text, e.g. May 18th until May 25th, 2015 --&gt; &lt;test_planning&gt;January 1st until January 12th, 2015&lt;/test_planning&gt; &lt;!-- date or date range in text, e.g. May 18th until May 25th, 2015 --&gt;
&lt;report_writing&gt;January 15th until January 20th, 2015&lt;/report_writing&gt; &lt;!-- date or date range in text, e.g. May 18th until May 25th, 2015 --&gt; &lt;report_writing&gt;January 15th until January 20th, 2015&lt;/report_writing&gt; &lt;!-- date or date range in text, e.g. May 18th until May 25th, 2015 --&gt;
@@ -64,7 +64,7 @@
&lt;type&gt;black-box&lt;/type&gt;&lt;!-- please choose one of the following: black-box, grey-box, crystal-box --&gt; &lt;type&gt;black-box&lt;/type&gt;&lt;!-- please choose one of the following: black-box, grey-box, crystal-box --&gt;
&lt;target_application&gt;FishInABarrel&lt;/target_application&gt;&lt;!-- name of application to be tested (if any) --&gt; &lt;target_application&gt;FishInABarrel&lt;/target_application&gt;&lt;!-- name of application to be tested (if any) --&gt;
&lt;target_application_producer&gt;H4ckers &#39;R&#39; Us&lt;/target_application_producer&gt; &lt;target_application_producer&gt;H4ckers &#39;R&#39; Us&lt;/target_application_producer&gt;
&lt;/pentestinfo&gt;</code></pre> &lt;/activityinfo&gt;</code></pre>
<h3 id="collaborators">Collaborators</h3> <h3 id="collaborators">Collaborators</h3>
<p>The <code>&lt;collaborators&gt;</code> element contains three other elements, mandatory and in the listed order:</p> <p>The <code>&lt;collaborators&gt;</code> element contains three other elements, mandatory and in the listed order:</p>
<ul> <ul>

4
xml/dtd/offerte.xsd
View File

@@ -29,7 +29,7 @@
<xs:element ref="company"/> <xs:element ref="company"/>
<xs:element ref="targets"/> <xs:element ref="targets"/>
<xs:element ref="permission_parties"/> <xs:element ref="permission_parties"/>
<xs:element ref="pentestinfo"/> <xs:element ref="activityinfo"/>
<xs:element ref="version_history"/> <xs:element ref="version_history"/>
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
@@ -40,7 +40,7 @@
<xs:element name="pentestinfo"> <xs:element name="activityinfo">
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
<xs:element ref="duration"/> <xs:element ref="duration"/>

4
xml/dtd/pentestreport.xsd
View File

@@ -34,7 +34,7 @@
<xs:sequence> <xs:sequence>
<xs:element ref="title"/> <xs:element ref="title"/>
<xs:element ref="targets"/> <xs:element ref="targets"/>
<xs:element ref="pentestinfo" minOccurs="0"/> <xs:element ref="activityinfo" minOccurs="0"/>
<xs:element ref="permission_parties"/> <xs:element ref="permission_parties"/>
<xs:element ref="collaborators"/> <xs:element ref="collaborators"/>
<xs:element ref="classification"/> <xs:element ref="classification"/>
@@ -44,7 +44,7 @@
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:element name="pentestinfo"> <xs:element name="activityinfo">
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
<xs:element ref="duration"/> <xs:element ref="duration"/>

16
xml/templates/offerte/offerte_EN.xml
View File

@@ -17,12 +17,12 @@
<!-- PROJECT --> <!-- PROJECT -->
<!-- <p_duration/> number of days; value taken from /offerte/meta/pentestinfo/duration --> <!-- <p_duration/> number of days; value taken from /offerte/meta/activityinfo/duration -->
<!-- <p_boxtype/> pentest type; value taken from /offerte/meta/pentestinfo/type --> <!-- <p_boxtype/> pentest type; value taken from /offerte/meta/activityinfo/type -->
<!-- <p_fee/> fee value taken from /offerte/meta/pentestinfo/fee --> <!-- <p_fee/> fee value taken from /offerte/meta/activityinfo/fee -->
<!-- <p_testingduration/> value taken from /offerte/meta/pentestinfo/test_planning --> <!-- <p_testingduration/> value taken from /offerte/meta/activityinfo/test_planning -->
<!-- <p_reportwritingduration/> value taken from /offerte/meta/pentestinfo/report_writing --> <!-- <p_reportwritingduration/> value taken from /offerte/meta/activityinfo/report_writing -->
<!-- <p_reportdue/> value taken from /offerte/meta/pentestinfo/report_due --> <!-- <p_reportdue/> value taken from /offerte/meta/activityinfo/report_due -->
<!-- US --> <!-- US -->
@@ -64,7 +64,7 @@
</party> </party>
</permission_parties> </permission_parties>
<pentestinfo> <activityinfo>
<duration>...</duration><!-- duration of pentest, in working DAYS --> <duration>...</duration><!-- duration of pentest, in working DAYS -->
<test_planning>...</test_planning><!-- date or date range in text, e.g. May 18th until May 25th, 2015 --> <test_planning>...</test_planning><!-- date or date range in text, e.g. May 18th until May 25th, 2015 -->
<report_writing>...</report_writing><!-- date or date range in text, e.g. May 18th until May 25th, 2015 --> <report_writing>...</report_writing><!-- date or date range in text, e.g. May 18th until May 25th, 2015 -->
@@ -74,7 +74,7 @@
<fee denomination="euro">0</fee><!-- euro is added automatically in the document --> <fee denomination="euro">0</fee><!-- euro is added automatically in the document -->
<target_application>...</target_application><!-- name of application to be tested (if any; if none, delete target_application element) --> <target_application>...</target_application><!-- name of application to be tested (if any; if none, delete target_application element) -->
<target_app_producer>...</target_app_producer><!-- name of application to be tested (if any; if none, delete target_application_producer element) --> <target_app_producer>...</target_app_producer><!-- name of application to be tested (if any; if none, delete target_application_producer element) -->
</pentestinfo> </activityinfo>
<version_history><!-- needed for date on frontpage and in signature boxes; add a new <version> after each review and make sure to update the date/time --> <version_history><!-- needed for date on frontpage and in signature boxes; add a new <version> after each review and make sure to update the date/time -->
<version date="2015-06-08T10:00:00" number="auto"><!-- actual date-time here; you can leave the number attribute alone --> <version date="2015-06-08T10:00:00" number="auto"><!-- actual date-time here; you can leave the number attribute alone -->
<v_author>ROS Writer</v_author><!-- name of the author here --> <v_author>ROS Writer</v_author><!-- name of the author here -->

16
xml/templates/offerte/offerte_NL.xml
View File

@@ -18,12 +18,12 @@
<!-- PROJECT --> <!-- PROJECT -->
<!-- <p_duration/> number of days; value taken from /offerte/meta/pentestinfo/duration --> <!-- <p_duration/> number of days; value taken from /offerte/meta/activityinfo/duration -->
<!-- <p_boxtype/> pentest type; value taken from /offerte/meta/pentestinfo/type --> <!-- <p_boxtype/> pentest type; value taken from /offerte/meta/activityinfo/type -->
<!-- <p_fee/> fee value taken from /offerte/meta/pentestinfo/fee --> <!-- <p_fee/> fee value taken from /offerte/meta/activityinfo/fee -->
<!-- <p_testingduration/> value taken from /offerte/meta/pentestinfo/test_planning --> <!-- <p_testingduration/> value taken from /offerte/meta/activityinfo/test_planning -->
<!-- <p_reportwritingduration/> value taken from /offerte/meta/pentestinfo/report_writing --> <!-- <p_reportwritingduration/> value taken from /offerte/meta/activityinfo/report_writing -->
<!-- <p_reportdue/> value taken from /offerte/meta/pentestinfo/report_due --> <!-- <p_reportdue/> value taken from /offerte/meta/activityinfo/report_due -->
<!-- US --> <!-- US -->
@@ -63,7 +63,7 @@
<country>...</country> <country>...</country>
</party> </party>
</permission_parties> </permission_parties>
<pentestinfo> <activityinfo>
<duration>...</duration><!-- duration of pentest, in working DAYS --> <duration>...</duration><!-- duration of pentest, in working DAYS -->
<test_planning>...</test_planning><!-- date or date range in text, e.g. May 18th until May 25th, 2015 --> <test_planning>...</test_planning><!-- date or date range in text, e.g. May 18th until May 25th, 2015 -->
<report_writing>...</report_writing><!-- date or date range in text, e.g. May 18th until May 25th, 2015 --> <report_writing>...</report_writing><!-- date or date range in text, e.g. May 18th until May 25th, 2015 -->
@@ -73,7 +73,7 @@
<fee denomination="euro">...</fee><!-- euro|dollar --> <fee denomination="euro">...</fee><!-- euro|dollar -->
<target_application>...</target_application><!-- name of application to be tested (if any; if none, delete target_application element) --> <target_application>...</target_application><!-- name of application to be tested (if any; if none, delete target_application element) -->
<target_application_producer>...</target_application_producer><!-- name of application to be tested (if any; if none, delete target_application_producer element) --> <target_application_producer>...</target_application_producer><!-- name of application to be tested (if any; if none, delete target_application_producer element) -->
</pentestinfo> </activityinfo>
<version_history><!-- needed for date on frontpage and in signature boxes; add a new <version> after each review and make sure to update the date/time --> <version_history><!-- needed for date on frontpage and in signature boxes; add a new <version> after each review and make sure to update the date/time -->
<version date="2015-06-08T10:00:00" number="auto"><!-- actual date-time here; you can leave the number attribute alone --> <version date="2015-06-08T10:00:00" number="auto"><!-- actual date-time here; you can leave the number attribute alone -->
<v_author>ROS Writer</v_author><!-- name of the author here --> <v_author>ROS Writer</v_author><!-- name of the author here -->

10
xml/xslt/generate_invoice.xsl
View File

@@ -58,13 +58,13 @@
<!-- CONTENT --> <!-- CONTENT -->
<xsl:template name="invoice_from_offerte"> <xsl:template name="invoice_from_offerte">
<xsl:variable name="fee" select="/offerte/meta/pentestinfo/fee * 1"/> <xsl:variable name="fee" select="/offerte/meta/activityinfo/fee * 1"/>
<xsl:variable name="vat" select="$fee div 100 * 21"/> <xsl:variable name="vat" select="$fee div 100 * 21"/>
<xsl:variable name="denomination"> <xsl:variable name="denomination">
<xsl:choose> <xsl:choose>
<xsl:when test="/offerte/meta/pentestinfo/fee/@denomination = 'eur'">€</xsl:when> <xsl:when test="/offerte/meta/activityinfo/fee/@denomination = 'eur'">€</xsl:when>
<xsl:when test="/offerte/meta/pentestinfo/fee/@denomination = 'gbp'">£</xsl:when> <xsl:when test="/offerte/meta/activityinfo/fee/@denomination = 'gbp'">£</xsl:when>
<xsl:when test="/offerte/meta/pentestinfo/fee/@denomination = 'usd'">$</xsl:when> <xsl:when test="/offerte/meta/activityinfo/fee/@denomination = 'usd'">$</xsl:when>
</xsl:choose> </xsl:choose>
</xsl:variable> </xsl:variable>
<xsl:call-template name="invoiceStart"> <xsl:call-template name="invoiceStart">
@@ -73,7 +73,7 @@
/> />
</xsl:call-template> </xsl:call-template>
<xsl:variable name="serviceDescription"> <xsl:variable name="serviceDescription">
<xsl:value-of select="/offerte/meta/pentestinfo/duration"/><xsl:text>-</xsl:text><xsl:call-template name="getString"><xsl:with-param <xsl:value-of select="/offerte/meta/activityinfo/duration"/><xsl:text>-</xsl:text><xsl:call-template name="getString"><xsl:with-param
name="stringID" select="'invoice_days'" name="stringID" select="'invoice_days'"
/></xsl:call-template>&#160;<xsl:value-of /></xsl:call-template>&#160;<xsl:value-of
select="/offerte/meta/offered_service_short" select="/offerte/meta/offered_service_short"

6
xml/xslt/generate_offerte.xsl
View File

@@ -63,9 +63,9 @@
<xsl:variable name="denomination"> <xsl:variable name="denomination">
<xsl:choose> <xsl:choose>
<xsl:when test="/offerte/meta/pentestinfo/fee/@denomination = 'eur'">€</xsl:when> <xsl:when test="/offerte/meta/activityinfo/fee/@denomination = 'eur'">€</xsl:when>
<xsl:when test="/offerte/meta/pentestinfo/fee/@denomination = 'usd'">$</xsl:when> <xsl:when test="/offerte/meta/activityinfo/fee/@denomination = 'usd'">$</xsl:when>
<xsl:when test="/offerte/meta/pentestinfo/fee/@denomination = 'gbp'">£</xsl:when> <xsl:when test="/offerte/meta/activityinfo/fee/@denomination = 'gbp'">£</xsl:when>
</xsl:choose> </xsl:choose>
</xsl:variable> </xsl:variable>

6
xml/xslt/off2inv.xsl
View File

@@ -30,7 +30,7 @@
<xsl:value-of select="$lang"/> <xsl:value-of select="$lang"/>
</xsl:attribute> </xsl:attribute>
<xsl:attribute name="denomination"> <xsl:attribute name="denomination">
<xsl:value-of select="/offerte/meta/pentestinfo/fee/@denomination"/> <xsl:value-of select="/offerte/meta/activityinfo/fee/@denomination"/>
</xsl:attribute> </xsl:attribute>
<meta> <meta>
<xsl:element name="xi:include"> <xsl:element name="xi:include">
@@ -44,13 +44,13 @@
<xsl:comment>Add/delete &lt;service> elements as needed</xsl:comment> <xsl:comment>Add/delete &lt;service> elements as needed</xsl:comment>
<service> <service>
<description> <description>
<xsl:value-of select="/offerte/meta/pentestinfo/duration" <xsl:value-of select="/offerte/meta/activityinfo/duration"
/>-<xsl:call-template name="getString"><xsl:with-param name="stringID" select="'invoice_days'"/></xsl:call-template>&#160;<xsl:value-of select="/offerte/meta/offered_service_short" />-<xsl:call-template name="getString"><xsl:with-param name="stringID" select="'invoice_days'"/></xsl:call-template>&#160;<xsl:value-of select="/offerte/meta/offered_service_short"
/>&#160;<xsl:value-of />&#160;<xsl:value-of
select="/offerte/meta/permission_parties/client/short_name"/> select="/offerte/meta/permission_parties/client/short_name"/>
</description> </description>
<fee vat="yes"> <fee vat="yes">
<xsl:value-of select="/offerte/meta/pentestinfo/fee"/> <xsl:value-of select="/offerte/meta/activityinfo/fee"/>
</fee> </fee>
</service> </service>
</servicesdelivered> </servicesdelivered>

6
xml/xslt/off2rep.xsl
View File

@@ -21,15 +21,15 @@
</xsl:copy> </xsl:copy>
</xsl:for-each> </xsl:for-each>
</targets> </targets>
<pentestinfo> <activityinfo>
<xsl:for-each select="/offerte/meta/pentestinfo/*"> <xsl:for-each select="/offerte/meta/activityinfo/*">
<xsl:if test="not(self::fee)"> <xsl:if test="not(self::fee)">
<xsl:copy> <xsl:copy>
<xsl:copy-of select="node()"/> <xsl:copy-of select="node()"/>
</xsl:copy> </xsl:copy>
</xsl:if> </xsl:if>
</xsl:for-each> </xsl:for-each>
</pentestinfo> </activityinfo>
<permission_parties> <permission_parties>
<xsl:element name="xi:include"> <xsl:element name="xi:include">
<xsl:attribute name="href">client_info.xml</xsl:attribute> <xsl:attribute name="href">client_info.xml</xsl:attribute>

16
xml/xslt/placeholders.xslt
View File

@@ -135,38 +135,38 @@
</xsl:template> </xsl:template>
<xsl:template match="t_app"> <xsl:template match="t_app">
<xsl:param name="placeholderElement" <xsl:param name="placeholderElement"
select="/offerte/meta/pentestinfo/target_application | /pentest_report/meta/pentestinfo/target_application"/> select="/offerte/meta/activityinfo/target_application | /pentest_report/meta/activityinfo/target_application"/>
<xsl:call-template name="checkPlaceholder"> <xsl:call-template name="checkPlaceholder">
<xsl:with-param name="placeholderElement" select="$placeholderElement"/> <xsl:with-param name="placeholderElement" select="$placeholderElement"/>
</xsl:call-template> </xsl:call-template>
</xsl:template> </xsl:template>
<xsl:template match="t_app_producer"> <xsl:template match="t_app_producer">
<xsl:param name="placeholderElement" <xsl:param name="placeholderElement"
select="/offerte/meta/pentestinfo/target_application_producer | /pentest_report/meta/pentestinfo/target_application_producer"/> select="/offerte/meta/activityinfo/target_application_producer | /pentest_report/meta/activityinfo/target_application_producer"/>
<xsl:call-template name="checkPlaceholder"> <xsl:call-template name="checkPlaceholder">
<xsl:with-param name="placeholderElement" select="$placeholderElement"/> <xsl:with-param name="placeholderElement" select="$placeholderElement"/>
</xsl:call-template> </xsl:call-template>
</xsl:template> </xsl:template>
<xsl:template match="p_duration"> <xsl:template match="p_duration">
<xsl:param name="placeholderElement" select="/*/meta/pentestinfo/duration"/> <xsl:param name="placeholderElement" select="/*/meta/activityinfo/duration"/>
<xsl:call-template name="checkPlaceholder"> <xsl:call-template name="checkPlaceholder">
<xsl:with-param name="placeholderElement" select="$placeholderElement"/> <xsl:with-param name="placeholderElement" select="$placeholderElement"/>
</xsl:call-template> </xsl:call-template>
</xsl:template> </xsl:template>
<xsl:template match="p_persondays"> <xsl:template match="p_persondays">
<xsl:param name="placeholderElement" select="/*/meta/pentestinfo/persondays"/> <xsl:param name="placeholderElement" select="/*/meta/activityinfo/persondays"/>
<xsl:call-template name="checkPlaceholder"> <xsl:call-template name="checkPlaceholder">
<xsl:with-param name="placeholderElement" select="$placeholderElement"/> <xsl:with-param name="placeholderElement" select="$placeholderElement"/>
</xsl:call-template> </xsl:call-template>
</xsl:template> </xsl:template>
<xsl:template match="p_boxtype"> <xsl:template match="p_boxtype">
<xsl:param name="placeholderElement" select="/*/meta/pentestinfo/type"/> <xsl:param name="placeholderElement" select="/*/meta/activityinfo/type"/>
<xsl:call-template name="checkPlaceholder"> <xsl:call-template name="checkPlaceholder">
<xsl:with-param name="placeholderElement" select="$placeholderElement"/> <xsl:with-param name="placeholderElement" select="$placeholderElement"/>
</xsl:call-template> </xsl:call-template>
</xsl:template> </xsl:template>
<xsl:template match="p_fee"> <xsl:template match="p_fee">
<xsl:param name="placeholderElement" select="/*/meta/pentestinfo/fee"/> <xsl:param name="placeholderElement" select="/*/meta/activityinfo/fee"/>
<xsl:value-of select="$denomination"/> <xsl:value-of select="$denomination"/>
<xsl:text>&#160;</xsl:text> <xsl:text>&#160;</xsl:text>
<xsl:call-template name="checkPlaceholder"> <xsl:call-template name="checkPlaceholder">
@@ -174,13 +174,13 @@
</xsl:call-template> </xsl:call-template>
</xsl:template> </xsl:template>
<xsl:template match="p_testingduration"> <xsl:template match="p_testingduration">
<xsl:param name="placeholderElement" select="/*/meta/pentestinfo/test_planning"/> <xsl:param name="placeholderElement" select="/*/meta/activityinfo/test_planning"/>
<xsl:call-template name="checkPlaceholder"> <xsl:call-template name="checkPlaceholder">
<xsl:with-param name="placeholderElement" select="$placeholderElement"/> <xsl:with-param name="placeholderElement" select="$placeholderElement"/>
</xsl:call-template> </xsl:call-template>
</xsl:template> </xsl:template>
<xsl:template match="p_reportdue"> <xsl:template match="p_reportdue">
<xsl:param name="placeholderElement" select="/*/meta/pentestinfo/report_due"/> <xsl:param name="placeholderElement" select="/*/meta/activityinfo/report_due"/>
<xsl:call-template name="checkPlaceholder"> <xsl:call-template name="checkPlaceholder">
<xsl:with-param name="placeholderElement" select="$placeholderElement"/> <xsl:with-param name="placeholderElement" select="$placeholderElement"/>
</xsl:call-template> </xsl:call-template>

6
xml/xslt/qs2offerte.xsl
View File

@@ -66,7 +66,7 @@
<targets> <targets>
<!-- copy targets from quickscope --> <!-- copy targets from quickscope -->
<xsl:comment>one target element per target</xsl:comment> <xsl:comment>one target element per target</xsl:comment>
<xsl:for-each select="/*/meta/targets/target"> <xsl:for-each select="//targets/target">
<xsl:copy> <xsl:copy>
<xsl:copy-of select="node()"/> <xsl:copy-of select="node()"/>
</xsl:copy> </xsl:copy>
@@ -83,7 +83,7 @@
</party> </party>
</xsl:for-each> </xsl:for-each>
</permission_parties> </permission_parties>
<pentestinfo> <activityinfo>
<!-- copy various variables from quickscope --> <!-- copy various variables from quickscope -->
<duration> <duration>
<xsl:value-of select="/*/activity_info/days"/> <xsl:value-of select="/*/activity_info/days"/>
@@ -119,7 +119,7 @@
<xsl:comment>name of application/service to be tested (if any; if none, DELETE target_application element)</xsl:comment> <xsl:comment>name of application/service to be tested (if any; if none, DELETE target_application element)</xsl:comment>
</xsl:if> </xsl:if>
</pentestinfo> </activityinfo>
<version_history> <version_history>
<xsl:comment>needed for date on frontpage and in signature boxes; it is possible to add a new &lt;version> after each review; in that case, make sure to update the date/time</xsl:comment> <xsl:comment>needed for date on frontpage and in signature boxes; it is possible to add a new &lt;version> after each review; in that case, make sure to update the date/time</xsl:comment>
<version number="auto"> <version number="auto">

12
xml/xslt/rep2off.xsl
View File

@@ -73,7 +73,7 @@
</party> </party>
</xsl:for-each> </xsl:for-each>
</permission_parties> </permission_parties>
<pentestinfo> <activityinfo>
<!-- copy various variables from quickscope --> <!-- copy various variables from quickscope -->
<duration>2</duration> <duration>2</duration>
<xsl:comment>duration of pentest, in working days</xsl:comment> <xsl:comment>duration of pentest, in working days</xsl:comment>
@@ -81,7 +81,7 @@
<xsl:comment>duration of pentest, in persondays</xsl:comment> <xsl:comment>duration of pentest, in persondays</xsl:comment>
<test_planning> <test_planning>
<xsl:choose> <xsl:choose>
<xsl:when test="/*/pentestinfo/test_planning"> <xsl:when test="/*/activityinfo/test_planning">
<xsl:value-of select="/*/activity_info/test_planning"/> <xsl:value-of select="/*/activity_info/test_planning"/>
</xsl:when> </xsl:when>
<xsl:otherwise>TBD</xsl:otherwise> <xsl:otherwise>TBD</xsl:otherwise>
@@ -90,7 +90,7 @@
<xsl:comment>date or date range in text, e.g. May 18th until May 25th, 2015</xsl:comment> <xsl:comment>date or date range in text, e.g. May 18th until May 25th, 2015</xsl:comment>
<report_due> <report_due>
<xsl:choose> <xsl:choose>
<xsl:when test="/*/pentestinfo/report_due"> <xsl:when test="/*/activityinfo/report_due">
<xsl:value-of select="/*/activity_info/report_due"/> <xsl:value-of select="/*/activity_info/report_due"/>
</xsl:when> </xsl:when>
<xsl:otherwise>TBD</xsl:otherwise> <xsl:otherwise>TBD</xsl:otherwise>
@@ -99,7 +99,7 @@
<xsl:comment>date or date range in text, e.g. May 18th until May 25th, 2015</xsl:comment> <xsl:comment>date or date range in text, e.g. May 18th until May 25th, 2015</xsl:comment>
<nature> <nature>
<xsl:choose> <xsl:choose>
<xsl:when test="/*/pentestinfo/nature"> <xsl:when test="/*/activityinfo/nature">
<xsl:value-of select="/*/activity_info/nature"/> <xsl:value-of select="/*/activity_info/nature"/>
</xsl:when> </xsl:when>
<xsl:otherwise>time-boxed</xsl:otherwise> <xsl:otherwise>time-boxed</xsl:otherwise>
@@ -107,7 +107,7 @@
</nature> </nature>
<type> <type>
<xsl:choose> <xsl:choose>
<xsl:when test="/*/pentestinfo/type"> <xsl:when test="/*/activityinfo/type">
<xsl:value-of select="/*/activity_info/type"/> <xsl:value-of select="/*/activity_info/type"/>
</xsl:when> </xsl:when>
<xsl:otherwise>crystal-box</xsl:otherwise> <xsl:otherwise>crystal-box</xsl:otherwise>
@@ -121,7 +121,7 @@
<xsl:value-of select="/*/activity_info/target_application"/> <xsl:value-of select="/*/activity_info/target_application"/>
</target_application> </target_application>
</xsl:if> </xsl:if>
</pentestinfo> </activityinfo>
<version_history> <version_history>
<xsl:comment>needed for date on frontpage and in signature boxes; it is possible to add a new &lt;version> after each review; in that case, make sure to update the date/time</xsl:comment> <xsl:comment>needed for date on frontpage and in signature boxes; it is possible to add a new &lt;version> after each review; in that case, make sure to update the date/time</xsl:comment>
<version number="auto"> <version number="auto">