mirror of
				https://github.com/sqlmapproject/sqlmap.git
				synced 2025-10-30 23:47:45 +03:00 
			
		
		
		
	Minor patch
This commit is contained in:
		
							parent
							
								
									568ee4669e
								
							
						
					
					
						commit
						f4bfa7a5ae
					
				|  | @ -208,7 +208,7 @@ def smokeTest(): | |||
|             continue | ||||
| 
 | ||||
|         for filename in files: | ||||
|             if os.path.splitext(filename)[1].lower() == ".py" and filename != "__init__.py": | ||||
|             if os.path.splitext(filename)[1].lower() == ".py" and filename not in ("__init__.py", "gui.py"): | ||||
|                 path = os.path.join(root, os.path.splitext(filename)[0]) | ||||
|                 path = path.replace(paths.SQLMAP_ROOT_PATH, '.') | ||||
|                 path = path.replace(os.sep, '.').lstrip('.') | ||||
|  |  | |||
							
								
								
									
										92
									
								
								sqlmap.py
									
									
									
									
									
								
							
							
						
						
									
										92
									
								
								sqlmap.py
									
									
									
									
									
								
							|  | @ -255,32 +255,7 @@ def main(): | |||
|         excMsg = traceback.format_exc() | ||||
|         valid = checkIntegrity() | ||||
| 
 | ||||
|         if valid is False: | ||||
|             errMsg = "code integrity check failed (turning off automatic issue creation). " | ||||
|             errMsg += "You should retrieve the latest development version from official GitHub " | ||||
|             errMsg += "repository at '%s'" % GIT_PAGE | ||||
|             logger.critical(errMsg) | ||||
|             print() | ||||
|             dataToStdout(excMsg) | ||||
|             raise SystemExit | ||||
| 
 | ||||
|         elif any(_ in excMsg for _ in ("tamper/", "waf/")): | ||||
|             logger.critical(errMsg) | ||||
|             print() | ||||
|             dataToStdout(excMsg) | ||||
|             raise SystemExit | ||||
| 
 | ||||
|         elif any(_ in excMsg for _ in ("ImportError", "ModuleNotFoundError", "Can't find file for module")): | ||||
|             errMsg = "invalid runtime environment ('%s')" % excMsg.split("Error: ")[-1].strip() | ||||
|             logger.critical(errMsg) | ||||
|             raise SystemExit | ||||
| 
 | ||||
|         elif all(_ in excMsg for _ in ("SyntaxError: Non-ASCII character", ".py on line", "but no encoding declared")) or any(_ in excMsg for _ in ("source code string cannot contain null bytes", "No module named")): | ||||
|             errMsg = "invalid runtime environment ('%s')" % excMsg.split("Error: ")[-1].strip() | ||||
|             logger.critical(errMsg) | ||||
|             raise SystemExit | ||||
| 
 | ||||
|         elif any(_ in excMsg for _ in ("MemoryError", "Cannot allocate memory")): | ||||
|         if any(_ in excMsg for _ in ("MemoryError", "Cannot allocate memory")): | ||||
|             errMsg = "memory exhaustion detected" | ||||
|             logger.critical(errMsg) | ||||
|             raise SystemExit | ||||
|  | @ -300,13 +275,6 @@ def main(): | |||
|             logger.critical(errMsg) | ||||
|             raise SystemExit | ||||
| 
 | ||||
|         elif all(_ in excMsg for _ in ("No such file", "_'")): | ||||
|             errMsg = "corrupted installation detected ('%s'). " % excMsg.strip().split('\n')[-1] | ||||
|             errMsg += "You should retrieve the latest development version from official GitHub " | ||||
|             errMsg += "repository at '%s'" % GIT_PAGE | ||||
|             logger.critical(errMsg) | ||||
|             raise SystemExit | ||||
| 
 | ||||
|         elif "Read-only file system" in excMsg: | ||||
|             errMsg = "output device is mounted as read-only" | ||||
|             logger.critical(errMsg) | ||||
|  | @ -373,13 +341,6 @@ def main(): | |||
|             logger.critical(errMsg) | ||||
|             raise SystemExit | ||||
| 
 | ||||
