From 1ecb921ba766da32d8994266d7904e5590e77155 Mon Sep 17 00:00:00 2001
From: Bernardo Damele <bernardo.damele@gmail.com>
Date: Fri, 20 Feb 2015 18:31:47 +0000
Subject: [PATCH] Consistency in enums

---
 lib/core/enums.py               |  8 ++--
 xml/payloads/06_union_query.xml | 72 ++++++++++++++++-----------------
 2 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/lib/core/enums.py b/lib/core/enums.py
index 816111514..cb1b7b36f 100644
--- a/lib/core/enums.py
+++ b/lib/core/enums.py
@@ -208,10 +208,10 @@ class PAYLOAD:
     SQLINJECTION = {
                         1: "boolean-based blind",
                         2: "error-based",
-                        3: "UNION query",
+                        3: "inline query",
                         4: "stacked queries",
                         5: "AND/OR time-based blind",
-                        6: "inline query",
+                        6: "UNION query",
                    }
 
     PARAMETER = {
@@ -250,10 +250,10 @@ class PAYLOAD:
     class TECHNIQUE:
         BOOLEAN = 1
         ERROR = 2
-        UNION = 3
+        QUERY = 3
         STACKED = 4
         TIME = 5
-        QUERY = 6
+        UNION = 6
 
     class WHERE:
         ORIGINAL = 1
diff --git a/xml/payloads/06_union_query.xml b/xml/payloads/06_union_query.xml
index a3ec3f4b1..3a1218c90 100644
--- a/xml/payloads/06_union_query.xml
+++ b/xml/payloads/06_union_query.xml
@@ -4,7 +4,7 @@
     <!-- UNION query tests -->
     <test>
         <title>MySQL UNION query ([CHAR]) - [COLSTART] to [COLSTOP] columns (custom)</title>
-        <stype>3</stype>
+        <stype>6</stype>
         <level>1</level>
         <risk>1</risk>
         <clause>1,2,3,4,5</clause>
@@ -26,7 +26,7 @@
 
     <test>
         <title>MySQL UNION query (NULL) - [COLSTART] to [COLSTOP] columns (custom)</title>
-        <stype>3</stype>
+        <stype>6</stype>
         <level>1</level>
         <risk>1</risk>
         <clause>1,2,3,4,5</clause>
@@ -48,7 +48,7 @@
 
     <test>
         <title>MySQL UNION query ([RANDNUM]) - [COLSTART] to [COLSTOP] columns (custom)</title>
-        <stype>3</stype>
+        <stype>6</stype>
         <level>3</level>
         <risk>1</risk>
         <clause>1,2,3,4,5</clause>
@@ -70,7 +70,7 @@
 
     <test>
         <title>MySQL UNION query ([CHAR]) - 1 to 10 columns</title>
-        <stype>3</stype>
+        <stype>6</stype>
         <level>1</level>
         <risk>1</risk>
         <clause>1,2,3,4,5</clause>
@@ -92,7 +92,7 @@
 
     <test>
         <title>MySQL UNION query (NULL) - 1 to 10 columns</title>
-        <stype>3</stype>
+        <stype>6</stype>
         <level>1</level>
         <risk>1</risk>
         <clause>1,2,3,4,5</clause>
@@ -114,7 +114,7 @@
 
     <test>
         <title>MySQL UNION query ([RANDNUM]) - 1 to 10 columns</title>
-        <stype>3</stype>
+        <stype>6</stype>
         <level>3</level>
         <risk>1</risk>
         <clause>1,2,3,4,5</clause>
@@ -136,7 +136,7 @@
 
     <test>
         <title>MySQL UNION query ([CHAR]) - 11 to 20 columns</title>
-        <stype>3</stype>
+        <stype>6</stype>
         <level>2</level>
         <risk>1</risk>
         <clause>1,2,3,4,5</clause>
@@ -158,7 +158,7 @@
 
     <test>
         <title>MySQL UNION query (NULL) - 11 to 20 columns</title>
-        <stype>3</stype>
+        <stype>6</stype>
         <level>2</level>
         <risk>1</risk>
         <clause>1,2,3,4,5</clause>
@@ -180,7 +180,7 @@
 
     <test>
         <title>MySQL UNION query ([RANDNUM]) - 11 to 20 columns</title>
-        <stype>3</stype>
+        <stype>6</stype>
         <level>3</level>
         <risk>1</risk>
         <clause>1,2,3,4,5</clause>
@@ -202,7 +202,7 @@
 
     <test>
         <title>MySQL UNION query ([CHAR]) - 21 to 30 columns</title>
-        <stype>3</stype>
+        <stype>6</stype>
         <level>3</level>
         <risk>1</risk>
         <clause>1,2,3,4,5</clause>
@@ -224,7 +224,7 @@
 
     <test>
         <title>MySQL UNION query (NULL) - 21 to 30 columns</title>
-        <stype>3</stype>
+        <stype>6</stype>
         <level>3</level>
         <risk>1</risk>
         <clause>1,2,3,4,5</clause>
@@ -246,7 +246,7 @@
 
     <test>
         <title>MySQL UNION query ([RANDNUM]) - 21 to 30 columns</title>
-        <stype>3</stype>
+        <stype>6</stype>
         <level>4</level>
         <risk>1</risk>
         <clause>1,2,3,4,5</clause>
@@ -268,7 +268,7 @@
 
     <test>
         <title>MySQL UNION query ([CHAR]) - 31 to 40 columns</title>
-        <stype>3</stype>
+        <stype>6</stype>
         <level>4</level>
         <risk>1</risk>
         <clause>1,2,3,4,5</clause>
@@ -290,7 +290,7 @@
 
     <test>
         <title>MySQL UNION query (NULL) - 31 to 40 columns</title>
-        <stype>3</stype>
+        <stype>6</stype>
         <level>4</level>
         <risk>1</risk>
         <clause>1,2,3,4,5</clause>
@@ -312,7 +312,7 @@
 
     <test>
         <title>MySQL UNION query ([RANDNUM]) - 31 to 40 columns</title>
-        <stype>3</stype>
+        <stype>6</stype>
         <level>5</level>
         <risk>1</risk>
         <clause>1,2,3,4,5</clause>
@@ -334,7 +334,7 @@
 
     <test>
         <title>MySQL UNION query ([CHAR]) - 41 to 50 columns</title>
-        <stype>3</stype>
+        <stype>6</stype>
         <level>5</level>
         <risk>1</risk>
         <clause>1,2,3,4,5</clause>
@@ -356,7 +356,7 @@
 
     <test>
         <title>MySQL UNION query (NULL) - 41 to 50 columns</title>
-        <stype>3</stype>
+        <stype>6</stype>
         <level>5</level>
         <risk>1</risk>
         <clause>1,2,3,4,5</clause>
@@ -378,7 +378,7 @@
 
     <test>
         <title>MySQL UNION query ([RANDNUM]) - 41 to 50 columns</title>
-        <stype>3</stype>
+        <stype>6</stype>
         <level>5</level>
         <risk>1</risk>
         <clause>1,2,3,4,5</clause>
@@ -400,7 +400,7 @@
 
     <test>
         <title>Generic UNION query ([CHAR]) - [COLSTART] to [COLSTOP] columns (custom)</title>
-        <stype>3</stype>
+        <stype>6</stype>
         <level>1</level>
         <risk>1</risk>
         <clause>1,2,3,4,5</clause>
@@ -419,7 +419,7 @@
 
     <test>
         <title>Generic UNION query (NULL) - [COLSTART] to [COLSTOP] columns (custom)</title>
-        <stype>3</stype>
+        <stype>6</stype>
         <level>1</level>
         <risk>1</risk>
         <clause>1,2,3,4,5</clause>
@@ -438,7 +438,7 @@
 
     <test>
         <title>Generic UNION query ([RANDNUM]) - [COLSTART] to [COLSTOP] columns (custom)</title>
-        <stype>3</stype>
+        <stype>6</stype>
         <level>3</level>
         <risk>1</risk>
         <clause>1,2,3,4,5</clause>
@@ -457,7 +457,7 @@
 
     <test>
         <title>Generic UNION query ([CHAR]) - 1 to 10 columns</title>
-        <stype>3</stype>
+        <stype>6</stype>
         <level>1</level>
         <risk>1</risk>
         <clause>1,2,3,4,5</clause>
@@ -476,7 +476,7 @@
 
     <test>
         <title>Generic UNION query (NULL) - 1 to 10 columns</title>
-        <stype>3</stype>
+        <stype>6</stype>
         <level>1</level>
         <risk>1</risk>
         <clause>1,2,3,4,5</clause>
@@ -495,7 +495,7 @@
 
     <test>
         <title>Generic UNION query ([RANDNUM]) - 1 to 10 columns</title>
-        <stype>3</stype>
+        <stype>6</stype>
         <level>3</level>
         <risk>1</risk>
         <clause>1,2,3,4,5</clause>
@@ -514,7 +514,7 @@
 
     <test>
         <title>Generic UNION query ([CHAR]) - 11 to 20 columns</title>
-        <stype>3</stype>
+        <stype>6</stype>
         <level>2</level>
         <risk>1</risk>
         <clause>1,2,3,4,5</clause>
@@ -533,7 +533,7 @@
 
     <test>
         <title>Generic UNION query (NULL) - 11 to 20 columns</title>
-        <stype>3</stype>
+        <stype>6</stype>
         <level>2</level>
         <risk>1</risk>
         <clause>1,2,3,4,5</clause>
@@ -552,7 +552,7 @@
 
     <test>
         <title>Generic UNION query ([RANDNUM]) - 11 to 20 columns</title>
-        <stype>3</stype>
+        <stype>6</stype>
         <level>3</level>
         <risk>1</risk>
         <clause>1,2,3,4,5</clause>
@@ -571,7 +571,7 @@
 
     <test>
         <title>Generic UNION query ([CHAR]) - 21 to 30 columns</title>
-        <stype>3</stype>
+        <stype>6</stype>
         <level>3</level>
         <risk>1</risk>
         <clause>1,2,3,4,5</clause>
@@ -590,7 +590,7 @@
 
     <test>
         <title>Generic UNION query (NULL) - 21 to 30 columns</title>
-        <stype>3</stype>
+        <stype>6</stype>
         <level>3</level>
         <risk>1</risk>
         <clause>1,2,3,4,5</clause>
@@ -609,7 +609,7 @@
 
     <test>
         <title>Generic UNION query ([RANDNUM]) - 21 to 30 columns</title>
-        <stype>3</stype>
+        <stype>6</stype>
         <level>4</level>
         <risk>1</risk>
         <clause>1,2,3,4,5</clause>
@@ -628,7 +628,7 @@
 
     <test>
         <title>Generic UNION query ([CHAR]) - 31 to 40 columns</title>
-        <stype>3</stype>
+        <stype>6</stype>
         <level>4</level>
         <risk>1</risk>
         <clause>1,2,3,4,5</clause>
@@ -647,7 +647,7 @@
 
     <test>
         <title>Generic UNION query (NULL) - 31 to 40 columns</title>
-        <stype>3</stype>
+        <stype>6</stype>
         <level>4</level>
         <risk>1</risk>
         <clause>1,2,3,4,5</clause>
@@ -666,7 +666,7 @@
 
     <test>
         <title>Generic UNION query ([RANDNUM]) - 31 to 40 columns</title>
-        <stype>3</stype>
+        <stype>6</stype>
         <level>5</level>
         <risk>1</risk>
         <clause>1,2,3,4,5</clause>
@@ -685,7 +685,7 @@
 
     <test>
         <title>Generic UNION query ([CHAR]) - 41 to 50 columns</title>
-        <stype>3</stype>
+        <stype>6</stype>
         <level>5</level>
         <risk>1</risk>
         <clause>1,2,3,4,5</clause>
@@ -703,7 +703,7 @@
     </test>
     <test>
         <title>Generic UNION query (NULL) - 41 to 50 columns</title>
-        <stype>3</stype>
+        <stype>6</stype>
         <level>5</level>
         <risk>1</risk>
         <clause>1,2,3,4,5</clause>
@@ -722,7 +722,7 @@
 
     <test>
         <title>Generic UNION query ([RANDNUM]) - 41 to 50 columns</title>
-        <stype>3</stype>
+        <stype>6</stype>
         <level>5</level>
         <risk>1</risk>
         <clause>1,2,3,4,5</clause>