merged activity_info and activityinfo, added planning dates

This commit is contained in:
skyanth 2017-07-05 13:54:04 +02:00
parent 94e8b9b753
commit 51e9f79815
18 changed files with 1103 additions and 311 deletions

View File

@ -31,7 +31,7 @@
<country>TP Country</country>
</third_party>
<activity_info>
<activityinfo>
<!-- Which targets will need to be tested?
(one <target> element for each piece of software/service/server address/location...), delete/add as necessary -->
<targets>
@ -60,5 +60,5 @@
<!-- rate (to be filled in by ROS ;) -->
<rate>40000</rate>
</activity_info>
</activityinfo>
</quickscope>

View File

@ -156,7 +156,14 @@
<xs:element name="duration" type="xs:nonNegativeInteger"/>
<xs:element name="persondays" type="xs:nonNegativeInteger"/>
<xs:element name="test_planning" type="xs:string"/>
<xs:element name="planning">
<xs:complexType>
<xs:sequence>
<xs:element name="start" type="xs:date"/>
<xs:element name="end" type="xs:date"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="report_due" type="xs:string"/>
<xs:element name="nature" type="xs:string"/>
<xs:element name="type">
@ -168,6 +175,7 @@
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="target_application" type="xs:string"/>
<xs:element name="target_application_producer" type="xs:string"/>

View File

@ -11,7 +11,7 @@
<xs:sequence>
<xs:element ref="client"/>
<xs:element ref="meta"/>
<xs:element ref="activity_info"/>
<xs:element ref="activityinfo"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@ -28,7 +28,7 @@
<xs:element name="offer_type" type="xs:NCName"/>
<xs:element name="requested_service" type="xs:string"/>
<xs:element name="activity_info">
<xs:element name="activityinfo">
<xs:complexType>
<xs:sequence>
<xs:element ref="organizational_readiness_assessment" minOccurs="0"/>

View File

@ -45,12 +45,12 @@
<xs:element name="activityinfo">
<xs:complexType>
<xs:sequence>
<xs:element ref="duration" minOccurs="0"/>
<xs:element ref="persondays" minOccurs="0"/>
<xs:element ref="test_planning" minOccurs="0"/>
<xs:element ref="report_due" minOccurs="0"/>
<xs:element ref="nature" minOccurs="0"/>
<xs:element ref="type" minOccurs="0"/>
<xs:element ref="duration" minOccurs="1"/>
<xs:element ref="persondays" minOccurs="1"/>
<xs:element ref="planning" minOccurs="1"/>
<xs:element ref="report_due" minOccurs="1"/>
<xs:element ref="nature" minOccurs="1"/>
<xs:element ref="type" minOccurs="1"/>
<xs:element ref="fee" minOccurs="0"/>
<xs:element ref="organizational_readiness_assessment" minOccurs="0"/>
<xs:element ref="security_incident_management" minOccurs="0"/>

View File

@ -47,14 +47,14 @@
<xs:element name="activityinfo">
<xs:complexType>
<xs:sequence>
<xs:element ref="duration"/>
<xs:element ref="persondays"/>
<xs:element ref="test_planning"/>
<xs:element ref="report_due"/>
<xs:element ref="nature"/>
<xs:element ref="type"/>
<xs:element minOccurs="0" ref="target_application"/>
<xs:element minOccurs="0" ref="target_application_producer"/>
<xs:element ref="duration" minOccurs="1" maxOccurs="1"/>
<xs:element ref="persondays" minOccurs="1" maxOccurs="1"/>
<xs:element ref="planning" minOccurs="1" maxOccurs="1"/>
<xs:element ref="report_due" minOccurs="1" maxOccurs="1"/>
<xs:element ref="nature" minOccurs="1" maxOccurs="1"/>
<xs:element ref="type" minOccurs="1" maxOccurs="1"/>
<xs:element minOccurs="0" maxOccurs="1" ref="target_application"/>
<xs:element minOccurs="0" maxOccurs="1" ref="target_application_producer"/>
</xs:sequence>
</xs:complexType>
</xs:element>

View File