|         elif "'DictObject' object has no attribute '" in excMsg and all(_ in errMsg for _ in ("(fingerprinted)", "(identified)")): | ||||
|             errMsg = "there has been a problem in enumeration. " | ||||
|             errMsg += "Because of a considerable chance of false-positive case " | ||||
|             errMsg += "you are advised to rerun with switch '--flush-session'" | ||||
|             logger.critical(errMsg) | ||||
|             raise SystemExit | ||||
| 
 | ||||
|         elif all(_ in excMsg for _ in ("pymysql", "configparser")): | ||||
|             errMsg = "wrong initialization of pymsql detected (using Python3 dependencies)" | ||||
|             logger.critical(errMsg) | ||||
|  | @ -391,6 +352,51 @@ def main(): | |||
|             logger.critical(errMsg) | ||||
|             raise SystemExit | ||||
| 
 | ||||
|         elif kb.get("dumpKeyboardInterrupt"): | ||||
|             raise SystemExit | ||||
| 
 | ||||
|         elif any(_ in excMsg for _ in ("Broken pipe",)): | ||||
|             raise SystemExit | ||||
| 
 | ||||
|         elif valid is False: | ||||
|             errMsg = "code integrity check failed (turning off automatic issue creation). " | ||||
|             errMsg += "You should retrieve the latest development version from official GitHub " | ||||
|             errMsg += "repository at '%s'" % GIT_PAGE | ||||
|             logger.critical(errMsg) | ||||
|             print() | ||||
|             dataToStdout(excMsg) | ||||
|             raise SystemExit | ||||
| 
 | ||||
|         elif any(_ in excMsg for _ in ("tamper/", "waf/")): | ||||
|             logger.critical(errMsg) | ||||
|             print() | ||||
|             dataToStdout(excMsg) | ||||
|             raise SystemExit | ||||
| 
 | ||||
|         elif any(_ in excMsg for _ in ("ImportError", "ModuleNotFoundError", "Can't find file for module")): | ||||
|             errMsg = "invalid runtime environment ('%s')" % excMsg.split("Error: ")[-1].strip() | ||||
|             logger.critical(errMsg) | ||||
|             raise SystemExit | ||||
| 
 | ||||
|         elif all(_ in excMsg for _ in ("SyntaxError: Non-ASCII character", ".py on line", "but no encoding declared")) or any(_ in excMsg for _ in ("source code string cannot contain null bytes", "No module named")): | ||||
|             errMsg = "invalid runtime environment ('%s')" % excMsg.split("Error: ")[-1].strip() | ||||
|             logger.critical(errMsg) | ||||
|             raise SystemExit | ||||
| 
 | ||||
|         elif all(_ in excMsg for _ in ("No such file", "_'")): | ||||
|             errMsg = "corrupted installation detected ('%s'). " % excMsg.strip().split('\n')[-1] | ||||
|             errMsg += "You should retrieve the latest development version from official GitHub " | ||||
|             errMsg += "repository at '%s'" % GIT_PAGE | ||||
|             logger.critical(errMsg) | ||||
|             raise SystemExit | ||||
| 
 | ||||
|         elif "'DictObject' object has no attribute '" in excMsg and all(_ in errMsg for _ in ("(fingerprinted)", "(identified)")): | ||||
|             errMsg = "there has been a problem in enumeration. " | ||||
|             errMsg += "Because of a considerable chance of false-positive case " | ||||
|             errMsg += "you are advised to rerun with switch '--flush-session'" | ||||
|             logger.critical(errMsg) | ||||
|             raise SystemExit | ||||
| 
 | ||||
|         elif "bad marshal data (unknown type code)" in excMsg: | ||||
|             match = re.search(r"\s*(.+)\s+ValueError", excMsg) | ||||
|             errMsg = "one of your .pyc files are corrupted%s" % (" ('%s')" % match.group(1) if match else "") | ||||
|  | @ -398,12 +404,6 @@ def main(): | |||
|             logger.critical(errMsg) | ||||
|             raise SystemExit | ||||
| 
 | ||||
|         elif kb.get("dumpKeyboardInterrupt"): | ||||
|             raise SystemExit | ||||
| 
 | ||||
|         elif any(_ in excMsg for _ in ("Broken pipe",)): | ||||
|             raise SystemExit | ||||
| 
 | ||||
|         for match in re.finditer(r'File "(.+?)", line', excMsg): | ||||
|             file_ = match.group(1) | ||||
|             try: | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	Block a user