mirror of
				https://github.com/sqlmapproject/sqlmap.git
				synced 2025-10-30 23:47:45 +03:00 
			
		
		
		
	Fixes #4728
This commit is contained in:
		
							parent
							
								
									5ea08b397a
								
							
						
					
					
						commit
						69c679cf06
					
				|  | @ -20,7 +20,7 @@ from thirdparty import six | |||
| from thirdparty.six import unichr as _unichr | ||||
| 
 | ||||
| # sqlmap version (<major>.<minor>.<month>.<monthly commit>) | ||||
| VERSION = "1.5.6.5" | ||||
| VERSION = "1.5.7.0" | ||||
| 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) | ||||
|  |  | |||
|  | @ -618,7 +618,7 @@ class Databases(object): | |||
|                     query = rootQuery.inband.query % (unsafeSQLIdentificatorNaming(tbl), unsafeSQLIdentificatorNaming(conf.db)) | ||||
|                     query += condQuery | ||||
| 
 | ||||
|                     if Backend.isFork(FORK.DRIZZLE): | ||||
|                     if Backend.isDbms(DBMS.MYSQL) and Backend.isFork(FORK.DRIZZLE): | ||||
|                         query = re.sub("column_type", "data_type", query, flags=re.I) | ||||
| 
 | ||||
|                 elif Backend.getIdentifiedDbms() in (DBMS.ORACLE, DBMS.DB2, DBMS.DERBY, DBMS.ALTIBASE, DBMS.MIMERSQL): | ||||
|  | @ -1022,7 +1022,7 @@ class Databases(object): | |||
|         rootQuery = queries[Backend.getIdentifiedDbms()].statements | ||||
| 
 | ||||
|         if any(isTechniqueAvailable(_) for _ in (PAYLOAD.TECHNIQUE.UNION, PAYLOAD.TECHNIQUE.ERROR, PAYLOAD.TECHNIQUE.QUERY)) or conf.direct: | ||||
|             if Backend.isFork(FORK.DRIZZLE): | ||||
|             if Backend.isDbms(DBMS.MYSQL) and Backend.isFork(FORK.DRIZZLE): | ||||
|                 query = rootQuery.inband.query2 | ||||
|             else: | ||||
|                 query = rootQuery.inband.query | ||||
|  | @ -1049,7 +1049,7 @@ class Databases(object): | |||
| 
 | ||||
|             query = rootQuery.blind.count | ||||
| 
 | ||||
|             if Backend.isFork(FORK.DRIZZLE): | ||||
|             if Backend.isDbms(DBMS.MYSQL) and Backend.isFork(FORK.DRIZZLE): | ||||
|                 query = re.sub("INFORMATION_SCHEMA", "DATA_DICTIONARY", query, flags=re.I) | ||||
| 
 | ||||
|             count = inject.getValue(query, union=False, error=False, expected=EXPECTED.INT, charsetType=CHARSET_TYPE.DIGITS) | ||||
|  | @ -1077,7 +1077,7 @@ class Databases(object): | |||
|                 if isNoneValue(value): | ||||
|                     query = rootQuery.blind.query % index | ||||
| 
 | ||||
|                     if Backend.isFork(FORK.DRIZZLE): | ||||
|                     if Backend.isDbms(DBMS.MYSQL) and Backend.isFork(FORK.DRIZZLE): | ||||
|                         query = re.sub("INFORMATION_SCHEMA", "DATA_DICTIONARY", query, flags=re.I) | ||||
| 
 | ||||
|                     value = unArrayizeValue(inject.getValue(query, union=False, error=False)) | ||||
|  |  | |||
|  | @ -81,7 +81,7 @@ class Users(object): | |||
| 
 | ||||
|         if Backend.isDbms(DBMS.MYSQL): | ||||
|             self.getCurrentUser() | ||||
|             if Backend.isFork(FORK.DRIZZLE): | ||||
|             if Backend.isDbms(DBMS.MYSQL) and Backend.isFork(FORK.DRIZZLE): | ||||
|                 kb.data.isDba = "root" in (kb.data.currentUser or "") | ||||
|             elif kb.data.currentUser: | ||||
|                 query = queries[Backend.getIdentifiedDbms()].is_dba.query % kb.data.currentUser.split("@")[0] | ||||
|  | @ -106,7 +106,7 @@ class Users(object): | |||
|         condition |= (Backend.isDbms(DBMS.MYSQL) and not kb.data.has_information_schema) | ||||
| 
 | ||||
|         if any(isTechniqueAvailable(_) for _ in (PAYLOAD.TECHNIQUE.UNION, PAYLOAD.TECHNIQUE.ERROR, PAYLOAD.TECHNIQUE.QUERY)) or conf.direct: | ||||
|             if Backend.isFork(FORK.DRIZZLE): | ||||
|             if Backend.isDbms(DBMS.MYSQL) and Backend.isFork(FORK.DRIZZLE): | ||||
|                 query = rootQuery.inband.query3 | ||||
|             elif condition: | ||||
|                 query = rootQuery.inband.query2 | ||||
|  | @ -126,7 +126,7 @@ class Users(object): | |||
|             infoMsg = "fetching number of database users" | ||||
|             logger.info(infoMsg) | ||||
| 
 | ||||
|             if Backend.isFork(FORK.DRIZZLE): | ||||
|             if Backend.isDbms(DBMS.MYSQL) and Backend.isFork(FORK.DRIZZLE): | ||||
|                 query = rootQuery.blind.count3 | ||||
|             elif condition: | ||||
|                 query = rootQuery.blind.count2 | ||||
|  | @ -147,7 +147,7 @@ class Users(object): | |||
|             for index in indexRange: | ||||
|                 if Backend.getIdentifiedDbms() in (DBMS.SYBASE, DBMS.MAXDB): | ||||
|                     query = rootQuery.blind.query % (kb.data.cachedUsers[-1] if kb.data.cachedUsers else " ") | ||||
|                 elif Backend.isFork(FORK.DRIZZLE): | ||||
|                 elif Backend.isDbms(DBMS.MYSQL) and Backend.isFork(FORK.DRIZZLE): | ||||
|                     query = rootQuery.blind.query3 % index | ||||
|                 elif condition: | ||||
|                     query = rootQuery.blind.query2 % index | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	Block a user