diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6d770bb --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ + +xml/PenText.xpr diff --git a/xml/RELEASE_NOTES.html b/xml/RELEASE_NOTES.html new file mode 100644 index 0000000..8c7c1a0 --- /dev/null +++ b/xml/RELEASE_NOTES.html @@ -0,0 +1,1141 @@ +RELEASE_NOTES

RELEASE NOTES

+

July 30, 2016

+

Finding status

+

New feature for retests: finding status to indicate if, in context of a follow-up pentest, a finding is new, resolved, still unresolved or not retested.

+

The <finding> element now has an optional @status attribute. Possible values are:

+ +

The <generate_findings/> element now likewise has this optional @status attribute with the same possible values. You can add it to generate a finding summary table containing only the findings with a specific status.

+

June 15, 2016

+

Giant update to celebrate these xml templates having been elevated to OWASP project status. Because how better to do that than through introducing a load of bugs. :)

+

Multilingual workflow

+

You can now set the desired language in quickscope, using the offer_language element. This will generate the proper offer with the proper language snippets.

+

Note: language stuff is defined in two places:

+
    +
  1. in source/snippets/offerte (language directories for all snippets)
  2. +
  3. in source/snippets/localisationstrings.xml (these are strings used in xslt; e.g. when generating an offer from quickscope)
  4. +
+

Offer types

+

You can now set the desired offer type in quickscope, using the offer_type element. This will generate the proper offer with the proper snippets.

+

Note: system looks for snippets with the type suffix first, and uses the standard snippet if none is found.

+

Example

+

Offer type is ‘basic-scan’.

+

When generating an xml offer from quickscope, the xslt will first look for the file:

+

methodology_basic-scan.xml

+

If it cannot find this file, it will instead use

+

methodology.xml

+

Customizable waivers

+

Yes, the stories you heard are true (and we’ll get that snitch one day!) - waivers are no longer hard-coded but are now normal, customizable snippets. Well, not completely normal. It goes like this:

+

When generating waivers for client + third parties, the xslt will use the contents of the <standard_waiver> element in <waivers> in the waiver.xml snippet.

+

UNLESS: you have added an optional <alternative_waiver> element below <standard_waiver> (still in <waivers>) and have given it a Ref attribute that refers to the id of the client/party for which this alternative waiver needs to be used (just add an id if the client or party doesn’t have one yet).

+

So to summarize:

+
    +
  1. xslt checks if an alternative waiver has been defined for a specific client or party in the offer,
  2. +
  3. if not, it uses the standard waiver
  4. +
+

Now isn’t that simple!

+

Note: to support this functionality, a bunch of waiver-only placeholders have been introduced, to wit: <signee_long>, <signee_short>, <signee_street>, <signee_city>, <signee_country>, <signee_waiver_rep>. Don’t use them anywhere else though (they will fail and anyway it wouldn’t make sense).

+

May 23, 2016

+

Offerte –> Pentest-report

+

Last step in the document chain has been completed: you can now generate a (bare bones) Pentest report from any offerte the client has accepted, using the following command:

+

java -jar saxon9he.jar -s:source/offerte.xml -xsl:xslt/off2rep.xsl -o:source/report.xml

+

This makes the document workflow as follows:

+
    +
  1. Fill in quickscope.xml
  2. +
  3. Create offerte.xml from quickscope.xml using qs2offerte.xsl
  4. +
  5. If client accepts offerte, create report.xml from offerte.xml using off2rep.xsl
  6. +
  7. After pentest has concluded, create invoice from offerte using either the direct route or the roundabout one (see March 24, 2016 in the release notes for more info)
  8. +
+

April 25, 2016

+

Hidden elements

+

It is now possible to hide section, appendix and annex elements from the generated report, offerte or generic document. To do so, add the optional attribute visibility="hidden" to whatever it is you want to hide in the generated PDF.

+

Links to hidden targets will give an error (in the document), as will links to non-existing targets in general.

+

Client Placeholder renaming

+

All placeholders that used to start with c_* (c_short, c_poc1, etc) now start with client_.

+

April 21, 2016

+

Generic Documents

+

We now have a generic document type, which can be used for (drumroll) generic documents (whitepapers, training notes, presentation notes, whatever).

+

It is a super-simple template: it contains a a sparse meta section, an optional ToC and then any number of sections and elements. All the general text elements (tables, lists, pre, code, a, etc etc) can be used. It’s so simple I’m not even going to document it. Check the example doc in doc/examples if you’re lost, but if you’ve ever written an offer or a pentest report using this system it should be a piece of cake. :)

+

Usage: genericdocument.xml --> genericdocument.pdf (using generate_doc.xsl + fop)

+

April 4, 2016

+

Associating targets with parties

+

You can now associate certain targets with certain parties. The <client> and <party> element now have an optional id attribute. Each target element now has an optional Ref attribute.

+

In waivers, only the targets associated with the party/client that needs to sign the waiver will be shown.

+

<generate_targets/> also has an optional Ref attribute for when you only want to generate a list of targets for one client/party.

+

If a target has no Ref attribute, it will appear in all the lists (both in the waivers and when using <generate_targets/>).

+

March 24, 2016

+

More elaborate invoicing

+

Instead of generating an invoice straight from the offerte, as described in the release notes of March 10, you can now also take the roundabout route and customize the invoice.

+

So instead of:

+
    +
  1. offerte.xml –> invoice.pdf (using generate_inv.xsl + fop)
  2. +
+

You can do:

+
    +
  1. offerte.xml –> invoice.xml (using off2inv.xsl)
  2. +
  3. edit invoice.xml (add some extra costs, most likely)
  4. +
  5. invoice.xml –> invoice.pdf (using generate_inv.xsl + fop)
  6. +
+

More often than not, the simple route will do just fine, though.

+

Added client VAT element

+

When billing EU customers, you do not need to charge VAT (but you do need to have the client’s VAT number on the invoice). So the <client> element now has an optional <vat_no> child.

+

March 10, 2016

+

Fee denomination

+

The <fee> element in <pentestinfo> now has an optional denomination attribute, which can be set to euro (default) or dollar. Yay for globalization! No, wait.

+

Anyway, the denomination is added automatically whenever you reference the fee using the <p_fee/> placeholder.

+

Client info now has its own file

+

The <client> element has been extracted from the document and now exists all by itself in the file client_info.xml, which is located in the source directory. This gives us the possibility to have a ‘client library’ and to easily reuse client info - just replace the file with the proper one for the current client.

+

Note that there are some new fields in the client section, <invoice_rep> and <invoice_mail> for use in the… (see next section)

+

Invoices!

+

w00t. You can now generate a pdf invoice directly from offerte.xml. Use:

+

java -jar saxon9he.jar -s:/path/to/offerte/source/offerte.xml -xsl:/path/to/offerte/xslt/generate_invoice.xsl -o:/path/to/report/target/invoice.fo INVOICE_NO=[invoice number] -xi

+

And then:

+

fop -c conf/rosfop.xconf /path/to/offerte/target/invoice.fo path/to/offerte/target/invoice.pdf

+

March 9, 2016

+

An essay on placeholders

+

Universality

+

Placeholders can now be used in both offertes and pentest reports. Within reason, though! Pentest reports only have access to a limited set as the other placeholders are not relevant:

+ +

To accommodate for especially those last two bullets, we now have room for an optional pentestinfo tag in the report meta section, following the <targets> element. It’s the same as the pentestinfo for offertes, except it doesn’t hold financial info.

+

Robustness

+

When you insert a placeholder, there is now a check to see if
+a. The element you’re referring to exists
+b. The element you’re referring to contains text

+

If either a or b are not the case, you’ll end up with a red XXXXX. Which should hopefully get your, or somebody else’s, attention during review time.

+

Title Case

+

Uppercase is now forced on titles that should be in uppercase (i.e. report and offerte title pages, plus offerte titles in general).

+

Forcing title case for pentest report titles is unfortunately not possible from a style point of view as xsl-fo can only capitalize every word, which is not really what we want. But Peter Mosmans’s validation script has your back on this.

+

Finally, we have a <div> element!

+

What does <div> do?

+

