From 83dab68fba831f210f1a307c1a8e10cc59ae6549 Mon Sep 17 00:00:00 2001
From: Peter Mosmans <support@go-forward.net>
Date: Mon, 1 Aug 2016 20:13:00 -0700
Subject: [PATCH 1/5] Always use 2 digits for day

Refreshed dates of examples
---
 xml/xslt/qs2offerte.xsl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/xml/xslt/qs2offerte.xsl b/xml/xslt/qs2offerte.xsl
index 15d5a6d..eb53451 100644
--- a/xml/xslt/qs2offerte.xsl
+++ b/xml/xslt/qs2offerte.xsl
@@ -110,11 +110,11 @@
                     <test_planning>
                         <xsl:value-of select="/*/pentest_info/planning"/>
                     </test_planning>
-                    <xsl:comment>date or date range in text, e.g. May 18th until May 25th, 2015</xsl:comment>
+                    <xsl:comment>date or date range in text, e.g. May 18th until May 25th, 2016</xsl:comment>
                     <report_due>
                         <xsl:value-of select="/*/pentest_info/delivery"/>
                     </report_due>
-                    <xsl:comment>date or date range in text, e.g. May 18th until May 25th, 2015</xsl:comment>
+                    <xsl:comment>date or date range in text, e.g. May 18th until May 25th, 2016</xsl:comment>
                     <nature>
                         <xsl:value-of select="/*/pentest_info/nature"/>
                     </nature>
@@ -136,7 +136,7 @@
                     <xsl:comment>needed for date on frontpage and in signature boxes; it is possible to add a new &lt;version> after each review; in that case, make sure to update the date/time</xsl:comment>
                     <version number="auto">
                         <xsl:attribute name="date"><xsl:value-of
-                                select="format-date(current-date(), '[Y]-[M,2]-[D1]', 'en', (), ())"
+                                select="format-date(current-date(), '[Y]-[M,2]-[D,2]', 'en', (), ())"
                             />T10:00:00</xsl:attribute>
                         <xsl:comment>actual date-time here; you can leave the number attribute alone</xsl:comment>
                         <v_author>ROS Writer</v_author>

From 4400754f90f8b5a3049f8e61c8a311513baf511d Mon Sep 17 00:00:00 2001
From: Peter Mosmans <support@go-forward.net>
Date: Wed, 10 Aug 2016 13:48:30 +0200
Subject: [PATCH 2/5] Updated pentext repo link

Support NAMESPACEID parameter for namespaces
---
 chatops/bash/test_pentext | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/chatops/bash/test_pentext b/chatops/bash/test_pentext
index a8d77db..afc0fdf 100644
--- a/chatops/bash/test_pentext
+++ b/chatops/bash/test_pentext
@@ -16,7 +16,7 @@
 #    (at your option) any later version.
 
 
-VERSION=0.5
+VERSION=0.6
 DOCBUILDER=/usr/local/bin/docbuilder.py
 VALIDATOR=/usr/local/bin/validate_report.py
 SAXON=/usr/local/bin/saxon/saxon9he.jar
@@ -26,7 +26,8 @@ SAXON=/usr/local/bin/saxon/saxon9he.jar
 [ -z $GITSERVER ] && GITSERVER=gitlab.local
 [ -z $GITWEB ] && GITWEB=https://$GITSERVER
 [ -z $NAMESPACE ] && NAMESPACE=ros
-[ -z $PENTEXTREPO ] && PENTEXTREPO=https://github.com/radicallyopensecurity/templates
+[ -z $NAMESPACEID ] && NAMESPACEID=1
+[ -z $PENTEXTREPO ] && PENTEXTREPO=https://github.com/radicallyopensecurity/pentext
 
 TEMPLOC=$(mktemp -d)
 BRANCH=master
