` 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 `` 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:
-
+
10
January 1st until January 12th, 2015
January 15th until January 20th, 2015
@@ -127,7 +127,7 @@ Example:
50000
FishInABarrel
H4ckers 'R' Us
-
+
### Version History
diff --git a/xml/doc/offerte/offerte.html b/xml/doc/offerte/offerte.html
index 81fd727..5ef758a 100644
--- a/xml/doc/offerte/offerte.html
+++ b/xml/doc/offerte/offerte.html
@@ -66,9 +66,9 @@
<target>Sitting Duck's support staff</target>
<targets>
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:
-<pentestinfo>
+<activityinfo>
<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 -->
<report_writing>January 15th until January 20th, 2015</report_writing> <!-- date or date range in text, e.g. May 18th until May 25th, 2015 -->
@@ -78,7 +78,7 @@
<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_producer>H4ckers 'R' Us</target_application_producer>
- </pentestinfo>
+ </activityinfo>
Version History
The <version_history> element contains one or more <version> elements, one for each version of the document you create. Whenever you start a new version, add a <version> element to the list.
The <version> element should contain the following:
diff --git a/xml/doc/report/Report Writing - Procedure.md b/xml/doc/report/Report Writing - Procedure.md
index d3312c3..7d92715 100644
--- a/xml/doc/report/Report Writing - Procedure.md
+++ b/xml/doc/report/Report Writing - Procedure.md
@@ -50,7 +50,7 @@ TODO
- The document title, in the `` element
- Client information, in the `` element
- Targets listing, in the `` element
-- (Optionally) Pentest-related information, in the `` element
+- (Optionally) Pentest-related information, in the `` element
- People who worked on the pentest and/or report, in the
`` element
- Document classification, in the `` element
@@ -102,11 +102,11 @@ Example:
### Pentest Info
-The `` 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 `` 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:
-
+
10
January 1st until January 12th, 2015
January 15th until January 20th, 2015
@@ -115,7 +115,7 @@ Example:
black-box
FishInABarrel
H4ckers 'R' Us
-
+
### Collaborators
diff --git a/xml/doc/report/report.html b/xml/doc/report/report.html
index 4eebbcf..691f31e 100644
--- a/xml/doc/report/report.html
+++ b/xml/doc/report/report.html
@@ -23,7 +23,7 @@
The document title, in the <title> element
Client information, in the <client> 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 <collaborators> element
Document classification, in the <classification> element
The document's version history, in the <version_history> element
@@ -53,9 +53,9 @@
<target>Sitting Duck's support staff</target>
<targets>
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:
-<pentestinfo>
+<activityinfo>
<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 -->
<report_writing>January 15th until January 20th, 2015</report_writing> <!-- date or date range in text, e.g. May 18th until May 25th, 2015 -->
@@ -64,7 +64,7 @@
<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_producer>H4ckers 'R' Us</target_application_producer>
- </pentestinfo>
+ </activityinfo>
Collaborators
The <collaborators> element contains three other elements, mandatory and in the listed order:
diff --git a/xml/dtd/offerte.xsd b/xml/dtd/offerte.xsd
index 2afa1af..683f594 100644
--- a/xml/dtd/offerte.xsd
+++ b/xml/dtd/offerte.xsd
@@ -29,7 +29,7 @@
-
+
@@ -40,7 +40,7 @@
-
+
diff --git a/xml/dtd/pentestreport.xsd b/xml/dtd/pentestreport.xsd
index 4227440..ec11d0b 100644
--- a/xml/dtd/pentestreport.xsd
+++ b/xml/dtd/pentestreport.xsd
@@ -34,7 +34,7 @@
-
+
@@ -44,7 +44,7 @@
-
+
diff --git a/xml/templates/offerte/offerte_EN.xml b/xml/templates/offerte/offerte_EN.xml
index 1334ea5..11024ef 100644
--- a/xml/templates/offerte/offerte_EN.xml
+++ b/xml/templates/offerte/offerte_EN.xml
@@ -17,12 +17,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -64,7 +64,7 @@
-
+
...
...
...
@@ -74,7 +74,7 @@
0
...
...
-
+
ROS Writer
diff --git a/xml/templates/offerte/offerte_NL.xml b/xml/templates/offerte/offerte_NL.xml
index 3f0d8ea..398e862 100644
--- a/xml/templates/offerte/offerte_NL.xml
+++ b/xml/templates/offerte/offerte_NL.xml
@@ -18,12 +18,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -63,7 +63,7 @@
...
-
+
...
...
...
@@ -73,7 +73,7 @@
...
...
...
-
+
ROS Writer
diff --git a/xml/xslt/generate_invoice.xsl b/xml/xslt/generate_invoice.xsl
index 4eaf837..9dfd8ef 100644
--- a/xml/xslt/generate_invoice.xsl
+++ b/xml/xslt/generate_invoice.xsl
@@ -58,13 +58,13 @@
-
+
- €
- £
- $
+ €
+ £
+ $
@@ -73,7 +73,7 @@
/>
- --
- €
- $
- £
+ €
+ $
+ £
diff --git a/xml/xslt/off2inv.xsl b/xml/xslt/off2inv.xsl
index fd35214..68e757c 100644
--- a/xml/xslt/off2inv.xsl
+++ b/xml/xslt/off2inv.xsl
@@ -30,7 +30,7 @@
-
+
@@ -44,13 +44,13 @@
Add/delete <service> elements as needed
- -
-
+
diff --git a/xml/xslt/off2rep.xsl b/xml/xslt/off2rep.xsl
index c1e5e62..92f381c 100644
--- a/xml/xslt/off2rep.xsl
+++ b/xml/xslt/off2rep.xsl
@@ -21,15 +21,15 @@
-
-
+
+
-
+
client_info.xml
diff --git a/xml/xslt/placeholders.xslt b/xml/xslt/placeholders.xslt
index ac91053..378b928 100644
--- a/xml/xslt/placeholders.xslt
+++ b/xml/xslt/placeholders.xslt
@@ -135,38 +135,38 @@
+ select="/offerte/meta/activityinfo/target_application | /pentest_report/meta/activityinfo/target_application"/>
+ select="/offerte/meta/activityinfo/target_application_producer | /pentest_report/meta/activityinfo/target_application_producer"/>
-
+
-
+
-
+
-
+
@@ -174,13 +174,13 @@
-
+
-
+
diff --git a/xml/xslt/qs2offerte.xsl b/xml/xslt/qs2offerte.xsl
index 52e7350..2790bef 100644
--- a/xml/xslt/qs2offerte.xsl
+++ b/xml/xslt/qs2offerte.xsl
@@ -66,7 +66,7 @@
one target element per target
-
+
@@ -83,7 +83,7 @@
-
+
@@ -119,7 +119,7 @@
name of application/service to be tested (if any; if none, DELETE target_application element)
-
+
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
diff --git a/xml/xslt/rep2off.xsl b/xml/xslt/rep2off.xsl
index 36c2cc0..de6e145 100644
--- a/xml/xslt/rep2off.xsl
+++ b/xml/xslt/rep2off.xsl
@@ -73,7 +73,7 @@
-
+
2
duration of pentest, in working days
@@ -81,7 +81,7 @@
duration of pentest, in persondays
-
+
TBD
@@ -90,7 +90,7 @@
date or date range in text, e.g. May 18th until May 25th, 2015
-
+
TBD
@@ -99,7 +99,7 @@
date or date range in text, e.g. May 18th until May 25th, 2015
-
+
time-boxed
@@ -107,7 +107,7 @@
-
+
crystal-box
@@ -121,7 +121,7 @@
-
+
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