Nothing. <div> just is.

+

Sigh. Ok, why is <div>?

+

You can use <div> as a container for other block elements. This is basically only (but very) useful for snippets, as snippets need to be well-formed XML documentlets and can therefore only have one root element. If the snippet is a complete section, this is not a problem. If the snippet is a bunch of paragraphs or something, you’re out of luck. Or rather, you used to be out of luck, because there was no <div>. But now there is <div>. So your snippet can be <div> (root element), containing everything you want. Well, everything that’s allowed, anyway.

+

So what’s allowed in <div>?

+

All block elements: p, ul, ol, table, img, pre, code

+

And what elements can contain <div>?

+

Sections, Annexes and Appendices. NOTHING ELSE. DON’T EVEN TRY.

\ No newline at end of file diff --git a/xml/RELEASE_NOTES.md b/xml/RELEASE_NOTES.md index 34a3ed8..727a3ba 100644 --- a/xml/RELEASE_NOTES.md +++ b/xml/RELEASE_NOTES.md @@ -1,6 +1,20 @@ RELEASE NOTES ============= +August 19th, 2016 +----------------- + +### Contracts + +Added a contract document type; it works as follows: + +1. fill out the fields (elements) in contract_info.xml +2. Create contract.xml from contract_info.xml using info2contract.xsl +3. contract.xml --> contract.pdf (using generate_contract.xsl + fop) + +In general there shoudl be no need to edit contract.xml, it is an intermediate document. The idea is to go straight from contract_info.xml to contract.pdf (in two steps) + + July 30, 2016 ------------- @@ -17,6 +31,7 @@ The `` element now has an optional `@status` attribute. Possible values The `` element now likewise has this optional `@status` attribute with the same possible values. You can add it to generate a finding summary table containing only the findings with a specific status. + June 15, 2016 ------------- diff --git a/xml/dtd/common.xsd b/xml/dtd/common.xsd index 117a2df..c93c3e6 100644 --- a/xml/dtd/common.xsd +++ b/xml/dtd/common.xsd @@ -32,6 +32,7 @@ + @@ -220,6 +221,15 @@ + + + + + + + + + diff --git a/xml/dtd/contract_info.xsd b/xml/dtd/contract_info.xsd new file mode 100644 index 0000000..07c78e7 --- /dev/null +++ b/xml/dtd/contract_info.xsd @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xml/dtd/pentestreport.xsd b/xml/dtd/pentestreport.xsd index 4c5f80d..564e71b 100644 --- a/xml/dtd/pentestreport.xsd +++ b/xml/dtd/pentestreport.xsd @@ -335,14 +335,6 @@ - - - - - - - - diff --git a/xml/source/contract.xml b/xml/source/contract.xml new file mode 100644 index 0000000..c3af6f5 --- /dev/null +++ b/xml/source/contract.xml @@ -0,0 +1,76 @@ + + + + + + fixed_term + + battle the pirates + + + + Peter Pan +
Cloud 9
+ 1234 XX + Treehouse City + Neverland + peter@pan.tech + 50 + +
+ + + Taunting Captain Hook + Feeding crocodiles + Flying to and fro ('to' and 'fro' to be specified at takeoff) + + 2015-08-18 + 2016-10-14 + + 30 + + month + + + + +
+ security consulting agreement + + +

WHEREAS:

+
    + + +
+ +
+ AGREE AS FOLLOWS +
    + + + + + + + + + + + + + + + +