@@ -75,7 +76,7 @@ backwards_compatible() {
 setup_repo() {
     echo "[*] testing gitlab command line interface..."
     REPO=${reponame,,} # lowercase, but of course
-    project_id=$($GITLABCLI project create --name $REPO --issues-enabled true --wiki-enabled true --snippets-enabled true --wall-enabled true --merge-requests-enabled true| awk '/id:/{print $2}')
+    project_id=$($GITLABCLI project create --name $REPO --namespace $NAMESPACEID--issues-enabled true --wiki-enabled true --snippets-enabled true --wall-enabled true --merge-requests-enabled true| awk '/id:/{print $2}')
     if [ ! -z $project_id ]; then
         echo "[+] successfully created test gitlab project with id ${project_id}"
     else
@@ -106,6 +107,7 @@ preflight_checks() {
     echo "GITSERVER=$GITSERVER  (git server)"
     echo "GITWEB=$GITWEB  (webinterface of git server)"
     echo "NAMESPACE=$NAMESPACE  (namespace of repositories)"
+    echo "NAMESPACEID=$NAMESPACEID  (namespace ID of repositories)"
     echo "PENTEXTREPO=$PENTEXTREPO  (location of pentext repo)"
     echo "SAXON=$SAXON  (saxon binary)"
     echo "VALIDATOR=$VALIDATOR  (location of validate_report.py)"

From 4a9b5135c1380736d878267ca39f3fc7471967d6 Mon Sep 17 00:00:00 2001
From: Peter Mosmans <support@go-forward.net>
Date: Wed, 10 Aug 2016 13:51:59 +0200
Subject: [PATCH 3/5] Fixed typo

---
 chatops/bash/test_pentext | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chatops/bash/test_pentext b/chatops/bash/test_pentext
index afc0fdf..e9bc38c 100644
--- a/chatops/bash/test_pentext
+++ b/chatops/bash/test_pentext
@@ -76,7 +76,7 @@ backwards_compatible() {
 setup_repo() {
     echo "[*] testing gitlab command line interface..."
     REPO=${reponame,,} # lowercase, but of course
-    project_id=$($GITLABCLI project create --name $REPO --namespace $NAMESPACEID--issues-enabled true --wiki-enabled true --snippets-enabled true --wall-enabled true --merge-requests-enabled true| awk '/id:/{print $2}')
+    project_id=$($GITLABCLI project create --name $REPO --namespace $NAMESPACEID --issues-enabled true --wiki-enabled true --snippets-enabled true --wall-enabled true --merge-requests-enabled true| awk '/id:/{print $2}')
     if [ ! -z $project_id ]; then
         echo "[+] successfully created test gitlab project with id ${project_id}"
     else

From 857c2f0a6d5fbe404ba0ef7edbb8029c7c4962e4 Mon Sep 17 00:00:00 2001
From: Peter Mosmans <support@go-forward.net>
Date: Wed, 10 Aug 2016 15:20:35 +0200
Subject: [PATCH 4/5] Added support for NAMESPACEID

---
 chatops/bash/handler_pentest | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/chatops/bash/handler_pentest b/chatops/bash/handler_pentest
index c4046ff..db2f2a7 100644
--- a/chatops/bash/handler_pentest
+++ b/chatops/bash/handler_pentest
@@ -17,7 +17,7 @@
 #    (at your option) any later version.
 
 
-VERSION=0.7
+VERSION=0.8
 SAXON=/usr/local/bin/saxon/saxon9he.jar
 TEMPLATEREPO=ssh://git@gitlab.local/peter/templates
 
@@ -25,7 +25,8 @@ TEMPLATEREPO=ssh://git@gitlab.local/peter/templates
 [ -z $GITLABCLI ] && GITLABCLI=gitlab
 [ -z $GITSERVER ] && GITSERVER=gitlab.local
 [ -z $NAMESPACE ] && NAMESPACE=ros
-[ -z $PENTEXTREPO ] && PENTEXTREPO=https://github.com/radicallyopensecurity/templates
+[ -z $NAMESPACEID ] && NAMESPACEID=1
+[ -z $PENTEXTREPO ] && PENTEXTREPO=https://github.com/radicallyopensecurity/pentext
 
 TEMPLOC=$(mktemp -d)
 pentext=$(echo $PENTEXTREPO|awk -F '/' '{print $5}')
@@ -81,7 +82,7 @@ preflight_checks() {
 }
 
 setup_repo() {
-    project_id=$($GITLABCLI project create --name $REPO --issues-enabled true --wiki-enabled true --snippets-enabled true --wall-enabled true --merge-requests-enabled true 2>/dev/null| awk '/id:/{print $2}')
+    project_id=$($GITLABCLI project create --name $REPO --namespace $NAMESPACEID --issues-enabled true --wiki-enabled true --snippets-enabled true --wall-enabled true --merge-requests-enabled true 2>/dev/null| awk '/id:/{print $2}')
     if [ ! -z $project_id ]; then
         echo "[+] successfully created gitlab project $REPO with id ${project_id}"
         $GITLABCLI project-label create --project-id ${project_id} --name documentation --color "#0000FF" &>/dev/null

From 7e95688d37ec0948c0a22645c6b4a565d98057f6 Mon Sep 17 00:00:00 2001
From: Peter Mosmans <support@go-forward.net>
Date: Wed, 10 Aug 2016 15:22:57 +0200
Subject: [PATCH 5/5] Added support for NAMESPACEID

---
 chatops/bash/handler_quote | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/chatops/bash/handler_quote b/chatops/bash/handler_quote
index ee825e2..7704b61 100644
--- a/chatops/bash/handler_quote
+++ b/chatops/bash/handler_quote
@@ -17,13 +17,14 @@
 #    (at your option) any later version.
 
 
-VERSION=0.6
+VERSION=0.7
 
 # These variables should be set environment-specific
 [ -z $GITLABCLI ] && GITLABCLI=gitlab
 [ -z $GITSERVER ] && GITSERVER=gitlab.local
 [ -z $NAMESPACE ] && NAMESPACE=ros
-[ -z $PENTEXTREPO ] && PENTEXTREPO=https://github.com/radicallyopensecurity/templates
+[ -z $NAMESPACEID ] && NAMESPACEID=1
+[ -z $PENTEXTREPO ] && PENTEXTREPO=https://github.com/radicallyopensecurity/pentext
 PREFIX="off-"
 pentext=$(echo $PENTEXTREPO|awk -F '/' '{print $5}')
 TEMPLOC=$(mktemp -d)
@@ -71,7 +72,7 @@ preflight_checks() {
 }
 
 setup_repo() {
-    project_id=$($GITLABCLI project create --name $REPO --issues-enabled true --wiki-enabled true --snippets-enabled true --wall-enabled true --merge-requests-enabled true 2>/dev/null| awk '/id:/{print $2}')
+    project_id=$($GITLABCLI project create --name $REPO --namespace $NAMESPACEID --issues-enabled true --wiki-enabled true --snippets-enabled true --wall-enabled true --merge-requests-enabled true 2>/dev/null| awk '/id:/{print $2}')
     if [ ! -z $project_id ]; then
         echo "[+] successfully created gitlab project $REPO with id ${project_id}"
     else