Fixes CI/CD errors

Author: stamparm

lib/core/settings.py

@@ -20,7 +20,7 @@
 from thirdparty import six
 
 # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.10.7.102"
+VERSION = "1.10.7.103"
 TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
 TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34}
 VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)

plugins/generic/users.py

@@ -204,8 +204,8 @@ def getPasswordHashes(self):
             condition = rootQuery.inband.condition
 
             if conf.user:
-                query += " WHERE "
-                query += " OR ".join("%s = '%s'" % (condition, user) for user in sorted(users))
+                userCondition = " OR ".join("%s = '%s'" % (condition, user) for user in sorted(users))
+                query += " %s (%s)" % ("AND" if re.search(r"(?i)\bWHERE\b", query) else "WHERE", userCondition)
 
             if Backend.isDbms(DBMS.SYBASE):
                 getCurrentThreadData().disableStdOut = True
@@ -417,12 +417,12 @@ def getPrivileges(self, query2=False):
                 condition = rootQuery.inband.condition
 
             if conf.user:
-                query += " WHERE "
-
                 if Backend.isDbms(DBMS.MYSQL) and kb.data.has_information_schema:
-                    query += " OR ".join("%s LIKE '%%%s%%'" % (condition, user) for user in sorted(users))
+                    userCondition = " OR ".join("%s LIKE '%%%s%%'" % (condition, user) for user in sorted(users))
                 else:
-                    query += " OR ".join("%s = '%s'" % (condition, user) for user in sorted(users))
+                    userCondition = " OR ".join("%s = '%s'" % (condition, user) for user in sorted(users))
+
+                query += " %s (%s)" % ("AND" if re.search(r"(?i)\bWHERE\b", query) else "WHERE", userCondition)
 
             values = inject.getValue(query, blind=False, time=False)