+
+
+ Signed in duplicate on August 18, 2016 in + +
+
+
diff --git a/xml/source/contract_info.xml b/xml/source/contract_info.xml new file mode 100644 index 0000000..108c913 --- /dev/null +++ b/xml/source/contract_info.xml @@ -0,0 +1,34 @@ + + + + + + fixed_term + battle the pirates + + + Peter Pan +
Cloud 9
+ 1234 XX + Treehouse City + Neverland + peter@pan.tech + 50 +
+ + + Taunting Captain Hook + Feeding crocodiles + Flying to and fro ('to' and 'fro' to be specified at takeoff) + + 2016-08-18 + 2016-09-15 + + 30 + month + + +
diff --git a/xml/source/snippets/contract/en/ag_biggerscopewarning.xml b/xml/source/snippets/contract/en/ag_biggerscopewarning.xml new file mode 100644 index 0000000..140e70b --- /dev/null +++ b/xml/source/snippets/contract/en/ag_biggerscopewarning.xml @@ -0,0 +1,2 @@ + +
  • If during the course of the Activities, there is a risk that the scope of the assignment is bigger than expected, the Consultant will let know without delay.
  • diff --git a/xml/source/snippets/contract/en/ag_companyinstructs.xml b/xml/source/snippets/contract/en/ag_companyinstructs.xml new file mode 100644 index 0000000..58a7ea9 --- /dev/null +++ b/xml/source/snippets/contract/en/ag_companyinstructs.xml @@ -0,0 +1,2 @@ + +
  • instructs (in Dutch: "wijst aan"; not "instrueert") the Consultant – and the Consultant agrees to perform the following activities (the “Activities”):
  • diff --git a/xml/source/snippets/contract/en/ag_generaltermsandconditions.xml b/xml/source/snippets/contract/en/ag_generaltermsandconditions.xml new file mode 100644 index 0000000..a34ef2c --- /dev/null +++ b/xml/source/snippets/contract/en/ag_generaltermsandconditions.xml @@ -0,0 +1,2 @@ + +
  • The general terms and conditions of apply to this agreement. rejects any general terms and conditions used by the Consultant.
  • diff --git a/xml/source/snippets/contract/en/ag_law.xml b/xml/source/snippets/contract/en/ag_law.xml new file mode 100644 index 0000000..d649b5d --- /dev/null +++ b/xml/source/snippets/contract/en/ag_law.xml @@ -0,0 +1,2 @@ + +
  • Dutch law applies to this agreement. Any dispute between and Consultant will be resolved in the first instance exclusively by the District Court (in Dutch: “rechtbank”) of Amsterdam, the Netherlands.
  • diff --git a/xml/source/snippets/contract/en/ag_liability.xml b/xml/source/snippets/contract/en/ag_liability.xml new file mode 100644 index 0000000..04c8044 --- /dev/null +++ b/xml/source/snippets/contract/en/ag_liability.xml @@ -0,0 +1,2 @@ + +
  • Unless a result of gross negligence or willful misconduct, the liability of either party to the other for any type of damages is limited to the amount of Consultant's total fees under Article 5 of this agreement.
  • diff --git a/xml/source/snippets/contract/en/ag_noemployment.xml b/xml/source/snippets/contract/en/ag_noemployment.xml new file mode 100644 index 0000000..2972036 --- /dev/null +++ b/xml/source/snippets/contract/en/ag_noemployment.xml @@ -0,0 +1,3 @@ + +
  • and the Consultant explicitly do not intend to enter into an employment agreement (in Dutch: “arbeidsovereenkomst”) as in Article 7:610 Burgerlijk Wetboek. The Consultant guarantees he shall never claim an employment agreement exists. +
  • \ No newline at end of file diff --git a/xml/source/snippets/contract/en/ag_nondisclosure.xml b/xml/source/snippets/contract/en/ag_nondisclosure.xml new file mode 100644 index 0000000..b585791 --- /dev/null +++ b/xml/source/snippets/contract/en/ag_nondisclosure.xml @@ -0,0 +1,2 @@ + +
  • The Consultant will not disclose confidential information and personal data receives from , or gains access to in the course of the Activities. The Consultant will only use this information or data for the purposes of carrying out this agreement. The Consultant will take reasonable measures to maintain the confidentiality of this information and data. The Consultant may disclose this information and data on a need-to-know basis, and only to persons associated with as employee, freelancer or volunteer and only if the Consultant knows that they are bound by the same confidentiality obligations.
  • diff --git a/xml/source/snippets/contract/en/ag_ownrisk.xml b/xml/source/snippets/contract/en/ag_ownrisk.xml new file mode 100644 index 0000000..b2736a2 --- /dev/null +++ b/xml/source/snippets/contract/en/ag_ownrisk.xml @@ -0,0 +1,2 @@ + +
  • The Consultant is working at his or her own risk (in Dutch: “voor eigen rekening en risico”). The Consultant is free to perform the Activities at his or her own discretion (in Dutch: “naar eigen inzicht”) and independently. The Consultant will use his own resources and tools to perform the Activities for .
  • diff --git a/xml/source/snippets/contract/en/ag_payment_fixed_term.xml b/xml/source/snippets/contract/en/ag_payment_fixed_term.xml new file mode 100644 index 0000000..6142e7b --- /dev/null +++ b/xml/source/snippets/contract/en/ag_payment_fixed_term.xml @@ -0,0 +1,3 @@ + +
  • will pay the Consultant per hour excluding VAT. It will do so after has received an invoice from the Consultant. The Consultant will send an invoice within 14 days after the end of each calendar month for the Activities performed during that month.

    +

    will then pay the agreed amount within 30 days of receipt of the invoice. will also pay reasonable travel expenses of the Consultant, to the extent that has given prior written approval for such costs and the Consultant provides with an invoice or other documentation for these expenses. will not reimburse any other costs the Consultant incurs in the course of the Activities, unless has given prior written approval for such costs. For the avoidance of doubt, shall pay no wages (in Dutch: "salaris") to the Consultant and therefore, shall not provide payslips to the Consultant, nor pay to the Consultant any money or allowance in the event of a holiday or illness of the Consultant.

  • diff --git a/xml/source/snippets/contract/en/ag_payment_single_engagement.xml b/xml/source/snippets/contract/en/ag_payment_single_engagement.xml new file mode 100644 index 0000000..56f417b --- /dev/null +++ b/xml/source/snippets/contract/en/ag_payment_single_engagement.xml @@ -0,0 +1,3 @@ + +
  • will pay the Consultant for a -hour engagement: per hour excluding VAT, therefore totaling excluding VAT. It will do so after has been paid for the assignment in the context of which the Activities took place and has received an invoice from the Consultant. The Consultant will send an invoice within 14 days after the end of each calendar month for the Activities performed during that month.

    +

    will then pay the agreed amount within 30 days of receipt of the invoice. will also pay reasonable travel expenses of the Consultant, to the extent that has given prior written approval for such costs and the Consultant provides with an invoice or other documentation for these expenses. will not reimburse any other costs the Consultant incurs in the course of the Activities, unless has given prior written approval for such costs. For the avoidance of doubt, shall pay no wages (in Dutch: "salaris") to the Consultant and therefore, shall not provide payslips to the Consultant, nor pay to the Consultant any money or allowance in the event of a holiday or illness of the Consultant.

  • diff --git a/xml/source/snippets/contract/en/ag_period.xml b/xml/source/snippets/contract/en/ag_period.xml new file mode 100644 index 0000000..cf4743f --- /dev/null +++ b/xml/source/snippets/contract/en/ag_period.xml @@ -0,0 +1,4 @@ + +
  • This contract shall be effective as of for the period of . This contract will end by operation of law on without any notice being required.

    +

    In case of tacit extension of this contract, the parties agree to do so for the same term and on the same conditions. Either party is entitled to give notice of termination of the contract with immediate effect. Notice of termination should be given by email. (To : ; to the Consultant: ) The other party will confirm the termination by return.

    +

    Premature termination shall not give rise to liability or financial compensation for either party.

  • diff --git a/xml/source/snippets/contract/en/ag_propertyrights.xml b/xml/source/snippets/contract/en/ag_propertyrights.xml new file mode 100644 index 0000000..2809150 --- /dev/null +++ b/xml/source/snippets/contract/en/ag_propertyrights.xml @@ -0,0 +1,2 @@ + +
  • The Consultant transfers to all intellectual property rights created as a result of the Activities. To the extent that it is not possible to transfer these rights, grants to a perpetual, exclusive transferable, sub-licensable, world-wide license to such rights, and agrees to co-operate with the transfer of these rights to . To the extent that the Consultant has transferred these rights to , grants a perpetual, non-exclusive, non-transferable, not-sub-licensable, world-wide license to such rights to the Consultant, unless considers this impossible, due to obligations might have vis-à-vis others. In that case, will explore whether it is possible to grant to the Consultant a license on the rights with a narrower scope. For the avoidance of doubt, any rights of the Consultant vested in software or services developed prior to the Activities are not affected by this agreement.
  • diff --git a/xml/source/snippets/contract/en/ag_provisions.xml b/xml/source/snippets/contract/en/ag_provisions.xml new file mode 100644 index 0000000..c8d7849 --- /dev/null +++ b/xml/source/snippets/contract/en/ag_provisions.xml @@ -0,0 +1,2 @@ + +
  • If any of the provisions of this agreement is annulled or void, the other provisions remain in effect. To the extent possible, the annulled or void provision will be replaced by a similar provision that has the same effect.
  • diff --git a/xml/source/snippets/contract/en/ag_responsibilities.xml b/xml/source/snippets/contract/en/ag_responsibilities.xml new file mode 100644 index 0000000..1477107 --- /dev/null +++ b/xml/source/snippets/contract/en/ag_responsibilities.xml @@ -0,0 +1,12 @@ + +
  • The Consultant is responsible:
    • for ensuring that any work performed in the course of + this agreement is lawful (in Dutch: “rechtmatig”) and not illegal (in Dutch: “niet + strafbaar”);
    • +
    • for ensuring that by performing the Activities, does not act contrary to a + non-compete- or a confidentiality obligation may have. If there is a risk that + the Consultant will act contrary to such an obligation, will inform + without delay. then has the right to terminate the agreement without + compensation;
    • +
    • and for paying any applicable taxes and social security premiums following from the + Activities. Should have to pay any of these, the Consultant will indemnify + .
  • diff --git a/xml/source/snippets/contract/en/ag_retainrights.xml b/xml/source/snippets/contract/en/ag_retainrights.xml new file mode 100644 index 0000000..4b9e32e --- /dev/null +++ b/xml/source/snippets/contract/en/ag_retainrights.xml @@ -0,0 +1,2 @@ + +
  • The Consultant retains all intellectual property rights owns prior to this agreement.
  • diff --git a/xml/source/snippets/contract/en/ag_thirdparty.xml b/xml/source/snippets/contract/en/ag_thirdparty.xml new file mode 100644 index 0000000..680e745 --- /dev/null +++ b/xml/source/snippets/contract/en/ag_thirdparty.xml @@ -0,0 +1,2 @@ + +
  • Should a third party lodge a claim against or any of its employees, freelancers or volunteers, or the public prosecutor initiate an investigation or criminal proceedings against any of these parties, as a result of activities performed by the Consultant under this agreement, then the Consultant will co-operate fully with in defending against this claim, investigation or these proceedings, including by providing any evidence he or she has which may be relevant to this defense.
  • diff --git a/xml/source/snippets/contract/en/ag_workinghours.xml b/xml/source/snippets/contract/en/ag_workinghours.xml new file mode 100644 index 0000000..0323bdf --- /dev/null +++ b/xml/source/snippets/contract/en/ag_workinghours.xml @@ -0,0 +1,2 @@ + +
  • The agreed working hours shall amount to hours per . The Consultant may be expected to perform overtime outside the established working hours whenever this is necessary for the proper performance of the Activites.
  • diff --git a/xml/source/snippets/contract/en/ag_worktime.xml b/xml/source/snippets/contract/en/ag_worktime.xml new file mode 100644 index 0000000..08d6e20 --- /dev/null +++ b/xml/source/snippets/contract/en/ag_worktime.xml @@ -0,0 +1,2 @@ + +
  • The Consultant will perform the Activities from up to and including .
  • diff --git a/xml/source/snippets/contract/en/parties.xml b/xml/source/snippets/contract/en/parties.xml new file mode 100644 index 0000000..405ebab --- /dev/null +++ b/xml/source/snippets/contract/en/parties.xml @@ -0,0 +1,6 @@ + +

    , located at , , , represented by (“”);

    + +

    AND

    + +

    , with address at , , , (the “Consultant”);

    \ No newline at end of file diff --git a/xml/source/snippets/contract/en/wa_companyhasasked.xml b/xml/source/snippets/contract/en/wa_companyhasasked.xml new file mode 100644 index 0000000..505f386 --- /dev/null +++ b/xml/source/snippets/contract/en/wa_companyhasasked.xml @@ -0,0 +1,2 @@ + +
  • has asked the Consultant to assist with this.
  • diff --git a/xml/source/snippets/contract/en/wa_companywants.xml b/xml/source/snippets/contract/en/wa_companywants.xml new file mode 100644 index 0000000..0e84328 --- /dev/null +++ b/xml/source/snippets/contract/en/wa_companywants.xml @@ -0,0 +1,2 @@ + +
  • wants to .
  • diff --git a/xml/source/snippets/contract/en/wa_contractorcan.xml b/xml/source/snippets/contract/en/wa_contractorcan.xml new file mode 100644 index 0000000..912cff9 --- /dev/null +++ b/xml/source/snippets/contract/en/wa_contractorcan.xml @@ -0,0 +1,2 @@ + +
  • The Consultant is willing and able to perform the activities mentioned hereafter.
  • diff --git a/xml/source/snippets/contract/en/wa_noemploymentintention.xml b/xml/source/snippets/contract/en/wa_noemploymentintention.xml new file mode 100644 index 0000000..c53066c --- /dev/null +++ b/xml/source/snippets/contract/en/wa_noemploymentintention.xml @@ -0,0 +1,2 @@ + +
  • and the Consultant have no intention whatsoever to agree upon an employment agreement and this agreement is only drafted to enable the Consultant to perform incidental activities for . and the Consultant explicitly confirm that this agreement does not qualify as an employment agreement. The Consultant is free to perform work for other parties, and in fact does so on a regular basis.
  • \ No newline at end of file diff --git a/xml/source/snippets/contract/nl/ag_biggerscopewarning.xml b/xml/source/snippets/contract/nl/ag_biggerscopewarning.xml new file mode 100644 index 0000000..140e70b --- /dev/null +++ b/xml/source/snippets/contract/nl/ag_biggerscopewarning.xml @@ -0,0 +1,2 @@ + +
  • If during the course of the Activities, there is a risk that the scope of the assignment is bigger than expected, the Consultant will let know without delay.
  • diff --git a/xml/source/snippets/contract/nl/ag_companyinstructs.xml b/xml/source/snippets/contract/nl/ag_companyinstructs.xml new file mode 100644 index 0000000..58a7ea9 --- /dev/null +++ b/xml/source/snippets/contract/nl/ag_companyinstructs.xml @@ -0,0 +1,2 @@ + +
  • instructs (in Dutch: "wijst aan"; not "instrueert") the Consultant – and the Consultant agrees to perform the following activities (the “Activities”):
  • diff --git a/xml/source/snippets/contract/nl/ag_generaltermsandconditions.xml b/xml/source/snippets/contract/nl/ag_generaltermsandconditions.xml new file mode 100644 index 0000000..a34ef2c --- /dev/null +++ b/xml/source/snippets/contract/nl/ag_generaltermsandconditions.xml @@ -0,0 +1,2 @@ + +
  • The general terms and conditions of apply to this agreement. rejects any general terms and conditions used by the Consultant.
  • diff --git a/xml/source/snippets/contract/nl/ag_law.xml b/xml/source/snippets/contract/nl/ag_law.xml new file mode 100644 index 0000000..d649b5d --- /dev/null +++ b/xml/source/snippets/contract/nl/ag_law.xml @@ -0,0 +1,2 @@ + +
  • Dutch law applies to this agreement. Any dispute between and Consultant will be resolved in the first instance exclusively by the District Court (in Dutch: “rechtbank”) of Amsterdam, the Netherlands.
  • diff --git a/xml/source/snippets/contract/nl/ag_liability.xml b/xml/source/snippets/contract/nl/ag_liability.xml new file mode 100644 index 0000000..04c8044 --- /dev/null +++ b/xml/source/snippets/contract/nl/ag_liability.xml @@ -0,0 +1,2 @@ + +
  • Unless a result of gross negligence or willful misconduct, the liability of either party to the other for any type of damages is limited to the amount of Consultant's total fees under Article 5 of this agreement.
  • diff --git a/xml/source/snippets/contract/nl/ag_noemployment.xml b/xml/source/snippets/contract/nl/ag_noemployment.xml new file mode 100644 index 0000000..2972036 --- /dev/null +++ b/xml/source/snippets/contract/nl/ag_noemployment.xml @@ -0,0 +1,3 @@ + +
  • and the Consultant explicitly do not intend to enter into an employment agreement (in Dutch: “arbeidsovereenkomst”) as in Article 7:610 Burgerlijk Wetboek. The Consultant guarantees he shall never claim an employment agreement exists. +
  • \ No newline at end of file diff --git a/xml/source/snippets/contract/nl/ag_nondisclosure.xml b/xml/source/snippets/contract/nl/ag_nondisclosure.xml new file mode 100644 index 0000000..b585791 --- /dev/null +++ b/xml/source/snippets/contract/nl/ag_nondisclosure.xml @@ -0,0 +1,2 @@ + +
  • The Consultant will not disclose confidential information and personal data receives from , or gains access to in the course of the Activities. The Consultant will only use this information or data for the purposes of carrying out this agreement. The Consultant will take reasonable measures to maintain the confidentiality of this information and data. The Consultant may disclose this information and data on a need-to-know basis, and only to persons associated with as employee, freelancer or volunteer and only if the Consultant knows that they are bound by the same confidentiality obligations.
  • diff --git a/xml/source/snippets/contract/nl/ag_ownrisk.xml b/xml/source/snippets/contract/nl/ag_ownrisk.xml new file mode 100644 index 0000000..b2736a2 --- /dev/null +++ b/xml/source/snippets/contract/nl/ag_ownrisk.xml @@ -0,0 +1,2 @@ + +
  • The Consultant is working at his or her own risk (in Dutch: “voor eigen rekening en risico”). The Consultant is free to perform the Activities at his or her own discretion (in Dutch: “naar eigen inzicht”) and independently. The Consultant will use his own resources and tools to perform the Activities for .
  • diff --git a/xml/source/snippets/contract/nl/ag_payment_fixed_term.xml b/xml/source/snippets/contract/nl/ag_payment_fixed_term.xml new file mode 100644 index 0000000..6142e7b --- /dev/null +++ b/xml/source/snippets/contract/nl/ag_payment_fixed_term.xml @@ -0,0 +1,3 @@ + +
  • will pay the Consultant per hour excluding VAT. It will do so after has received an invoice from the Consultant. The Consultant will send an invoice within 14 days after the end of each calendar month for the Activities performed during that month.

    +

    will then pay the agreed amount within 30 days of receipt of the invoice. will also pay reasonable travel expenses of the Consultant, to the extent that has given prior written approval for such costs and the Consultant provides with an invoice or other documentation for these expenses. will not reimburse any other costs the Consultant incurs in the course of the Activities, unless has given prior written approval for such costs. For the avoidance of doubt, shall pay no wages (in Dutch: "salaris") to the Consultant and therefore, shall not provide payslips to the Consultant, nor pay to the Consultant any money or allowance in the event of a holiday or illness of the Consultant.

  • diff --git a/xml/source/snippets/contract/nl/ag_payment_single_engagement.xml b/xml/source/snippets/contract/nl/ag_payment_single_engagement.xml new file mode 100644 index 0000000..56f417b --- /dev/null +++ b/xml/source/snippets/contract/nl/ag_payment_single_engagement.xml @@ -0,0 +1,3 @@ + +
  • will pay the Consultant for a -hour engagement: per hour excluding VAT, therefore totaling excluding VAT. It will do so after has been paid for the assignment in the context of which the Activities took place and has received an invoice from the Consultant. The Consultant will send an invoice within 14 days after the end of each calendar month for the Activities performed during that month.

    +

    will then pay the agreed amount within 30 days of receipt of the invoice. will also pay reasonable travel expenses of the Consultant, to the extent that has given prior written approval for such costs and the Consultant provides with an invoice or other documentation for these expenses. will not reimburse any other costs the Consultant incurs in the course of the Activities, unless has given prior written approval for such costs. For the avoidance of doubt, shall pay no wages (in Dutch: "salaris") to the Consultant and therefore, shall not provide payslips to the Consultant, nor pay to the Consultant any money or allowance in the event of a holiday or illness of the Consultant.

  • diff --git a/xml/source/snippets/contract/nl/ag_period.xml b/xml/source/snippets/contract/nl/ag_period.xml new file mode 100644 index 0000000..234dcf7 --- /dev/null +++ b/xml/source/snippets/contract/nl/ag_period.xml @@ -0,0 +1,4 @@ + +
  • This contract shall be effective as of for the period of . This contract will end by operation of law on without any notice being required.

    +

    In case of tacit extension of this contract, the parties agree to do so for the same term and on the same conditions. Either party is entitled to give notice of termination of the contract with immediate effect. Notice of termination should be given by email. (To : ; to the Consultant: ) The other party will confirm the termination by return.

    +

    Premature termination shall not give rise to liability or financial compensation for either party.

  • diff --git a/xml/source/snippets/contract/nl/ag_propertyrights.xml b/xml/source/snippets/contract/nl/ag_propertyrights.xml new file mode 100644 index 0000000..2809150 --- /dev/null +++ b/xml/source/snippets/contract/nl/ag_propertyrights.xml @@ -0,0 +1,2 @@ + +
  • The Consultant transfers to all intellectual property rights created as a result of the Activities. To the extent that it is not possible to transfer these rights, grants to a perpetual, exclusive transferable, sub-licensable, world-wide license to such rights, and agrees to co-operate with the transfer of these rights to . To the extent that the Consultant has transferred these rights to , grants a perpetual, non-exclusive, non-transferable, not-sub-licensable, world-wide license to such rights to the Consultant, unless considers this impossible, due to obligations might have vis-à-vis others. In that case, will explore whether it is possible to grant to the Consultant a license on the rights with a narrower scope. For the avoidance of doubt, any rights of the Consultant vested in software or services developed prior to the Activities are not affected by this agreement.
  • diff --git a/xml/source/snippets/contract/nl/ag_provisions.xml b/xml/source/snippets/contract/nl/ag_provisions.xml new file mode 100644 index 0000000..c8d7849 --- /dev/null +++ b/xml/source/snippets/contract/nl/ag_provisions.xml @@ -0,0 +1,2 @@ + +
  • If any of the provisions of this agreement is annulled or void, the other provisions remain in effect. To the extent possible, the annulled or void provision will be replaced by a similar provision that has the same effect.
  • diff --git a/xml/source/snippets/contract/nl/ag_responsibilities.xml b/xml/source/snippets/contract/nl/ag_responsibilities.xml new file mode 100644 index 0000000..1477107 --- /dev/null +++ b/xml/source/snippets/contract/nl/ag_responsibilities.xml @@ -0,0 +1,12 @@ + +
  • The Consultant is responsible:
    • for ensuring that any work performed in the course of + this agreement is lawful (in Dutch: “rechtmatig”) and not illegal (in Dutch: “niet + strafbaar”);
    • +
    • for ensuring that by performing the Activities, does not act contrary to a + non-compete- or a confidentiality obligation may have. If there is a risk that + the Consultant will act contrary to such an obligation, will inform + without delay. then has the right to terminate the agreement without + compensation;
    • +
    • and for paying any applicable taxes and social security premiums following from the + Activities. Should have to pay any of these, the Consultant will indemnify + .
  • diff --git a/xml/source/snippets/contract/nl/ag_retainrights.xml b/xml/source/snippets/contract/nl/ag_retainrights.xml new file mode 100644 index 0000000..4b9e32e --- /dev/null +++ b/xml/source/snippets/contract/nl/ag_retainrights.xml @@ -0,0 +1,2 @@ + +
  • The Consultant retains all intellectual property rights owns prior to this agreement.
  • diff --git a/xml/source/snippets/contract/nl/ag_thirdparty.xml b/xml/source/snippets/contract/nl/ag_thirdparty.xml new file mode 100644 index 0000000..680e745 --- /dev/null +++ b/xml/source/snippets/contract/nl/ag_thirdparty.xml @@ -0,0 +1,2 @@ + +
  • Should a third party lodge a claim against or any of its employees, freelancers or volunteers, or the public prosecutor initiate an investigation or criminal proceedings against any of these parties, as a result of activities performed by the Consultant under this agreement, then the Consultant will co-operate fully with in defending against this claim, investigation or these proceedings, including by providing any evidence he or she has which may be relevant to this defense.
  • diff --git a/xml/source/snippets/contract/nl/ag_workinghours.xml b/xml/source/snippets/contract/nl/ag_workinghours.xml new file mode 100644 index 0000000..0323bdf --- /dev/null +++ b/xml/source/snippets/contract/nl/ag_workinghours.xml @@ -0,0 +1,2 @@ + +
  • The agreed working hours shall amount to hours per . The Consultant may be expected to perform overtime outside the established working hours whenever this is necessary for the proper performance of the Activites.
  • diff --git a/xml/source/snippets/contract/nl/ag_worktime.xml b/xml/source/snippets/contract/nl/ag_worktime.xml new file mode 100644 index 0000000..08d6e20 --- /dev/null +++ b/xml/source/snippets/contract/nl/ag_worktime.xml @@ -0,0 +1,2 @@ + +
  • The Consultant will perform the Activities from up to and including .
  • diff --git a/xml/source/snippets/contract/nl/parties.xml b/xml/source/snippets/contract/nl/parties.xml new file mode 100644 index 0000000..294de4d --- /dev/null +++ b/xml/source/snippets/contract/nl/parties.xml @@ -0,0 +1,6 @@ + +

    , met adres , , , vertegenwoordigd door (“”);

    + +

    EN

    + +

    , met adres op , , , (de “Consultant”);

    \ No newline at end of file diff --git a/xml/source/snippets/contract/nl/wa_companyhasasked.xml b/xml/source/snippets/contract/nl/wa_companyhasasked.xml new file mode 100644 index 0000000..505f386 --- /dev/null +++ b/xml/source/snippets/contract/nl/wa_companyhasasked.xml @@ -0,0 +1,2 @@ + +
  • has asked the Consultant to assist with this.
  • diff --git a/xml/source/snippets/contract/nl/wa_companywants.xml b/xml/source/snippets/contract/nl/wa_companywants.xml new file mode 100644 index 0000000..0e84328 --- /dev/null +++ b/xml/source/snippets/contract/nl/wa_companywants.xml @@ -0,0 +1,2 @@ + +
  • wants to .
  • diff --git a/xml/source/snippets/contract/nl/wa_contractorcan.xml b/xml/source/snippets/contract/nl/wa_contractorcan.xml new file mode 100644 index 0000000..912cff9 --- /dev/null +++ b/xml/source/snippets/contract/nl/wa_contractorcan.xml @@ -0,0 +1,2 @@ + +
  • The Consultant is willing and able to perform the activities mentioned hereafter.
  • diff --git a/xml/source/snippets/contract/nl/wa_noemploymentintention.xml b/xml/source/snippets/contract/nl/wa_noemploymentintention.xml new file mode 100644 index 0000000..c53066c --- /dev/null +++ b/xml/source/snippets/contract/nl/wa_noemploymentintention.xml @@ -0,0 +1,2 @@ + +
  • and the Consultant have no intention whatsoever to agree upon an employment agreement and this agreement is only drafted to enable the Consultant to perform incidental activities for . and the Consultant explicitly confirm that this agreement does not qualify as an employment agreement. The Consultant is free to perform work for other parties, and in fact does so on a regular basis.
  • \ No newline at end of file diff --git a/xml/source/snippets/localisationstrings.xml b/xml/source/snippets/localisationstrings.xml index a9f68ee..a24a6d6 100644 --- a/xml/source/snippets/localisationstrings.xml +++ b/xml/source/snippets/localisationstrings.xml @@ -63,5 +63,37 @@ namens for + + In duplicaat getekend + Signed in duplicate + + + security consulting agreement + security consulting agreement + + + hij + he + + + ze + she + + + hen + they + + + zijn + his + + + haar + her + + + hun + their + diff --git a/xml/source/snippets/snippetselection.xml b/xml/source/snippets/snippetselection.xml new file mode 100644 index 0000000..216f6aa --- /dev/null +++ b/xml/source/snippets/snippetselection.xml @@ -0,0 +1,30 @@ + + + + + introandscope + projectoverview + + + introandscope + projectoverview + + + + + + parties + + + wa_companywants + wa_companyhasasked + wa_contractorcan + wa_noemploymentintention + + + + parties + projectoverview + + + diff --git a/xml/source/target/report.fo b/xml/source/target/report.fo deleted file mode 100644 index ec016ef..0000000 --- a/xml/source/target/report.fo +++ /dev/null @@ -1,146 +0,0 @@ -Confidential/Chamber of Commerce - 60628081 -PENETRATION TEST REPORTforSitting Duck BV V 0.1AmsterdamJanuary 1st, 2015Document PropertiesClientSitting Duck BVTitlePenetration Test ReportTargetTargetVersion 0.1PentesterFirstName LastNameAuthorYourNameReviewed byFirstName LastNameApproved byMelanie RiebackVersion controlVersionDateAuthorDescription 0.1January 1st, 2015YourNameInitial draftContactFor more information about this Document and its - contents please contact Radically Open Security B.V.NameMelanie RiebackAddressOverdiemerweg 281111 PP DiemenThe NetherlandsPhone+31 6 10 21 32 40Emailinfo@radicallyopensecurity.com - -Table of Contents - - - - -1  Executive Summary  1.1  Introduction  1.2  Scope of work  1.3  Project objectives  1.4  Timeline  1.5  Results In A Nutshell  1.6  Summary of Findings  1.7  Summary of Recommendations   - - 2  Methodology  2.1  Planning  2.2  Risk Classification   - -3  Reconnaissance and Fingerprinting  3.1  Automated Scans   - - -4  Pentest Technical Summary  4.1  Findings  4.2  Non-Findings   - -5  Future Work   -6  Conclusion   - - Appendix 1  Testing team   - - - - - 1   Executive Summary - - 1.1   Introduction - ... - This report contains our findings as well as detailed explanations - of exactly how ROS performed the penetration test. - - - 1.2   Scope of work - The scope of the penetration test was limited to the following - target: - Target - - - 1.3   Project objectives - ... - - - 1.4   Timeline - The Security Audit took place between X and Y, 2015. - - - 1.5   Results In A Nutshell - - - 1.6   Summary of Findings - IDTypeDescriptionThreat level - - - - 1.7   Summary of Recommendations - IDTypeRecommendation - - - - - - 2   Methodology - - 2.1   Planning - Our general approach during this penetration test was as follows: - 1. ReconnaissanceWe attempted to gather as much information as possible about the - target. Reconnaissance can take two forms: active and passive. A - passive attack is always the best starting point as this would normally defeat - intrusion detection systems and other forms of protection, etc., afforded to the - network. This would usually involve trying to discover publicly available - information by utilizing a web browser and visiting newsgroups etc. An active form - would be more intrusive and may show up in audit logs and may take the form of a - social engineering type of attack.2. EnumerationWe used varied operating system fingerprinting tools to determine - what hosts are alive on the network and more importantly what services and operating - systems they are running. Research into these services would be carried out to - tailor the test to the discovered services.3. ScanningThrough the use of vulnerability scanners, all discovered hosts would be tested - for vulnerabilities. The result would be analyzed to determine if there any - vulnerabilities that could be exploited to gain access to a target host on a - network.4. Obtaining AccessThrough the use of published exploits or weaknesses found in - applications, operating system and services access would then be attempted. This may - be done surreptitiously or by more brute force methods. - - - 2.2   Risk Classification - Throughout the document, each vulnerability or risk identified has been labeled and - categorized as: - ExtremeExtreme risk of security controls being compromised with the possibility - of catastrophic financial/reputational losses occurring as a result.HighHigh risk of security controls being compromised with the potential for - significant financial/reputational losses occurring as a result.ElevatedElevated risk of security controls being compromised with the potential - for material financial/reputational losses occurring as a result.ModerateModerate risk of security controls being compromised with the potential - for limited financial/reputational losses occurring as a result.LowLow risk of security controls being compromised with measurable negative - impacts as a result. - Please note that this risk rating system was taken from the Penetration Testing Execution - Standard (PTES). For more information, see: - http://www.pentest-standard.org/index.php/Reporting. - - - - - 3   Reconnaissance and Fingerprinting - Through automated scans we were able to gain the following information about the - software and infrastructure. Detailed scan output can be found in the sections - below. - - - 3.1   Automated Scans - As part of our active reconnaissance we used the following automated scans: - nmap – http://nmap.org - - - - - - 4   Pentest Technical Summary - - 4.1   Findings - - We have identified the following issues: - - - - - 4.2   Non-Findings - In this section we list some of the things that were tried but turned - out to be dead ends. - - - - - - 5   Future Work - - - 6   Conclusion - - - - Appendix 1   Testing team - Melanie RiebackMelanie Rieback is a former Asst. Prof. of Computer Science from the VU, - who is also the co-founder/CEO of Radically Open Security.FirstName LastNameInfo - - - \ No newline at end of file diff --git a/xml/source/target/waiver_....fo b/xml/source/target/waiver_....fo deleted file mode 100644 index d31c967..0000000 --- a/xml/source/target/waiver_....fo +++ /dev/null @@ -1,4 +0,0 @@ -/Chamber of Commerce - 60628081PENETRATION TESTING WAIVER... (“...”), with its registered office at ..., ..., ... - and duly represented by ....WHEREAS:A. ... wants some of its systems to be tested, Radically Open Security B.V. (“ROS”) has offered to perform such testing for and has accepted this offer. The assignment will be performed by ROS' core-team members, external freelancers, and/or volunteers (the “Consultants”).B. Some of the activities performed by ROS and the Consultants during the course of this assignment could be considered illegal, unless ... has given permission for these activities. ROS and the Consultant will only perform such activities if they have received the required permission.C. ... is willing to give such permission to ROS, the Consultants and any other person ROS might employ or engage for the assignment.DECLARES AS FOLLOWS:1. ... is aware that ROS will perform penetration testing services of the following systems of ..., as described below. The services are intended to gain insight in the security of these systems. To do so, ROS will access these systems, attempt to find vulnerabilities and gain further access and elevated privileges by exploiting any vulnerabilities found. ROS will test the following targets (the “Targets”):...2. ... hereby grants ROS and the Consultants on a date to be confirmed by email the broadest permission -possible to perform the assignment, including the permission to:a. enter and use the Targets;b. circumvent, breach, remove and turn off any security measures protecting the Targets;c. copy, intercept, record, amend, delete, render unusable or inaccessible any data stored on, processed by or transferred via the Targets; andd. hinder the access or use of the Targets,but ... only grants the permission for these activities to the extent that (i) such activities are necessary to perform the assignment and (ii) such activities do not disrupt the normal business operations of ....3. The permission under Article 1 extends to all systems on which the Targets run, or which ROS or the Consultant might encounter while performing the assignment, regardless of whether these systems are owned by third parties.4. ... warrants that it has the legal authority to give the permission set out under Articles 1 and 2. It also warrants it has obtained the necessary permissions from any third parties referred to under Article 3.5. Should the public prosecutor initiate an investigation or criminal proceedings against ROS or any of the consultants it engaged or employed as a result of the performance of the assignment for the customer, then ... will co-operate fully with ROS in defending against this investigation or proceedings, including by providing any evidence it has which relates to this investigation or these proceedings.Signedon    June 8, 2015in     ...by    ...for    ... \ No newline at end of file diff --git a/xml/target/contract.fo b/xml/target/contract.fo new file mode 100644 index 0000000..941bfe8 --- /dev/null +++ b/xml/target/contract.fo @@ -0,0 +1,37 @@ +Radically Open Security B.V.Overdiemerweg 281111 PP DiemenThe Netherlandswww.radicallyopensecurity.cominfo@radicallyopensecurity.comChamber of Commerce 60628081VAT number 853989655B01/Radically Open Security B.V. - Chamber of Commerce + 60628081/Radically Open Security B.V. - Chamber of Commerce + 60628081 + + + SECURITY CONSULTING AGREEMENT + + Radically Open Security B.V., located at Overdiemerweg 28, 1111 PP, Diemen, represented by Melanie Rieback (“ROS”); + +AND + +Peter Pan, with his address at Cloud 9, 1234 XX, Treehouse City, Neverland (the “Consultant”); + WHEREAS: + A. The Consultant is willing and able to perform the activities mentioned hereafter.B. ROS and the Consultant have no intention whatsoever to agree upon an employment agreement and this agreement is only drafted to enable the Consultant to perform incidental activities for ROS. ROS and the Consultant explicitly confirm that this agreement does not qualify as an employment agreement. The Consultant is free to perform work for other parties, and in fact does so on a regular basis. + + + AGREE AS FOLLOWS + 1. This contract shall be effective as of August 18, 2016 for the period of 28 days. This contract will end by operation of law on September 15, 2016 without any notice being required. +In case of tacit extension of this contract, the parties agree to do so for the same term and on the same conditions. Either party is entitled to give notice of termination of the contract with immediate effect. Notice of termination should be given by email. (To ROS: info@radicallyopensecurity.com; to the Consultant: peter@pan.tech) The other party will confirm the termination by return. +Premature termination shall not give rise to liability or financial compensation for either party.2. ROS and the Consultant explicitly do not intend to enter into an employment agreement (in Dutch: “arbeidsovereenkomst”) as in Article 7:610 Burgerlijk Wetboek. The Consultant guarantees he shall never claim an employment agreement exists. +3. ROS instructs (in Dutch: "wijst aan"; not "instrueert") the Consultant – and the Consultant agrees to perform the following activities (the “Activities”): Taunting Captain HookFeeding crocodilesFlying to and fro ('to' and 'fro' to be specified at takeoff)4. The Consultant is working at his or her own risk (in Dutch: “voor eigen rekening en risico”). The Consultant is free to perform the Activities at his or her own discretion (in Dutch: “naar eigen inzicht”) and independently. The Consultant will use his own resources and tools to perform the Activities for ROS.5. The agreed working hours shall amount to 30 hours per month. The Consultant may be expected to perform overtime outside the established working hours whenever this is necessary for the proper performance of the Activites.6. ROS will pay the Consultant € 50 per hour excluding VAT. It will do so after ROS has received an invoice from the Consultant. The Consultant will send an invoice within 14 days after the end of each calendar month for the Activities performed during that month. +ROS will then pay the agreed amount within 30 days of receipt of the invoice. ROS will also pay reasonable travel expenses of the Consultant, to the extent that ROS has given prior written approval for such costs and the Consultant provides ROS with an invoice or other documentation for these expenses. ROS will not reimburse any other costs the Consultant incurs in the course of the Activities, unless ROS has given prior written approval for such costs. For the avoidance of doubt, ROS shall pay no wages (in Dutch: "salaris") to the Consultant and therefore, ROS shall not provide payslips to the Consultant, nor pay to the Consultant any money or allowance in the event of a holiday or illness of the Consultant.7. The Consultant transfers to ROS all intellectual property rights created as a result of the Activities. To the extent that it is not possible to transfer these rights, he grants to ROS a perpetual, exclusive transferable, sub-licensable, world-wide license to such rights, and agrees to co-operate with the transfer of these rights to ROS. To the extent that the Consultant has transferred these rights to ROS, ROS grants a perpetual, non-exclusive, non-transferable, not-sub-licensable, world-wide license to such rights to the Consultant, unless ROS considers this impossible, due to obligations ROS might have vis-à-vis others. In that case, ROS will explore whether it is possible to grant to the Consultant a license on the rights with a narrower scope. For the avoidance of doubt, any rights of the Consultant vested in software or services developed prior to the Activities are not affected by this agreement.8. The Consultant retains all intellectual property rights he owns prior to this agreement.9. The Consultant will not disclose confidential information and personal data he receives from ROS, or gains access to in the course of the Activities. The Consultant will only use this information or data for the purposes of carrying out this agreement. The Consultant will take reasonable measures to maintain the confidentiality of this information and data. The Consultant may disclose this information and data on a need-to-know basis, and only to persons associated with ROS as employee, freelancer or volunteer and only if the Consultant knows that they are bound by the same confidentiality obligations.10. The Consultant is responsible: for ensuring that any work performed in the course of + this agreement is lawful (in Dutch: “rechtmatig”) and not illegal (in Dutch: “niet + strafbaar”);for ensuring that by performing the Activities, he does not act contrary to a + non-compete- or a confidentiality obligation he may have. If there is a risk that + the Consultant will act contrary to such an obligation, he will inform ROS + without delay. ROS then has the right to terminate the agreement without + compensation;and for paying any applicable taxes and social security premiums following from the + Activities. Should ROS have to pay any of these, the Consultant will indemnify + ROS.11. Should a third party lodge a claim against ROS or any of its employees, freelancers or volunteers, or the public prosecutor initiate an investigation or criminal proceedings against any of these parties, as a result of activities performed by the Consultant under this agreement, then the Consultant will co-operate fully with ROS in defending against this claim, investigation or these proceedings, including by providing any evidence he or she has which may be relevant to this defense.12. Unless a result of gross negligence or willful misconduct, the liability of either party to the other for any type of damages is limited to the amount of Consultant's total fees under Article 5 of this agreement.13. If any of the provisions of this agreement is annulled or void, the other provisions remain in effect. To the extent possible, the annulled or void provision will be replaced by a similar provision that has the same effect.14. The general terms and conditions of ROS apply to this agreement. ROS rejects any general terms and conditions used by the Consultant.15. Dutch law applies to this agreement. Any dispute between ROS and Consultant will be resolved in the first instance exclusively by the District Court (in Dutch: “rechtbank”) of Amsterdam, the Netherlands. + + + SIGNED IN DUPLICATE ON AUGUST 18, 2016 IN + Treehouse CityDiemen    Peter PanMelanie RiebackRadically Open Security B.V. + + + \ No newline at end of file diff --git a/xml/target/contract.pdf b/xml/target/contract.pdf new file mode 100644 index 0000000..1985a67 Binary files /dev/null and b/xml/target/contract.pdf differ diff --git a/xml/target/contract_single.pdf b/xml/target/contract_single.pdf new file mode 100644 index 0000000..2c11c08 Binary files /dev/null and b/xml/target/contract_single.pdf differ diff --git a/xml/xslt/auto.xsl b/xml/xslt/auto.xslt similarity index 60% rename from xml/xslt/auto.xsl rename to xml/xslt/auto.xslt index 6a473cb..24e522c 100644 --- a/xml/xslt/auto.xsl +++ b/xml/xslt/auto.xslt @@ -1,7 +1,7 @@ + xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:my="http://radical.sexy" version="2.0"> @@ -271,7 +271,9 @@ - SIGNED IN DUPLICATE + + + - - - - - - - - - - - - - - + - - Amsterdam + @@ -481,14 +469,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + - + - + @@ -505,15 +519,22 @@ + + + + + + - + + select="/offerte/meta/pentestinfo/target_application_producer | /pentest_report/meta/pentestinfo/target_application_producer"/> @@ -556,6 +577,121 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +   + + + + + + + + + + + + + + + + + + + + + + XXXXXX + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +   + + + + + + + + + + + + + + + + + + + + + + @@ -563,11 +699,58 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -578,4 +761,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 31 + + + + 28 + 29 + 28 + 29 + + + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31 + 30 + 31 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + year + + s + + + and + + + , + + + + + month + + s + + + and + + + + + day + + s + + + diff --git a/xml/xslt/block.xslt b/xml/xslt/block.xslt index b46a15c..be0245b 100644 --- a/xml/xslt/block.xslt +++ b/xml/xslt/block.xslt @@ -33,6 +33,12 @@ + + + + + + diff --git a/xml/xslt/generate_a4.xsl b/xml/xslt/generate_a4.xsl index a13091f..6519e40 100644 --- a/xml/xslt/generate_a4.xsl +++ b/xml/xslt/generate_a4.xsl @@ -11,7 +11,7 @@ - + diff --git a/xml/xslt/generate_contract.xsl b/xml/xslt/generate_contract.xsl new file mode 100644 index 0000000..1652b8e --- /dev/null +++ b/xml/xslt/generate_contract.xsl @@ -0,0 +1,189 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + £ + $ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + title- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +   +   + + +   +   + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +   + + + + + + + + + + + Chamber of Commerce + VAT number + + + + + + + + + + + + + + + diff --git a/xml/xslt/generate_document.xsl b/xml/xslt/generate_document.xsl index 54d02d0..4f3056f 100644 --- a/xml/xslt/generate_document.xsl +++ b/xml/xslt/generate_document.xsl @@ -11,7 +11,7 @@ - + diff --git a/xml/xslt/generate_invoice.xsl b/xml/xslt/generate_invoice.xsl index d493c06..bef3d19 100644 --- a/xml/xslt/generate_invoice.xsl +++ b/xml/xslt/generate_invoice.xsl @@ -11,7 +11,7 @@ - + @@ -270,7 +270,7 @@ - + @@ -305,7 +305,7 @@ - + Please keep digital unless absolutely required. Read the (unique) terms and conditions of Radically Open Security at: https://radicallyopensecurity.com/TermsandConditions.pdf diff --git a/xml/xslt/generate_offerte.xsl b/xml/xslt/generate_offerte.xsl index 217e515..a55beed 100644 --- a/xml/xslt/generate_offerte.xsl +++ b/xml/xslt/generate_offerte.xsl @@ -11,7 +11,7 @@ - + diff --git a/xml/xslt/generate_report.xsl b/xml/xslt/generate_report.xsl index a906af3..fa07c6b 100644 --- a/xml/xslt/generate_report.xsl +++ b/xml/xslt/generate_report.xsl @@ -11,7 +11,7 @@ - + diff --git a/xml/xslt/info2contract.xsl b/xml/xslt/info2contract.xsl new file mode 100644 index 0000000..7ef8f82 --- /dev/null +++ b/xml/xslt/info2contract.xsl @@ -0,0 +1,280 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + snippets/company_info.xml + + + + + +
    + + <xsl:call-template name="getString"> + <xsl:with-param name="stringID" select="'contract_title'"/> + </xsl:call-template> + + Whereas section + + + + parties + + + +

    WHEREAS:

    +
      + + + + + wa_companywants + + + + + + + wa_companyhasasked + + + + + + + + wa_contractorcan + + + + + + + wa_noemploymentintention + + + +
    + Agreement section +
    + AGREE AS FOLLOWS +
      + + + + + ag_period + + + + + + + + ag_noemployment + + + + + + + ag_companyinstructs + + + + + + + + ag_worktime + + + + + + + + ag_ownrisk + + + + + + + + ag_workinghours + + + + + + + + ag_payment + + + + + + + + ag_biggerscopewarning + + + + + + + + ag_propertyrights + + + + + + + ag_retainrights + + + + + + + ag_nondisclosure + + + + + + + ag_responsibilities + + + + + + + ag_thirdparty + + + + + + + ag_liability + + + + + + + ag_provisions + + + + + + + ag_generaltermsandconditions + + + + + + + ag_law + + + +
    +
    +
    + + <xsl:call-template name="getString"> + <xsl:with-param name="stringID" select="'signed_dupe'"/> + </xsl:call-template> + <xsl:text> </xsl:text> + <xsl:call-template name="getString"> + <xsl:with-param name="stringID" select="'waiver_signed_on'"/> + </xsl:call-template> + <xsl:text> </xsl:text> + <xsl:value-of select="$latestVersionDate"/> + <xsl:text> </xsl:text> + <xsl:call-template name="getString"> + <xsl:with-param name="stringID" select="'waiver_signed_in'"/> + </xsl:call-template> + + +
    +
    +
    + + +
    + + + + + + + + + + + + + + + + + +
    diff --git a/xml/xslt/pages.xslt b/xml/xslt/pages.xslt index badbf64..5a7d8e1 100644 --- a/xml/xslt/pages.xslt +++ b/xml/xslt/pages.xslt @@ -9,15 +9,15 @@ - - - + + + - - - + + + @@ -35,9 +35,9 @@ - - - + + + @@ -50,7 +50,12 @@
    - + + + + + + @@ -58,7 +63,16 @@ - + + + / + + - Chamber of Commerce + + + + / @@ -75,7 +89,7 @@ - + diff --git a/xml/xslt/styles.xslt b/xml/xslt/styles.xslt index ea57269..d74e9be 100644 --- a/xml/xslt/styles.xslt +++ b/xml/xslt/styles.xslt @@ -162,15 +162,28 @@ 29.7cm 21.0cm - + 1cm 1cm - + true 0.6cm - + + true + 0.6cm + 0 + + + 1cm + 1cm + + + true + 0.6cm + + true 0.6cm 0 @@ -193,15 +206,6 @@ center - - 2cm - 3cm - url(../graphics/logo.png) - 70mm - scale-to-fit - scale-to-fit - uniform - diff --git a/xml/xslt/styles_con.xslt b/xml/xslt/styles_con.xslt new file mode 100644 index 0000000..350f9cb --- /dev/null +++ b/xml/xslt/styles_con.xslt @@ -0,0 +1,195 @@ + + + + + + + + 10pt + + + + + + + always + center + white + bold + uppercase + + + + + + 18pt + 1cm + #FF5C00 + uppercase + + + 18pt + 1cm + #FF5C00 + uppercase + + + italic + 14pt + 0.8cm + #999999 + uppercase + + + 14pt + 0.8cm + #999999 + + + 5pt + + + #999999 + uppercase + + + 16pt + center + bold + 1cm + + + + + + 18pt + + + + + + + + + double + 2pt + + + + false + preserve + preserve + + + LiberationMono + 9pt + + + + + + + + 0.5cm + 1.5cm + 1.5cm + 1.5cm + 29.7cm + 21.0cm + + + 3.6cm + 1cm + + + true + 2.7cm + + + true + 0.6cm + 0 + + + 2cm + 1cm + + + true + 0.6cm + + + true + 0.6cm + 0 + + + right + normal + + + center + + + 0cm + 0cm + url(../graphics/logo_alt.png) + 30mm + scale-to-fit + scale-to-fit + uniform + + + + + #FF5C00 + + + + + center + + + + + + + + + + + + + + + + + + 2pt + + + + + + + + + + + + + + + + page + + + page + + \ No newline at end of file diff --git a/xml/xslt/styles_doc.xslt b/xml/xslt/styles_doc.xslt index 93ec5cf..b109b5c 100644 --- a/xml/xslt/styles_doc.xslt +++ b/xml/xslt/styles_doc.xslt @@ -61,6 +61,15 @@ orange + + 2cm + 3cm + url(../graphics/logo.png) + 70mm + scale-to-fit + scale-to-fit + uniform + diff --git a/xml/xslt/styles_off.xslt b/xml/xslt/styles_off.xslt index aa3c3be..bfceca2 100644 --- a/xml/xslt/styles_off.xslt +++ b/xml/xslt/styles_off.xslt @@ -103,15 +103,28 @@ 29.7cm 21.0cm - + 1cm 1cm - + true 0.6cm - + + true + 0.6cm + 0 + + + 1cm + 1cm + + + true + 0.6cm + + true 0.6cm 0 diff --git a/xml/xslt/styles_rep.xslt b/xml/xslt/styles_rep.xslt index df3fbe8..6abdd8d 100644 --- a/xml/xslt/styles_rep.xslt +++ b/xml/xslt/styles_rep.xslt @@ -61,6 +61,15 @@ orange + + 2cm + 3cm + url(../graphics/logo.png) + 70mm + scale-to-fit + scale-to-fit + uniform + diff --git a/xml/xslt/summary.xsl b/xml/xslt/summary.xsl index 59d07b9..13e72c3 100644 --- a/xml/xslt/summary.xsl +++ b/xml/xslt/summary.xsl @@ -11,7 +11,7 @@ - +