mirror of
				https://github.com/sqlmapproject/sqlmap.git
				synced 2025-11-04 01:47:37 +03:00 
			
		
		
		
	Fixes #373
This commit is contained in:
		
							parent
							
								
									af890d639d
								
							
						
					
					
						commit
						dc95558187
					
				| 
						 | 
					@ -97,34 +97,84 @@ def action():
 | 
				
			||||||
            raise
 | 
					            raise
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if conf.getDbs:
 | 
					    if conf.getDbs:
 | 
				
			||||||
        conf.dumper.dbs(conf.dbmsHandler.getDbs())
 | 
					        try:
 | 
				
			||||||
 | 
					            conf.dumper.dbs(conf.dbmsHandler.getDbs())
 | 
				
			||||||
 | 
					        except SqlmapNoneDataException as ex:
 | 
				
			||||||
 | 
					            logger.critical(ex)
 | 
				
			||||||
 | 
					        except:
 | 
				
			||||||
 | 
					            raise
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if conf.getTables:
 | 
					    if conf.getTables:
 | 
				
			||||||
        conf.dumper.dbTables(conf.dbmsHandler.getTables())
 | 
					        try:
 | 
				
			||||||
 | 
					            conf.dumper.dbTables(conf.dbmsHandler.getTables())
 | 
				
			||||||
 | 
					        except SqlmapNoneDataException as ex:
 | 
				
			||||||
 | 
					            logger.critical(ex)
 | 
				
			||||||
 | 
					        except:
 | 
				
			||||||
 | 
					            raise
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if conf.commonTables:
 | 
					    if conf.commonTables:
 | 
				
			||||||
        conf.dumper.dbTables(tableExists(paths.COMMON_TABLES))
 | 
					        try:
 | 
				
			||||||
 | 
					            conf.dumper.dbTables(tableExists(paths.COMMON_TABLES))
 | 
				
			||||||
 | 
					        except SqlmapNoneDataException as ex:
 | 
				
			||||||
 | 
					            logger.critical(ex)
 | 
				
			||||||
 | 
					        except:
 | 
				
			||||||
 | 
					            raise
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if conf.getSchema:
 | 
					    if conf.getSchema:
 | 
				
			||||||
        conf.dumper.dbTableColumns(conf.dbmsHandler.getSchema(), CONTENT_TYPE.SCHEMA)
 | 
					        try:
 | 
				
			||||||
 | 
					            conf.dumper.dbTableColumns(conf.dbmsHandler.getSchema(), CONTENT_TYPE.SCHEMA)
 | 
				
			||||||
 | 
					        except SqlmapNoneDataException as ex:
 | 
				
			||||||
 | 
					            logger.critical(ex)
 | 
				
			||||||
 | 
					        except:
 | 
				
			||||||
 | 
					            raise
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if conf.getColumns:
 | 
					    if conf.getColumns:
 | 
				
			||||||
        conf.dumper.dbTableColumns(conf.dbmsHandler.getColumns(), CONTENT_TYPE.COLUMNS)
 | 
					        try:
 | 
				
			||||||
 | 
					            conf.dumper.dbTableColumns(conf.dbmsHandler.getColumns(), CONTENT_TYPE.COLUMNS)
 | 
				
			||||||
 | 
					        except SqlmapNoneDataException as ex:
 | 
				
			||||||
 | 
					            logger.critical(ex)
 | 
				
			||||||
 | 
					        except:
 | 
				
			||||||
 | 
					            raise
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if conf.getCount:
 | 
					    if conf.getCount:
 | 
				
			||||||
        conf.dumper.dbTablesCount(conf.dbmsHandler.getCount())
 | 
					        try:
 | 
				
			||||||
 | 
					            conf.dumper.dbTablesCount(conf.dbmsHandler.getCount())
 | 
				
			||||||
 | 
					        except SqlmapNoneDataException as ex:
 | 
				
			||||||
 | 
					            logger.critical(ex)
 | 
				
			||||||
 | 
					        except:
 | 
				
			||||||
 | 
					            raise
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if conf.commonColumns:
 | 
					    if conf.commonColumns:
 | 
				
			||||||
        conf.dumper.dbTableColumns(columnExists(paths.COMMON_COLUMNS))
 | 
					        try:
 | 
				
			||||||
 | 
					            conf.dumper.dbTableColumns(columnExists(paths.COMMON_COLUMNS))
 | 
				
			||||||
 | 
					        except SqlmapNoneDataException as ex:
 | 
				
			||||||
 | 
					            logger.critical(ex)
 | 
				
			||||||
 | 
					        except:
 | 
				
			||||||
 | 
					            raise
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if conf.dumpTable:
 | 
					    if conf.dumpTable:
 | 
				
			||||||
        conf.dbmsHandler.dumpTable()
 | 
					        try:
 | 
				
			||||||
 | 
					            conf.dbmsHandler.dumpTable()
 | 
				
			||||||
 | 
					        except SqlmapNoneDataException as ex:
 | 
				
			||||||
 | 
					            logger.critical(ex)
 | 
				
			||||||
 | 
					        except:
 | 
				
			||||||
 | 
					            raise
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if conf.dumpAll:
 | 
					    if conf.dumpAll:
 | 
				
			||||||
        conf.dbmsHandler.dumpAll()
 | 
					        try:
 | 
				
			||||||
 | 
					            conf.dbmsHandler.dumpAll()
 | 
				
			||||||
 | 
					        except SqlmapNoneDataException as ex:
 | 
				
			||||||
 | 
					            logger.critical(ex)
 | 
				
			||||||
 | 
					        except:
 | 
				
			||||||
 | 
					            raise
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if conf.search:
 | 
					    if conf.search:
 | 
				
			||||||
        conf.dbmsHandler.search()
 | 
					        try:
 | 
				
			||||||
 | 
					            conf.dbmsHandler.search()
 | 
				
			||||||
 | 
					        except SqlmapNoneDataException as ex:
 | 
				
			||||||
 | 
					            logger.critical(ex)
 | 
				
			||||||
 | 
					        except:
 | 
				
			||||||
 | 
					            raise
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if conf.query:
 | 
					    if conf.query:
 | 
				
			||||||
        conf.dumper.query(conf.query, conf.dbmsHandler.sqlQuery(conf.query))
 | 
					        conf.dumper.query(conf.query, conf.dbmsHandler.sqlQuery(conf.query))
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -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.3.2.23"
 | 
					VERSION = "1.3.2.24"
 | 
				
			||||||
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)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -23,7 +23,7 @@ fb6be55d21a70765e35549af2484f762  extra/sqlharvest/__init__.py
 | 
				
			||||||
