Merge branch 'master' of github.com:radicallyopensecurity/pentext
This commit is contained in:
commit
ae51648bad
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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)"
|
||||
|
||||
@ -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 <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>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user