From 828d9ce4e8193f6f62a987a95ff5c5cb16dd58f3 Mon Sep 17 00:00:00 2001
From: William Petit <wpetit@cadoles.com>
Date: Mon, 15 Apr 2019 21:02:07 +0200
Subject: [PATCH] fixup! Web security audit base pipeline

---
 vars/audit.groovy | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/vars/audit.groovy b/vars/audit.groovy
index 21e71fe..71fc47d 100644
--- a/vars/audit.groovy
+++ b/vars/audit.groovy
@@ -43,6 +43,14 @@ def call() {
                 name: 'authFormCheckString', 
                 description: "Chaine de caractères à rechercher pour vérifier la réussite de l'authentication (si besoin)"
             )
+            string(
+                name: 'authFormUsernameField', 
+                description: "Nom du champ 'nom utilisateur' du formulaire d'authentication (si besoin)"
+            )
+            string(
+                name: 'authFormPasswordField', 
+                description: "Nom du champ 'mot de passe' du formulaire d'authentication (si besoin)"
+            )
             string(
                 name: 'authFormDataFormat', 
                 description: "Patron de formatage des données POST du formulaire d'authentification (si besoin). Exemple: username=%U&password=%P"
@@ -54,14 +62,14 @@ def call() {
             stage("Check parameters") {
                 steps {
                     script {
-                        if (!params.url?.trim()) {
+                        if (!params.targetUrl?.trim()) {
                             error("L'URL cible n'est pas définie !")
                         }
                     }
                 }
             }
 
-            stage("Test URL") {
+            stage("Run W3AF audit") {
                 steps {
                     script {
                         def w3afImage = buildDockerImage()
@@ -75,7 +83,8 @@ def call() {
                         -e W3AF_AUTH_FORM_PASSWORD='${params.authFormPassword}'
                         -e W3AF_AUTH_FORM_CHECK_URL='${params.authFormCheckUrl}'
                         -e W3AF_AUTH_FORM_CHECK_STRING='${params.authFormCheckString}'
-                        -e W3AF_AUTH_FORM_DATA_FORMAT='${params.authFormDataFormat}'
+                        -e W3AF_AUTH_FORM_USERNAME_FIELD='${params.authFormUsernameField}'
+                        -e W3AF_AUTH_FORM_PASSWORD_FIELD='${params.authFormPasswordField}'
                         """
                         w3afImage.inside(dockerArgs) {
                             sh 'mkdir reports'