4f82e97b09cc530cb9a92472d0835cea  extra/sqlharvest/sqlharvest.py
 | 
					4f82e97b09cc530cb9a92472d0835cea  extra/sqlharvest/sqlharvest.py
 | 
				
			||||||
fb6be55d21a70765e35549af2484f762  extra/wafdetectify/__init__.py
 | 
					fb6be55d21a70765e35549af2484f762  extra/wafdetectify/__init__.py
 | 
				
			||||||
aec73042403993076f478da48066a79e  extra/wafdetectify/wafdetectify.py
 | 
					aec73042403993076f478da48066a79e  extra/wafdetectify/wafdetectify.py
 | 
				
			||||||
ec782b9cdb8d857a80b6ecf0f32db7f4  lib/controller/action.py
 | 
					e6909a3b32fc09c0373101eb58c76538  lib/controller/action.py
 | 
				
			||||||
d392dbccdb59ac36530c1182675a2609  lib/controller/checks.py
 | 
					d392dbccdb59ac36530c1182675a2609  lib/controller/checks.py
 | 
				
			||||||
8581acf56b8fb0def50af3707490a834  lib/controller/controller.py
 | 
					8581acf56b8fb0def50af3707490a834  lib/controller/controller.py
 | 
				
			||||||
c1da277517c7ec4c23e953a51b51e203  lib/controller/handler.py
 | 
					c1da277517c7ec4c23e953a51b51e203  lib/controller/handler.py
 | 
				
			||||||
| 
						 | 
					@ -50,7 +50,7 @@ d5ef43fe3cdd6c2602d7db45651f9ceb  lib/core/readlineng.py
 | 
				
			||||||
7d8a22c582ad201f65b73225e4456170  lib/core/replication.py
 | 
					7d8a22c582ad201f65b73225e4456170  lib/core/replication.py
 | 
				
			||||||
3179d34f371e0295dd4604568fb30bcd  lib/core/revision.py
 | 
					3179d34f371e0295dd4604568fb30bcd  lib/core/revision.py
 | 
				
			||||||
d6269c55789f78cf707e09a0f5b45443  lib/core/session.py
 | 
					d6269c55789f78cf707e09a0f5b45443  lib/core/session.py
 | 
				
			||||||
3e31c14f05909fc1d676aee8d8a99c57  lib/core/settings.py
 | 
					c06bcf769e4c88a1c9be96507b5ef320  lib/core/settings.py
 | 
				
			||||||
4483b4a5b601d8f1c4281071dff21ecc  lib/core/shell.py
 | 
					4483b4a5b601d8f1c4281071dff21ecc  lib/core/shell.py
 | 
				
			||||||
10fd19b0716ed261e6d04f311f6f527c  lib/core/subprocessng.py
 | 
					10fd19b0716ed261e6d04f311f6f527c  lib/core/subprocessng.py
 | 
				
			||||||
43772ea73e9e3d446f782af591cb4eda  lib/core/target.py
 | 
					43772ea73e9e3d446f782af591cb4eda  lib/core/target.py
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue
	
	Block a user