mirror of
				https://github.com/sqlmapproject/sqlmap.git
				synced 2025-11-04 09:57:38 +03:00 
			
		
		
		
	Minor language cleanup
This commit is contained in:
		
							parent
							
								
									8865fe69d7
								
							
						
					
					
						commit
						f71b937add
					
				| 
						 | 
					@ -760,7 +760,7 @@ def checkDynamicContent(firstPage, secondPage):
 | 
				
			||||||
                return
 | 
					                return
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            warnMsg = "target url is heavily dynamic"
 | 
					            warnMsg = "target url is heavily dynamic"
 | 
				
			||||||
            warnMsg += ", sqlmap is going to retry the request"
 | 
					            warnMsg += ". sqlmap is going to retry the request"
 | 
				
			||||||
            logger.critical(warnMsg)
 | 
					            logger.critical(warnMsg)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            secondPage, _ = Request.queryPage(content=True)
 | 
					            secondPage, _ = Request.queryPage(content=True)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -461,7 +461,7 @@ class Connect:
 | 
				
			||||||
                else:
 | 
					                else:
 | 
				
			||||||
                    warnMsg = "unable to connect to the target url (%d - %s)" % (e.code, httplib.responses[e.code])
 | 
					                    warnMsg = "unable to connect to the target url (%d - %s)" % (e.code, httplib.responses[e.code])
 | 
				
			||||||
                    if threadData.retriesCount < conf.retries and not kb.threadException:
 | 
					                    if threadData.retriesCount < conf.retries and not kb.threadException:
 | 
				
			||||||
                        warnMsg += ", sqlmap is going to retry the request"
 | 
					                        warnMsg += ". sqlmap is going to retry the request"
 | 
				
			||||||
                        logger.critical(warnMsg)
 | 
					                        logger.critical(warnMsg)
 | 
				
			||||||
                        return Connect.__retryProxy(**kwargs)
 | 
					                        return Connect.__retryProxy(**kwargs)
 | 
				
			||||||
                    elif kb.testMode:
 | 
					                    elif kb.testMode:
 | 
				
			||||||
| 
						 | 
					@ -504,7 +504,7 @@ class Connect:
 | 
				
			||||||
            elif silent or (ignoreTimeout and any(_ in tbMsg for _ in ("timed out", "IncompleteRead"))):
 | 
					            elif silent or (ignoreTimeout and any(_ in tbMsg for _ in ("timed out", "IncompleteRead"))):
 | 
				
			||||||
                return None, None, None
 | 
					                return None, None, None
 | 
				
			||||||
            elif threadData.retriesCount < conf.retries and not kb.threadException:
 | 
					            elif threadData.retriesCount < conf.retries and not kb.threadException:
 | 
				
			||||||
                warnMsg += ", sqlmap is going to retry the request"
 | 
					                warnMsg += ". sqlmap is going to retry the request"
 | 
				
			||||||
                logger.critical(warnMsg)
 | 
					                logger.critical(warnMsg)
 | 
				
			||||||
                return Connect.__retryProxy(**kwargs)
 | 
					                return Connect.__retryProxy(**kwargs)
 | 
				
			||||||
            elif kb.testMode:
 | 
					            elif kb.testMode:
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -96,7 +96,7 @@ class Enumeration(GenericEnumeration):
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        if conf.db is None or conf.db == CURRENT_DB:
 | 
					        if conf.db is None or conf.db == CURRENT_DB:
 | 
				
			||||||
            if conf.db is None:
 | 
					            if conf.db is None:
 | 
				
			||||||
                warnMsg = "missing database parameter, sqlmap is going "
 | 
					                warnMsg = "missing database parameter. sqlmap is going "
 | 
				
			||||||
                warnMsg += "to use the current database to enumerate "
 | 
					                warnMsg += "to use the current database to enumerate "
 | 
				
			||||||
                warnMsg += "table(s) columns"
 | 
					                warnMsg += "table(s) columns"
 | 
				
			||||||
                logger.warn(warnMsg)
 | 
					                logger.warn(warnMsg)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -161,7 +161,7 @@ class Enumeration(GenericEnumeration):
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        if conf.db is None or conf.db == CURRENT_DB:
 | 
					        if conf.db is None or conf.db == CURRENT_DB:
 | 
				
			||||||
            if conf.db is None:
 | 
					            if conf.db is None:
 | 
				
			||||||
                warnMsg = "missing database parameter, sqlmap is going "
 | 
					                warnMsg = "missing database parameter. sqlmap is going "
 | 
				
			||||||
                warnMsg += "to use the current database to enumerate "
 | 
					                warnMsg += "to use the current database to enumerate "
 | 
				
			||||||
                warnMsg += "table(s) columns"
 | 
					                warnMsg += "table(s) columns"
 | 
				
			||||||
                logger.warn(warnMsg)
 | 
					                logger.warn(warnMsg)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -357,7 +357,7 @@ class Databases:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        if conf.db is None or conf.db == CURRENT_DB:
 | 
					        if conf.db is None or conf.db == CURRENT_DB:
 | 
				
			||||||
            if conf.db is None:
 | 
					            if conf.db is None:
 | 
				
			||||||
                warnMsg = "missing database parameter, sqlmap is going "
 | 
					                warnMsg = "missing database parameter. sqlmap is going "
 | 
				
			||||||
                warnMsg += "to use the current database to enumerate "
 | 
					                warnMsg += "to use the current database to enumerate "
 | 
				
			||||||
                warnMsg += "table(s) columns"
 | 
					                warnMsg += "table(s) columns"
 | 
				
			||||||
                logger.warn(warnMsg)
 | 
					                logger.warn(warnMsg)
 | 
				
			||||||
| 
						 | 
					@ -730,7 +730,7 @@ class Databases:
 | 
				
			||||||
                conf.db, conf.tbl = conf.tbl.split(".")
 | 
					                conf.db, conf.tbl = conf.tbl.split(".")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        if conf.tbl is not None and conf.db is None:
 | 
					        if conf.tbl is not None and conf.db is None:
 | 
				
			||||||
            warnMsg = "missing database parameter, sqlmap is going to "
 | 
					            warnMsg = "missing database parameter. sqlmap is going to "
 | 
				
			||||||
            warnMsg += "use the current database to retrieve the "
 | 
					            warnMsg += "use the current database to retrieve the "
 | 
				
			||||||
            warnMsg += "number of entries for table '%s'" % unsafeSQLIdentificatorNaming(conf.tbl)
 | 
					            warnMsg += "number of entries for table '%s'" % unsafeSQLIdentificatorNaming(conf.tbl)
 | 
				
			||||||
            logger.warn(warnMsg)
 | 
					            logger.warn(warnMsg)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -57,7 +57,7 @@ class Entries:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        if conf.db is None or conf.db == CURRENT_DB:
 | 
					        if conf.db is None or conf.db == CURRENT_DB:
 | 
				
			||||||
            if conf.db is None:
 | 
					            if conf.db is None:
 | 
				
			||||||
                warnMsg = "missing database parameter, sqlmap is going "
 | 
					                warnMsg = "missing database parameter. sqlmap is going "
 | 
				
			||||||
                warnMsg += "to use the current database to enumerate "
 | 
					                warnMsg += "to use the current database to enumerate "
 | 
				
			||||||
                warnMsg += "table(s) entries"
 | 
					                warnMsg += "table(s) entries"
 | 
				
			||||||
                logger.warn(warnMsg)
 | 
					                logger.warn(warnMsg)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue
	
	Block a user