mirror of
				https://github.com/sqlmapproject/sqlmap.git
				synced 2025-11-04 18:07:46 +03:00 
			
		
		
		
	minor fix
This commit is contained in:
		
							parent
							
								
									2b05ded9c3
								
							
						
					
					
						commit
						e50d64546f
					
				| 
						 | 
					@ -576,7 +576,7 @@ class Agent:
 | 
				
			||||||
            intoRegExp = intoRegExp.group(1)
 | 
					            intoRegExp = intoRegExp.group(1)
 | 
				
			||||||
            query = query[:query.index(intoRegExp)]
 | 
					            query = query[:query.index(intoRegExp)]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        if Backend.getIdentifiedDbms() in FROM_DUMMY_TABLE and inbandQuery.endswith(FROM_TABLE[Backend.getIdentifiedDbms()]):
 | 
					        if Backend.getIdentifiedDbms() in FROM_DUMMY_TABLE and inbandQuery.endswith(FROM_DUMMY_TABLE[Backend.getIdentifiedDbms()]):
 | 
				
			||||||
            inbandQuery = inbandQuery[:-len(FROM_DUMMY_TABLE[Backend.getIdentifiedDbms()])]
 | 
					            inbandQuery = inbandQuery[:-len(FROM_DUMMY_TABLE[Backend.getIdentifiedDbms()])]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        for element in xrange(0, count):
 | 
					        for element in xrange(0, count):
 | 
				
			||||||