@ -9,7 +9,7 @@
<xs:element ref="client"/>
<xs:element ref="meta"/>
<xs:element ref="third_party" minOccurs="0" maxOccurs="unbounded"/>
<xs:element ref="activity_info"/>
<xs:element ref="activityinfo"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@ -38,7 +38,7 @@
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="activity_info">
<xs:element name="activityinfo">
<xs:complexType>
<xs:sequence>
<xs:element ref="targets"/>
@ -55,7 +55,6 @@
</xs:complexType>
</xs:element>
<xs:element name="days" type="xs:integer"/>
<xs:element name="planning" type="xs:NCName"/>
<xs:element name="delivery" type="xs:NCName"/>
<xs:element name="codeaudit">
<xs:complexType>

View File

@ -20,7 +20,7 @@
</meta>
<!-- ACTIVITY INFO -->
<activity_info>
<activityinfo>
<organizational_readiness_assessment><!-- Delete complete organizational_readiness_assessment element if not needed! -->
<rate denomination="eur">100000</rate><!-- flat rate! -->
<team>
@ -35,6 +35,6 @@
<technical_artefact_analysis>
<rate denomination="eur">250</rate><!-- rate per person-hour -->
</technical_artefact_analysis>
</activity_info>
</activityinfo>
</ir_quickscope>

View File

