Added generic and mysql UNION tests from 1 to 25 columns.

Adapted config file and command line removing now outdated --union-test switch.
Minor bug fix.
Minor code refactoring.
Got rid of some debug messages, standardized logging of UNION tests.

lib/controller/action.py

@@ -17,7 +17,6 @@ from lib.core.exception import sqlmapUnsupportedDBMSException
 from lib.core.settings import SUPPORTED_DBMS
 from lib.techniques.brute.use import columnExists
 from lib.techniques.brute.use import tableExists
-from lib.techniques.inband.union.test import unionTest
 
 def action():
     """
@@ -56,10 +55,6 @@ def action():
 
     dataToStdout("%s\n" % conf.dbmsHandler.getFingerprint())
 
-    # Techniques options
-    if conf.unionTest and kb.unionPosition is None:
-        conf.dumper.technic("inband injection payload", unionTest())
-
     # Enumeration options
     if conf.getBanner:
         conf.dumper.banner(conf.dbmsHandler.getBanner())

lib/controller/checks.py

@@ -235,7 +235,6 @@ def checkSqlInjection(place, parameter, value):
                 # default) value
                 # Parse boundary's <level>
                 if boundary.level > conf.level:
-                    # NOTE: shall we report every single skipped boundary too?
                     continue
 
                 # Skip boundary if it does not match against test's <clause>
@@ -377,9 +376,7 @@ def checkSqlInjection(place, parameter, value):
 
                         # In case of UNION query SQL injection
                         elif method == PAYLOAD.METHOD.UNION:
-                            conf.uChar = test.request.char
-                            conf.uCols = test.request.columns
-                            configUnion()
+                            configUnion(test.request.char, test.request.columns)
 
                             reqPayload, unionVector = unionTest(comment, place, parameter, value, prefix, suffix)