| 
						 | 
					@ -747,7 +747,7 @@ class Agent:
 | 
				
			||||||
        if Backend.getIdentifiedDbms() is not None and hasattr(queries[Backend.getIdentifiedDbms()], "case"):
 | 
					        if Backend.getIdentifiedDbms() is not None and hasattr(queries[Backend.getIdentifiedDbms()], "case"):
 | 
				
			||||||
            caseExpression = queries[Backend.getIdentifiedDbms()].case.query % expression
 | 
					            caseExpression = queries[Backend.getIdentifiedDbms()].case.query % expression
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            if "(IIF" not in caseExpression and Backend.getIdentifiedDbms() in FROM_DUMMY_TABLE and not caseExpression.upper().endswith(FROM_TABLE[Backend.getIdentifiedDbms()]):
 | 
					            if "(IIF" not in caseExpression and Backend.getIdentifiedDbms() in FROM_DUMMY_TABLE and not caseExpression.upper().endswith(FROM_DUMMY_TABLE[Backend.getIdentifiedDbms()]):
 | 
				
			||||||
                caseExpression += FROM_DUMMY_TABLE[Backend.getIdentifiedDbms()]
 | 
					                caseExpression += FROM_DUMMY_TABLE[Backend.getIdentifiedDbms()]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        return caseExpression
 | 
					        return caseExpression
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -159,7 +159,7 @@ def __goInferenceProxy(expression, fromUser=False, expected=None, batch=False, r
 | 
				
			||||||
    # NOTE: I assume that only queries that get data from a table
 | 
					    # NOTE: I assume that only queries that get data from a table
 | 
				
			||||||
    # can return multiple entries
 | 
					    # can return multiple entries
 | 
				
			||||||
    if fromUser and " FROM " in expression.upper() and ((Backend.getIdentifiedDbms() \
 | 
					    if fromUser and " FROM " in expression.upper() and ((Backend.getIdentifiedDbms() \
 | 
				
			||||||
      not in FROM_DUMMY_TABLE) or (Backend.getIdentifiedDbms() in FROM_TABLE and not \
 | 
					      not in FROM_DUMMY_TABLE) or (Backend.getIdentifiedDbms() in FROM_DUMMY_TABLE and not \
 | 
				
			||||||
      expression.upper().endswith(FROM_DUMMY_TABLE[Backend.getIdentifiedDbms()]))) \
 | 
					      expression.upper().endswith(FROM_DUMMY_TABLE[Backend.getIdentifiedDbms()]))) \
 | 
				
			||||||
      and not re.search(SQL_SCALAR_REGEX, expression, re.I):
 | 
					      and not re.search(SQL_SCALAR_REGEX, expression, re.I):
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -215,7 +215,7 @@ def __goInferenceProxy(expression, fromUser=False, expected=None, batch=False, r
 | 
				
			||||||
                    stopLimit += startLimit
 | 
					                    stopLimit += startLimit
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            if not stopLimit or stopLimit <= 1:
 | 
					            if not stopLimit or stopLimit <= 1:
 | 
				
			||||||
                if Backend.getIdentifiedDbms() in FROM_DUMMY_TABLE and expression.upper().endswith(FROM_TABLE[Backend.getIdentifiedDbms()]):
 | 
					                if Backend.getIdentifiedDbms() in FROM_DUMMY_TABLE and expression.upper().endswith(FROM_DUMMY_TABLE[Backend.getIdentifiedDbms()]):
 | 
				
			||||||
                    test = False
 | 
					                    test = False
 | 
				
			||||||
                else:
 | 
					                else:
 | 
				
			||||||
                    test = True
 | 
					                    test = True
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -257,7 +257,7 @@ def __unionTestByCharBruteforce(comment, place, parameter, value, prefix, suffix
 | 
				
			||||||
        count = __findUnionCharCount(comment, place, parameter, value, prefix, suffix, PAYLOAD.WHERE.ORIGINAL if isNullValue(kb.uChar) else PAYLOAD.WHERE.NEGATIVE)
 | 
					        count = __findUnionCharCount(comment, place, parameter, value, prefix, suffix, PAYLOAD.WHERE.ORIGINAL if isNullValue(kb.uChar) else PAYLOAD.WHERE.NEGATIVE)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if count:
 | 
					    if count:
 | 
				
			||||||
        if Backend.getIdentifiedDbms() in FROM_DUMMY_TABLE and query.endswith(FROM_TABLE[Backend.getIdentifiedDbms()]):
 | 
					        if Backend.getIdentifiedDbms() in FROM_DUMMY_TABLE and query.endswith(FROM_DUMMY_TABLE[Backend.getIdentifiedDbms()]):
 | 
				
			||||||
            query = query[:-len(FROM_DUMMY_TABLE[Backend.getIdentifiedDbms()])]
 | 
					            query = query[:-len(FROM_DUMMY_TABLE[Backend.getIdentifiedDbms()])]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        if count:
 | 
					        if count:
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -165,7 +165,7 @@ def unionUse(expression, unpack=True, dump=False):
 | 
				
			||||||
    if (kb.injection.data[PAYLOAD.TECHNIQUE.UNION].where == PAYLOAD.WHERE.NEGATIVE or \
 | 
					    if (kb.injection.data[PAYLOAD.TECHNIQUE.UNION].where == PAYLOAD.WHERE.NEGATIVE or \
 | 
				
			||||||
       (dump and (conf.limitStart or conf.limitStop))) and \
 | 
					       (dump and (conf.limitStart or conf.limitStop))) and \
 | 
				
			||||||
       " FROM " in expression.upper() and ((Backend.getIdentifiedDbms() \
 | 
					       " FROM " in expression.upper() and ((Backend.getIdentifiedDbms() \
 | 
				
			||||||
       not in FROM_DUMMY_TABLE) or (Backend.getIdentifiedDbms() in FROM_TABLE \
 | 
					       not in FROM_DUMMY_TABLE) or (Backend.getIdentifiedDbms() in FROM_DUMMY_TABLE \
 | 
				
			||||||
       and not expression.upper().endswith(FROM_DUMMY_TABLE[Backend.getIdentifiedDbms()]))) \
 | 
					       and not expression.upper().endswith(FROM_DUMMY_TABLE[Backend.getIdentifiedDbms()]))) \
 | 
				
			||||||
       and not re.search(SQL_SCALAR_REGEX, expression, re.I):
 | 
					       and not re.search(SQL_SCALAR_REGEX, expression, re.I):
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue
	
	Block a user