@ -35,7 +35,7 @@
<country>XXX</country>
</third_party> -->
<!-- ___________________________________ -->
<activity_info>
<activityinfo>
<!-- How long would you like the test to be? (in days) -->
<days>0</days>
<!-- How many persondays (if you don't know, try days * number of assigned pentesters) -->
@ -59,5 +59,5 @@
<!-- rate (to be filled in by ROS ;) -->
<rate>0</rate>
</activity_info>
</activityinfo>
</quickscope>

39
xml/source/tocsv.xsl Normal file
View File

@ -0,0 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
exclude-result-prefixes="xs"
version="2.0">
<xsl:output method="text"/>
<xsl:variable name="delimiter">;</xsl:variable>
<xsl:template match="/">
<xsl:apply-templates select="//finding"/>
</xsl:template>
<!-- finding -->
<xsl:template match="finding">
<xsl:text>#</xsl:text><xsl:value-of select="substring(@id,2,2)"/><xsl:value-of select="$delimiter"/>
<xsl:value-of select="@type"/><xsl:value-of select="$delimiter"/>
<xsl:value-of select="@threatLevel"/><xsl:value-of select="$delimiter"/>
<xsl:value-of select="translate(description/p,$delimiter,',')"/><xsl:value-of select="$delimiter"/>
<xsl:choose>
<xsl:when test="string-length(recommendation/ul) &gt; 0">
<xsl:for-each select="recommendation/ul/li">
<xsl:value-of select="translate(.,$delimiter,',')"/>
<xsl:if test="position() &lt; last()">
<xsl:text> </xsl:text>
</xsl:if>
</xsl:for-each>
</xsl:when>
<xsl:when test="string-length(recommendation/p) &gt; 0">
<xsl:value-of select="translate(recommendation/p,$delimiter,',')"/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="translate(recommendation,$delimiter,',')"/>
</xsl:otherwise>
</xsl:choose>
<xsl:text>
</xsl:text>
</xsl:template>
</xsl:stylesheet>

64
xml/target/execsummary.fo Normal file

File diff suppressed because one or more lines are too long

239
xml/target/invoice.fo Normal file
View File

@ -0,0 +1,239 @@
<?xml version="1.0" encoding="UTF-8"?>
<fo:root xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:layout-master-set>
<fo:simple-page-master margin-top="0.5cm"
margin-bottom="1.5cm"
margin-left="1.5cm"
margin-right="1.5cm"
page-height="29.7cm"
page-width="21.0cm"
master-name="Cover">
<fo:region-body margin-top="3.6cm" margin-bottom="1cm" region-name="region-body"/>
<fo:region-before precedence="true" extent="2.7cm" region-name="region-before-cover"/>
<fo:region-after precedence="true"
extent="0.6cm"
padding="0"
region-name="region-after-cover"/>
</fo:simple-page-master>
<fo:simple-page-master margin-top="0.5cm"
margin-bottom="1.5cm"
margin-left="1.5cm"
margin-right="1.5cm"
page-height="29.7cm"
page-width="21.0cm"
master-name="Content">
<fo:region-body margin-top="2cm" margin-bottom="1cm" region-name="region-body"/>
<fo:region-before precedence="true"
extent="0.6cm"
region-name="region-before-content"/>
<fo:region-after precedence="true"
extent="0.6cm"
padding="0"
region-name="region-after-content"/>
</fo:simple-page-master>
<fo:page-sequence-master master-name="Report">
<fo:repeatable-page-master-alternatives>
<fo:conditional-page-master-reference master-reference="Cover"
blank-or-not-blank="not-blank"
page-position="first"/>
<fo:conditional-page-master-reference master-reference="Content" blank-or-not-blank="not-blank"/>
</fo:repeatable-page-master-alternatives>
</fo:page-sequence-master>
</fo:layout-master-set>
<fo:page-sequence master-reference="Report">
<fo:static-content font-family="LiberationSansNarrow"
font-size="12pt"
color="black"
line-height-shift-adjustment="disregard-shifts"
flow-name="region-before-cover">
<fo:block>
<fo:table width="100%" table-layout="fixed">
<fo:table-column column-width="proportional-column-width(40)"/>
<fo:table-column column-width="proportional-column-width(20)"/>
<fo:table-column column-width="proportional-column-width(40)"/>
<fo:table-body>
<fo:table-row>
<fo:table-cell text-align="right" display-align="after" padding-bottom="5mm">
<fo:block font-family="LiberationSansNarrow"
font-size="8pt"
color="black"
line-height-shift-adjustment="disregard-shifts">
<fo:block font-weight="bold" color="#FF5C00">Radically Open Security B.V.</fo:block>
<fo:block>Zieseniskade 21</fo:block>
<fo:block>1017 RT Amsterdam</fo:block>
<fo:block>The Netherlands</fo:block>
</fo:block>
</fo:table-cell>
<fo:table-cell text-align="center">
<fo:block>
<fo:external-graphic padding-top="0cm"
padding-bottom="0cm"
src="url(../graphics/logo_alt.png)"
width="30mm"
content-width="scale-to-fit"
content-height="scale-to-fit"
scaling="uniform"/>
</fo:block>
</fo:table-cell>
<fo:table-cell display-align="after" padding-bottom="5mm">
<fo:block font-family="LiberationSansNarrow"
font-size="8pt"
color="black"
line-height-shift-adjustment="disregard-shifts">
<fo:block font-weight="bold" color="#FF5C00">www.radicallyopensecurity.com</fo:block>
<fo:block>info@radicallyopensecurity.com</fo:block>
<fo:block>Chamber of Commerce 60628081</fo:block>
<fo:block>VAT number 853989655B01</fo:block>
</fo:block>
</fo:table-cell>
</fo:table-row>
</fo:table-body>
</fo:table>
</fo:block>
</fo:static-content>
<fo:static-content font-family="LiberationSansNarrow"
font-size="12pt"
color="black"
line-height-shift-adjustment="disregard-shifts"
flow-name="region-before-content">
<fo:block text-align="right" font-weight="normal"/>
</fo:static-content>
<fo:static-content font-family="LiberationSansNarrow"
font-size="12pt"
color="black"
line-height-shift-adjustment="disregard-shifts"
flow-name="region-after-cover">
<fo:block text-align-last="justify" text-align="center">
<fo:inline font-family="LiberationSansNarrow"
font-size="8pt"
color="#FF5C00"
line-height-shift-adjustment="disregard-shifts">Please keep digital unless absolutely required.
Read the (unique) terms and conditions of Radically Open Security at:
https://radicallyopensecurity.com/TermsandConditions.pdf
</fo:inline>
</fo:block>
</fo:static-content>
<fo:static-content font-family="LiberationSansNarrow"
font-size="12pt"
color="black"
line-height-shift-adjustment="disregard-shifts"
flow-name="region-after-content">
<fo:block text-align-last="justify" text-align="center">
<fo:inline font-family="LiberationSansNarrow"
font-size="8pt"
color="#FF5C00"
line-height-shift-adjustment="disregard-shifts">Please keep digital unless absolutely required.
Read the (unique) terms and conditions of Radically Open Security at:
https://radicallyopensecurity.com/TermsandConditions.pdf
</fo:inline>
</fo:block>
</fo:static-content>
<fo:flow font-family="LiberationSansNarrow"
font-size="12pt"
color="black"
line-height-shift-adjustment="disregard-shifts"
flow-name="region-body">
<fo:block>
<fo:block font-weight="bold"
keep-with-next.within-page="always"
text-align="center"
color="white"
font-size="18pt"
margin-bottom="1cm"
background-color="#FF5C00"
margin-top="1cm">Invoice no. 001/17</fo:block>
<fo:block>
<fo:block>Sitting Duck B.V.</fo:block>
<fo:block/>
<fo:block>Reed Street 42</fo:block>
<fo:block>0000 Pond City</fo:block>
<fo:block>Amazonia</fo:block>
<fo:block>freemoney@sittingduck.com</fo:block>
</fo:block>
<fo:block margin-bottom="8mm" text-align="right">June 8, 2017</fo:block>
<fo:block font-weight="bold"
keep-with-next.within-page="always"
text-align="center"
color="white"
font-style="normal"
font-size="18pt"
margin-bottom="0.8cm"
background-color="silver">Services delivered</fo:block>
<fo:block>
<fo:table margin-bottom="8mm"
background-color="#EEEEEE"
width="100%"
table-layout="fixed">
<fo:table-column column-width="proportional-column-width(90)"/>
<fo:table-column column-width="proportional-column-width(10)"/>
<fo:table-body>
<fo:table-row>
<fo:table-cell padding="2pt"
border-collapse="separate"
border-spacing="5mm"
padding-top="2pt">
<fo:block>2-day retest Sitting Duck</fo:block>
</fo:table-cell>
<fo:table-cell padding="2pt"
border-collapse="separate"
border-spacing="5mm"
padding-top="2pt"
text-align="right">
<fo:block margin-bottom="5pt">€ 0.--</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
<fo:table-cell padding="2pt"
border-collapse="separate"
border-spacing="5mm"
padding-top="2pt">
<fo:block>VAT
21%</fo:block>
</fo:table-cell>
<fo:table-cell padding="2pt"
border-collapse="separate"
border-spacing="5mm"
padding-top="2pt"
text-align="right">
<fo:block margin-bottom="5pt">€ 0.--</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row border-before-width="1pt"
border-before-style="solid"
border-before-color="black"
font-weight="bold">
<fo:table-cell padding="2pt"
border-collapse="separate"
border-spacing="5mm"
padding-top="2pt">
<fo:block>Total amount to be paid</fo:block>
</fo:table-cell>
<fo:table-cell padding="2pt"
border-collapse="separate"
border-spacing="5mm"
padding-top="2pt"
text-align="right">
<fo:block margin-bottom="5pt">€ 0.--</fo:block>
</fo:table-cell>
</fo:table-row>
</fo:table-body>
</fo:table>
</fo:block>
<fo:block margin-bottom="8mm">Radically Open Security B.V. donates &gt; 90% of its entire profits to charity.
</fo:block>
<fo:block margin-bottom="8mm">Please be so kind to pay within 30 days by money
transfer, to the following account:
</fo:block>
<fo:block margin-bottom="8mm" margin-left="1.3cm">
<fo:block>Radically Open Security B.V.</fo:block>
<fo:block>IBAN: NL06 RABO 0188 2813 12</fo:block>
<fo:block>Reference: 001/17</fo:block>
</fo:block>
<fo:block>Kind regards,</fo:block>
<fo:block>your dedicated team at</fo:block>
<fo:block font-style="italic">Radically Open Security B.V.</fo:block>
</fo:block>
</fo:flow>
</fo:page-sequence>
</fo:root>

340
xml/target/report.fo Normal file

File diff suppressed because one or more lines are too long

BIN
xml/target/report.pdf Normal file

Binary file not shown.

340
xml/target/reportpat.fo Normal file

File diff suppressed because one or more lines are too long

View File

@ -70,7 +70,7 @@
</xsl:element>
</permission_parties>
<activityinfo>
<xsl:for-each select="//activity_info/*">
<xsl:for-each select="//activityinfo/*">
<xsl:copy>
<xsl:copy-of select="node()"/>
</xsl:copy>
@ -103,7 +103,7 @@
</xsl:element>
</xsl:for-each>
<xsl:if test="//activity_info/organizational_readiness_assessment">
<xsl:if test="//activityinfo/organizational_readiness_assessment">
<xsl:for-each
select="$snippetSelectionRoot/selection[@subtype = $docSubType]/snippet_group[@set = 'organizational_readiness_assessment']/snippet">
<xsl:element name="xi:include">
@ -128,136 +128,9 @@
</xsl:attribute>
</xsl:element>
</xsl:for-each>
<!--<xsl:comment>Introduction and Scope</xsl:comment>
<xsl:element name="xi:include">
<xsl:attribute name="href">
<xsl:call-template name="docCheck">
<xsl:with-param name="fileNamePart">introandscope</xsl:with-param>
</xsl:call-template>
</xsl:attribute>
</xsl:element>
<xsl:comment>Project overview section</xsl:comment>
<xsl:element name="xi:include">
<xsl:attribute name="href">
<xsl:call-template name="docCheck">
<xsl:with-param name="fileNamePart">projectoverview</xsl:with-param>
</xsl:call-template>
</xsl:attribute>
</xsl:element>
<xsl:comment>Prerequisites section</xsl:comment>
<xsl:element name="xi:include">
<xsl:attribute name="href">
<xsl:call-template name="docCheck">
<xsl:with-param name="fileNamePart">prerequisites</xsl:with-param>
</xsl:call-template>
</xsl:attribute>
</xsl:element>
<xsl:comment>Disclaimer section</xsl:comment>
<xsl:element name="xi:include">
<xsl:attribute name="href">
<xsl:call-template name="docCheck">
<xsl:with-param name="fileNamePart">disclaimer</xsl:with-param>
</xsl:call-template>
</xsl:attribute>
</xsl:element>
<xsl:comment>Methodology section</xsl:comment>
<xsl:element name="xi:include">
<xsl:attribute name="href">
<xsl:call-template name="docCheck">
<xsl:with-param name="fileNamePart">methodology</xsl:with-param>
</xsl:call-template>
</xsl:attribute>
</xsl:element>-->
<!--<xsl:if test="/*/activity_info/codeaudit/@perform = 'yes'">
<xsl:element name="xi:include">
<xsl:attribute name="href">
<xsl:call-template name="docCheck">
<xsl:with-param name="fileNamePart"
>codeauditmethodology</xsl:with-param>
</xsl:call-template>
</xsl:attribute>
</xsl:element>
</xsl:if>-->
<!--<xsl:element name="xi:include">
<xsl:attribute name="href">
<xsl:call-template name="docCheck">
<xsl:with-param name="fileNamePart">teamandreporting</xsl:with-param>
</xsl:call-template>
</xsl:attribute>
</xsl:element>
<xsl:comment>Planning and payment section</xsl:comment>
<xsl:element name="xi:include">
<xsl:attribute name="href">
<xsl:call-template name="docCheck">
<xsl:with-param name="fileNamePart">planningandpayment</xsl:with-param>
</xsl:call-template>
</xsl:attribute>
</xsl:element>
<xsl:comment>About Us section</xsl:comment>
<xsl:element name="xi:include">
<xsl:attribute name="href">
<xsl:call-template name="docCheck">
<xsl:with-param name="fileNamePart">aboutus</xsl:with-param>
</xsl:call-template>
</xsl:attribute>
</xsl:element>
<xsl:comment>Work condition section</xsl:comment>
<xsl:element name="xi:include">
<xsl:attribute name="href">
<xsl:call-template name="docCheck">
<xsl:with-param name="fileNamePart">conditions</xsl:with-param>
</xsl:call-template>
</xsl:attribute>
</xsl:element>
<xsl:comment>General terms and conditions section</xsl:comment>
<xsl:element name="xi:include">
<xsl:attribute name="href">
<xsl:call-template name="docCheck">
<xsl:with-param name="fileNamePart"
>generaltermsandconditions</xsl:with-param>
</xsl:call-template>
</xsl:attribute>
</xsl:element>
<xsl:comment>Waivers</xsl:comment>
<xsl:element name="xi:include">
<xsl:attribute name="href">
<xsl:call-template name="docCheck">
<xsl:with-param name="fileNamePart">waiver</xsl:with-param>
</xsl:call-template>
</xsl:attribute>
</xsl:element>-->
</offerte>
</xsl:template>
<!--<xsl:template name="docCheck">
<xsl:param name="fileNamePart" select="'none'"/>
<xsl:param name="typeSuffix">
<xsl:choose>
<xsl:when test="/*/meta/offer_type = 'pentest' or /*/meta/offer_type = 'other'"/>
<xsl:otherwise>
<xsl:text>_</xsl:text>
<xsl:value-of select="/*/meta/offer_type"/>
</xsl:otherwise>
</xsl:choose>
</xsl:param>
<xsl:param name="fileNameStandard"
select="concat('snippets/offerte/', $lang, '/', $fileNamePart, '.xml')"/>
<xsl:param name="fileNameExtended"
select="concat('snippets/offerte/', $lang, '/', $fileNamePart, $typeSuffix, '.xml')"/>
<xsl:choose>
<xsl:when test="doc-available(concat('../source/', $fileNameExtended))">
<xsl:value-of select="$fileNameExtended"/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="$fileNameStandard"/>
</xsl:otherwise>
</xsl:choose>
</xsl:template>-->
</xsl:stylesheet>

View File

@ -191,8 +191,14 @@
<xsl:with-param name="placeholderElement" select="$placeholderElement"/>
</xsl:call-template>
</xsl:template>
<xsl:template match="p_testingduration">
<xsl:param name="placeholderElement" select="/*/meta/activityinfo/test_planning"/>
<xsl:template match="p_startdate">
<xsl:param name="placeholderElement" select="/*/meta/activityinfo/planning/start"/>
<xsl:call-template name="checkPlaceholder">
<xsl:with-param name="placeholderElement" select="$placeholderElement"/>
</xsl:call-template>
</xsl:template>
<xsl:template match="p_enddate">
<xsl:param name="placeholderElement" select="/*/meta/activityinfo/planning/end"/>
<xsl:call-template name="checkPlaceholder">
<xsl:with-param name="placeholderElement" select="$placeholderElement"/>
</xsl:call-template>
@ -424,18 +430,24 @@
<xsl:text>&#160;</xsl:text>
<xsl:value-of select="$placeholderElement"/>
</xsl:when>
<!-- PRETTY FORMATTING FOR AMOUNTS OF MONEY -->
<xsl:when test="self::p_fee or self::contractor_hourly_fee or self::ir_ora_rate">
<!-- pretty numbering for fee -->
<xsl:variable name="fee" select="$placeholderElement * 1"/>
<xsl:number value="$fee" grouping-separator="," grouping-size="3"/>
</xsl:when>
<!-- PRETTY FORMATTING FOR DATES -->
<xsl:when
test="self::contract_end_date or self::contract_start_date or self::generate_raterevisiondate">
test="(self::contract_end_date or self::contract_start_date or self::generate_raterevisiondate or self::start or self::end) and string(.) castable as xs:date">
<!-- pretty printing for date -->
<xsl:value-of
select="format-date($placeholderElement, '[MNn] [D1], [Y]', 'en', (), ())"
/>
</xsl:when>
<xsl:when
test="(self::contract_end_date or self::contract_start_date or self::generate_raterevisiondate or self::start or self::end) and not(string(.) castable as xs:date)">
<!-- pretty printing for date -->
<fo:inline xsl:use-attribute-sets="errortext">TBD</fo:inline>
</xsl:when>
<xsl:when
test="self::contract_period_unit and /contract/meta/scope/contract_type = 'single_engagement'">
<!-- only use value for fixed term contracts; use 'engagement' for single engagement contract -->

View File

@ -89,35 +89,36 @@
<activityinfo>
<!-- copy various variables from quickscope -->
<duration>
<xsl:value-of select="/*/activity_info/days"/>
<xsl:value-of select="/*/activityinfo/days"/>
</duration>
<xsl:comment>duration of pentest, in working days</xsl:comment>
<persondays>
<xsl:value-of select="/*/activity_info/persondays"/>
<xsl:value-of select="/*/activityinfo/persondays"/>
</persondays>
<xsl:comment>duration of pentest, in persondays</xsl:comment>
<test_planning>
<xsl:value-of select="/*/activity_info/planning"/>
</test_planning>
<xsl:comment>date or date range in text, e.g. May 18th until May 25th, 2016</xsl:comment>
<planning>
<start><xsl:value-of select="/*/activityinfo/planning/start"/></start>
<end><xsl:value-of select="/*/activityinfo/planning/end"/></end>
</planning>
<xsl:comment>start and end dates, in ISO format: YYYY-MM-DD</xsl:comment>
<report_due>
<xsl:value-of select="/*/activity_info/delivery"/>
<xsl:value-of select="/*/activityinfo/delivery"/>
</report_due>
<xsl:comment>date or date range in text, e.g. May 18th until May 25th, 2016</xsl:comment>
<nature>
<xsl:value-of select="/*/activity_info/nature"/>
<xsl:value-of select="/*/activityinfo/nature"/>
</nature>
<type>
<xsl:value-of select="/*/activity_info/type"/>
<xsl:value-of select="/*/activityinfo/type"/>
</type>
<xsl:comment>please choose one of the following: black-box, grey-box, crystal-box</xsl:comment>
<fee denomination="eur">
<xsl:value-of select="/*/activity_info/rate"/>
<xsl:value-of select="/*/activityinfo/rate"/>
</fee>
<xsl:comment>(eur|usd|gbp)</xsl:comment>
<xsl:if test="*/activity_info/application_name">
<xsl:if test="*/activityinfo/application_name">
<target_application>
<xsl:value-of select="/*/activity_info/application_name"/>
<xsl:value-of select="/*/activityinfo/application_name"/>
</target_application>
<xsl:comment>name of application/service to be tested (if any; if none, DELETE target_application element)</xsl:comment>
</xsl:if>
@ -150,7 +151,7 @@
</xsl:element>
</xsl:for-each>
<xsl:if test="/*/activity_info/codeaudit/@perform = 'yes'">
<xsl:if test="/*/activityinfo/codeaudit/@perform = 'yes'">
<xsl:for-each
select="$snippetSelectionRoot/selection[@subtype = $docSubType]/snippet_group[@set = 'additionalcodeaudit']/snippet">
<xsl:element name="xi:include">
@ -176,134 +177,10 @@
</xsl:element>
</xsl:for-each>
<!--<xsl:comment>Introduction and Scope</xsl:comment>
<xsl:element name="xi:include">
<xsl:attribute name="href">
<xsl:call-template name="docCheck">
<xsl:with-param name="fileNamePart">introandscope</xsl:with-param>
</xsl:call-template>
</xsl:attribute>
</xsl:element>
<xsl:comment>Project overview section</xsl:comment>
<xsl:element name="xi:include">
<xsl:attribute name="href">
<xsl:call-template name="docCheck">
<xsl:with-param name="fileNamePart">projectoverview</xsl:with-param>
</xsl:call-template>
</xsl:attribute>
</xsl:element>
<xsl:comment>Prerequisites section</xsl:comment>
<xsl:element name="xi:include">
<xsl:attribute name="href">
<xsl:call-template name="docCheck">
<xsl:with-param name="fileNamePart">prerequisites</xsl:with-param>
</xsl:call-template>
</xsl:attribute>
</xsl:element>
<xsl:comment>Disclaimer section</xsl:comment>
<xsl:element name="xi:include">
<xsl:attribute name="href">
<xsl:call-template name="docCheck">
<xsl:with-param name="fileNamePart">disclaimer</xsl:with-param>
</xsl:call-template>
</xsl:attribute>
</xsl:element>
<xsl:comment>Methodology section</xsl:comment>
<xsl:element name="xi:include">
<xsl:attribute name="href">
<xsl:call-template name="docCheck">
<xsl:with-param name="fileNamePart">methodology</xsl:with-param>
</xsl:call-template>
</xsl:attribute>
</xsl:element>-->
<!--<xsl:if test="/*/activity_info/codeaudit/@perform = 'yes'">
<xsl:element name="xi:include">
<xsl:attribute name="href">
<xsl:call-template name="docCheck">
<xsl:with-param name="fileNamePart"
>codeauditmethodology</xsl:with-param>
</xsl:call-template>
</xsl:attribute>
</xsl:element>
</xsl:if>-->
<!--<xsl:element name="xi:include">
<xsl:attribute name="href">
<xsl:call-template name="docCheck">
<xsl:with-param name="fileNamePart">teamandreporting</xsl:with-param>
</xsl:call-template>
</xsl:attribute>
</xsl:element>
<xsl:comment>Planning and payment section</xsl:comment>
<xsl:element name="xi:include">
<xsl:attribute name="href">
<xsl:call-template name="docCheck">
<xsl:with-param name="fileNamePart">planningandpayment</xsl:with-param>
</xsl:call-template>
</xsl:attribute>
</xsl:element>
<xsl:comment>About Us section</xsl:comment>
<xsl:element name="xi:include">
<xsl:attribute name="href">
<xsl:call-template name="docCheck">
<xsl:with-param name="fileNamePart">aboutus</xsl:with-param>
</xsl:call-template>
</xsl:attribute>
</xsl:element>
<xsl:comment>Work condition section</xsl:comment>
<xsl:element name="xi:include">
<xsl:attribute name="href">
<xsl:call-template name="docCheck">
<xsl:with-param name="fileNamePart">conditions</xsl:with-param>
</xsl:call-template>
</xsl:attribute>
</xsl:element>
<xsl:comment>General terms and conditions section</xsl:comment>
<xsl:element name="xi:include">
<xsl:attribute name="href">
<xsl:call-template name="docCheck">
<xsl:with-param name="fileNamePart"
>generaltermsandconditions</xsl:with-param>
</xsl:call-template>
</xsl:attribute>
</xsl:element>
<xsl:comment>Waivers</xsl:comment>
<xsl:element name="xi:include">
<xsl:attribute name="href">
<xsl:call-template name="docCheck">
<xsl:with-param name="fileNamePart">waiver</xsl:with-param>
</xsl:call-template>
</xsl:attribute>
</xsl:element>-->
</offerte>
</xsl:template>
<!--<xsl:template name="docCheck">
<xsl:param name="fileNamePart" select="'none'"/>
<xsl:param name="typeSuffix">
<xsl:choose>
<xsl:when test="/*/meta/offer_type = 'pentest' or /*/meta/offer_type = 'other'"/>
<xsl:otherwise>
<xsl:text>_</xsl:text>
<xsl:value-of select="/*/meta/offer_type"/>
</xsl:otherwise>
</xsl:choose>
</xsl:param>
<xsl:param name="fileNameStandard"
select="concat('snippets/offerte/', $lang, '/', $fileNamePart, '.xml')"/>
<xsl:param name="fileNameExtended"
select="concat('snippets/offerte/', $lang, '/', $fileNamePart, $typeSuffix, '.xml')"/>
<xsl:choose>
<xsl:when test="doc-available(concat('../source/', $fileNameExtended))">
<xsl:value-of select="$fileNameExtended"/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="$fileNameStandard"/>
</xsl:otherwise>
</xsl:choose>
</xsl:template>-->
</xsl:stylesheet>

View File

@ -82,19 +82,20 @@
<xsl:comment>duration of pentest, in working days</xsl:comment>
<persondays>2</persondays>
<xsl:comment>duration of pentest, in persondays</xsl:comment>
<test_planning>
<xsl:choose>
<xsl:when test="/*/activityinfo/test_planning">
<xsl:value-of select="/*/activity_info/test_planning"/>
</xsl:when>
<xsl:otherwise>TBD</xsl:otherwise>
</xsl:choose>
</test_planning>
<xsl:comment>date or date range in text, e.g. May 18th until May 25th, 2015</xsl:comment>
<planning>
<start>
<xsl:comment>date in ISO format: YYYY-MM-DD</xsl:comment>
<xsl:text>YYYY-MM-DD</xsl:text>
</start>
<end>
<xsl:comment>date in ISO format: YYYY-MM-DD</xsl:comment>
<xsl:text>YYYY-MM-DD</xsl:text>
</end>
</planning>
<report_due>
<xsl:choose>
<xsl:when test="/*/activityinfo/report_due">
<xsl:value-of select="/*/activity_info/report_due"/>
<xsl:value-of select="/*/activityinfo/report_due"/>
</xsl:when>
<xsl:otherwise>TBD</xsl:otherwise>
</xsl:choose>
@ -103,7 +104,7 @@
<nature>
<xsl:choose>
<xsl:when test="/*/activityinfo/nature">
<xsl:value-of select="/*/activity_info/nature"/>
<xsl:value-of select="/*/activityinfo/nature"/>
</xsl:when>
<xsl:otherwise>time-boxed</xsl:otherwise>
</xsl:choose>
@ -111,7 +112,7 @@
<type>
<xsl:choose>
<xsl:when test="/*/activityinfo/type">
<xsl:value-of select="/*/activity_info/type"/>
<xsl:value-of select="/*/activityinfo/type"/>
</xsl:when>
<xsl:otherwise>crystal-box</xsl:otherwise>
</xsl:choose>
@ -119,9 +120,9 @@
<xsl:comment>please choose one of the following: black-box, grey-box, crystal-box</xsl:comment>
<fee denomination="eur">0</fee>
<xsl:comment>(eur|usd|gbp)</xsl:comment>
<xsl:if test="*/activity_info/target_application">
<xsl:if test="*/activityinfo/target_application">
<target_application>
<xsl:value-of select="/*/activity_info/target_application"/>
<xsl:value-of select="/*/activityinfo/target_application"/>
</target_application>
</xsl:if>
</activityinfo>