mirror of
				https://github.com/sqlmapproject/sqlmap.git
				synced 2025-11-04 09:57:38 +03:00 
			
		
		
		
	Minor update
This commit is contained in:
		
							parent
							
								
									33d8ce8923
								
							
						
					
					
						commit
						b23626db70
					
				| 
						 | 
					@ -1840,8 +1840,7 @@ def getPageWordSet(page):
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    # only if the page's charset has been successfully identified
 | 
					    # only if the page's charset has been successfully identified
 | 
				
			||||||
    if isinstance(page, unicode):
 | 
					    if isinstance(page, unicode):
 | 
				
			||||||
        _ = getFilteredPageContent(page)
 | 
					        retVal = set(_.group(0) for _ in re.finditer(r"\w+", getFilteredPageContent(page)))
 | 
				
			||||||
        retVal = set(re.findall(r"\w+", _))
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    return retVal
 | 
					    return retVal
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -3562,9 +3561,9 @@ def safeSQLIdentificatorNaming(name, isTable=False):
 | 
				
			||||||
        _ = isTable and Backend.getIdentifiedDbms() in (DBMS.MSSQL, DBMS.SYBASE)
 | 
					        _ = isTable and Backend.getIdentifiedDbms() in (DBMS.MSSQL, DBMS.SYBASE)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        if _:
 | 
					        if _:
 | 
				
			||||||
            retVal = re.sub(r"(?i)\A%s\." % DEFAULT_MSSQL_SCHEMA, "", retVal)
 | 
					            retVal = re.sub(r"(?i)\A\[?%s\]?\." % DEFAULT_MSSQL_SCHEMA, "", retVal)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        if retVal.upper() in kb.keywords or (retVal or " ")[0].isdigit() or not re.match(r"\A[A-Za-z0-9_@%s\$]+\Z" % ("." if _ else ""), retVal):  # MsSQL is the only DBMS where we automatically prepend schema to table name (dot is normal)
 | 
					        if retVal.upper() in kb.keywords or (retVal or " ")[0].isdigit() or not re.match(r"\A[A-Za-z0-9_@%s\$]+\Z" % ('.' if _ else ""), retVal):  # MsSQL is the only DBMS where we automatically prepend schema to table name (dot is normal)
 | 
				
			||||||
            retVal = unsafeSQLIdentificatorNaming(retVal)
 | 
					            retVal = unsafeSQLIdentificatorNaming(retVal)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            if Backend.getIdentifiedDbms() in (DBMS.MYSQL, DBMS.ACCESS):
 | 
					            if Backend.getIdentifiedDbms() in (DBMS.MYSQL, DBMS.ACCESS):
 | 
				
			||||||
| 
						 | 
					@ -3599,9 +3598,7 @@ def unsafeSQLIdentificatorNaming(name):
 | 
				
			||||||
            retVal = name.replace("[", "").replace("]", "")
 | 
					            retVal = name.replace("[", "").replace("]", "")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        if Backend.getIdentifiedDbms() in (DBMS.MSSQL, DBMS.SYBASE):
 | 
					        if Backend.getIdentifiedDbms() in (DBMS.MSSQL, DBMS.SYBASE):
 | 
				
			||||||
            prefix = "%s." % DEFAULT_MSSQL_SCHEMA
 | 
					            retVal = re.sub(r"(?i)\A\[?%s\]?\." % DEFAULT_MSSQL_SCHEMA, "", retVal)
 | 
				
			||||||
            if retVal.startswith(prefix):
 | 
					 | 
				
			||||||
                retVal = retVal[len(prefix):]
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    return retVal
 | 
					    return retVal
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -19,7 +19,7 @@ from lib.core.enums import DBMS_DIRECTORY_NAME
 | 
				
			||||||
from lib.core.enums import OS
 | 
					from lib.core.enums import OS
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# sqlmap version (<major>.<minor>.<month>.<monthly commit>)
 | 
					# sqlmap version (<major>.<minor>.<month>.<monthly commit>)
 | 
				
			||||||
VERSION = "1.1.11.32"
 | 
					VERSION = "1.1.11.33"
 | 
				
			||||||
TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
 | 
					TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
 | 
				
			||||||
TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34}
 | 
					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)
 | 
					VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -27,7 +27,7 @@ d2cdb9e832e18a81e936ca3348144b16  lib/controller/handler.py
 | 
				
			||||||
5fb9aaf874daa47ea2b672a22740e56b  lib/controller/__init__.py
 | 
					5fb9aaf874daa47ea2b672a22740e56b  lib/controller/__init__.py
 | 
				
			||||||
fd69e56ce20a5a49ce10a7a745022378  lib/core/agent.py
 | 
					fd69e56ce20a5a49ce10a7a745022378  lib/core/agent.py
 | 
				
			||||||
8d9d771f7e67582c56a96a8d0ccbe4fc  lib/core/bigarray.py
 | 
					8d9d771f7e67582c56a96a8d0ccbe4fc  lib/core/bigarray.py
 | 
				
			||||||
10bba585fc5fb525ffe3f7a2f67ab128  lib/core/common.py
 | 
					27d55009305e6409dc17f9c58cb87065  lib/core/common.py
 | 
				
			||||||
54326d3a690f8b26fe5a5da1a589b369  lib/core/convert.py
 | 
					54326d3a690f8b26fe5a5da1a589b369  lib/core/convert.py
 | 
				
			||||||
90b1b08368ac8a859300e6fa6a8c796e  lib/core/data.py
 | 
					90b1b08368ac8a859300e6fa6a8c796e  lib/core/data.py
 | 
				
			||||||
1c14bdbf47b8dba31f73da9ad731a54a  lib/core/datatype.py
 | 
					1c14bdbf47b8dba31f73da9ad731a54a  lib/core/datatype.py
 | 
				
			||||||
| 
						 | 
					@ -46,7 +46,7 @@ e1c000db9be27f973569b1a430629037  lib/core/option.py
 | 
				
			||||||
760d9df2a27ded29109b390ab202e72d  lib/core/replication.py
 | 
					760d9df2a27ded29109b390ab202e72d  lib/core/replication.py
 | 
				
			||||||
a2466b62e67f8b31736bac4dac590e51  lib/core/revision.py
 | 
					a2466b62e67f8b31736bac4dac590e51  lib/core/revision.py
 | 
				
			||||||
02d4762140a72fd44668d3dab5eabda9  lib/core/session.py
 | 
					02d4762140a72fd44668d3dab5eabda9  lib/core/session.py
 | 
				
			||||||
edbaf54b6459e379919d29c875fdece1  lib/core/settings.py
 | 
					8269d14ad7ba23bf255f355add19eaa5  lib/core/settings.py
 | 
				
			||||||
35bffbad762eb9e03db9e93b1c991103  lib/core/shell.py
 | 
					35bffbad762eb9e03db9e93b1c991103  lib/core/shell.py
 | 
				
			||||||
a59ec28371ae067a6fdd8f810edbee3d  lib/core/subprocessng.py
 | 
					a59ec28371ae067a6fdd8f810edbee3d  lib/core/subprocessng.py
 | 
				
			||||||
d5a04d672a18f78deb2839c3745ff83c  lib/core/target.py
 | 
					d5a04d672a18f78deb2839c3745ff83c  lib/core/target.py
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue
	
	Block a user