mirror of
				https://github.com/sqlmapproject/sqlmap.git
				synced 2025-10-31 16:07:55 +03:00 
			
		
		
		
	Patch related to the #5700
This commit is contained in:
		
							parent
							
								
									163a5f374a
								
							
						
					
					
						commit
						9bbf70790c
					
				|  | @ -187,7 +187,7 @@ bf77f9fc4296f239687297aee1fd6113b34f855965a6f690b52e26bd348cb353  lib/core/profi | ||||||
| 4eff81c639a72b261c8ba1c876a01246e718e6626e8e77ae9cc6298b20a39355  lib/core/replication.py | 4eff81c639a72b261c8ba1c876a01246e718e6626e8e77ae9cc6298b20a39355  lib/core/replication.py | ||||||
| bbd1dcda835934728efc6d68686e9b0da72b09b3ee38f3c0ab78e8c18b0ba726  lib/core/revision.py | bbd1dcda835934728efc6d68686e9b0da72b09b3ee38f3c0ab78e8c18b0ba726  lib/core/revision.py | ||||||
| eed6b0a21b3e69c5583133346b0639dc89937bd588887968ee85f8389d7c3c96  lib/core/session.py | eed6b0a21b3e69c5583133346b0639dc89937bd588887968ee85f8389d7c3c96  lib/core/session.py | ||||||
| 42d5257804edb1f0f5251774a1931e16eab6c4aec1ece3dd27f95fc62fca1f90  lib/core/settings.py | 3f14500213dde69e2833c7f1e3c6c81695605f72ecc3ef0ebcc5df66a562231e  lib/core/settings.py | ||||||
| 2bec97d8a950f7b884e31dfe9410467f00d24f21b35672b95f8d68ed59685fd4  lib/core/shell.py | 2bec97d8a950f7b884e31dfe9410467f00d24f21b35672b95f8d68ed59685fd4  lib/core/shell.py | ||||||
| e90a359b37a55c446c60e70ccd533f87276714d0b09e34f69b0740fd729ddbf8  lib/core/subprocessng.py | e90a359b37a55c446c60e70ccd533f87276714d0b09e34f69b0740fd729ddbf8  lib/core/subprocessng.py | ||||||
| 54f7c70b4c7a9931f7ff3c1c12030180bde38e35a306d5e343ad6052919974cd  lib/core/target.py | 54f7c70b4c7a9931f7ff3c1c12030180bde38e35a306d5e343ad6052919974cd  lib/core/target.py | ||||||
|  | @ -210,7 +210,7 @@ b48edf3f30db127b18419f607894d5de46fc949d14c65fdc85ece524207d6dfd  lib/parse/html | ||||||
| c8446d4a50f06a50d7db18adc04c321e12cd2d0fa8b04bd58306511c89823316  lib/request/basic.py | c8446d4a50f06a50d7db18adc04c321e12cd2d0fa8b04bd58306511c89823316  lib/request/basic.py | ||||||
| ead55e936dfc8941e512c8e8a4f644689387f331f4eed97854c558be3e227a91  lib/request/chunkedhandler.py | ead55e936dfc8941e512c8e8a4f644689387f331f4eed97854c558be3e227a91  lib/request/chunkedhandler.py | ||||||
| 06128c4e3e0e1fe34618de9d1fd5ee21292953dce4a3416567e200d2dfda79f2  lib/request/comparison.py | 06128c4e3e0e1fe34618de9d1fd5ee21292953dce4a3416567e200d2dfda79f2  lib/request/comparison.py | ||||||
| aae5237e90a92f302be8bd0b682670e168a28c038764ce53d3cc6a02ecff8743  lib/request/connect.py | 45f365239c48f2f6b8adc605b2f33b3522bda6e3248589dae909380434aaa0ad  lib/request/connect.py | ||||||
| 470e96857a7037a2d74b2c4b1c8c5d8379b76ea8cbdb1d8dd4367a7a852fa93c  lib/request/direct.py | 470e96857a7037a2d74b2c4b1c8c5d8379b76ea8cbdb1d8dd4367a7a852fa93c  lib/request/direct.py | ||||||
| e802cc9099282764da0280172623600b6b9bb9fe1c87f352ade8be7a3f622585  lib/request/dns.py | e802cc9099282764da0280172623600b6b9bb9fe1c87f352ade8be7a3f622585  lib/request/dns.py | ||||||
| 226226c2b8c906e0d0612ea68404c7f266e7a6685e0bf233e5456e10625b012d  lib/request/httpshandler.py | 226226c2b8c906e0d0612ea68404c7f266e7a6685e0bf233e5456e10625b012d  lib/request/httpshandler.py | ||||||
|  |  | ||||||
|  | @ -20,7 +20,7 @@ from thirdparty import six | ||||||
| from thirdparty.six import unichr as _unichr | from thirdparty.six import unichr as _unichr | ||||||
| 
 | 
 | ||||||
| # sqlmap version (<major>.<minor>.<month>.<monthly commit>) | # sqlmap version (<major>.<minor>.<month>.<monthly commit>) | ||||||
| VERSION = "1.8.4.7" | VERSION = "1.8.5.0" | ||||||
| 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) | ||||||
|  |  | ||||||
|  | @ -914,12 +914,6 @@ class Connect(object): | ||||||
|                 raise SqlmapConnectionException(warnMsg) |                 raise SqlmapConnectionException(warnMsg) | ||||||
| 
 | 
 | ||||||
|         finally: |         finally: | ||||||
|             if isinstance(page, six.binary_type): |  | ||||||
|                 if HTTP_HEADER.CONTENT_TYPE in (responseHeaders or {}) and not re.search(TEXT_CONTENT_TYPE_REGEX, responseHeaders[HTTP_HEADER.CONTENT_TYPE]): |  | ||||||
|                     page = six.text_type(page, errors="ignore") |  | ||||||
|                 else: |  | ||||||
|                     page = getUnicode(page) |  | ||||||
| 
 |  | ||||||
|             for function in kb.postprocessFunctions: |             for function in kb.postprocessFunctions: | ||||||
|                 try: |                 try: | ||||||
|                     page, responseHeaders, code = function(page, responseHeaders, code) |                     page, responseHeaders, code = function(page, responseHeaders, code) | ||||||
|  | @ -928,6 +922,12 @@ class Connect(object): | ||||||
|                     errMsg += "function '%s' ('%s')" % (function.__name__, getSafeExString(ex)) |                     errMsg += "function '%s' ('%s')" % (function.__name__, getSafeExString(ex)) | ||||||
|                     raise SqlmapGenericException(errMsg) |                     raise SqlmapGenericException(errMsg) | ||||||
| 
 | 
 | ||||||
|  |             if isinstance(page, six.binary_type): | ||||||
|  |                 if HTTP_HEADER.CONTENT_TYPE in (responseHeaders or {}) and not re.search(TEXT_CONTENT_TYPE_REGEX, responseHeaders[HTTP_HEADER.CONTENT_TYPE]): | ||||||
|  |                     page = six.text_type(page, errors="ignore") | ||||||
|  |                 else: | ||||||
|  |                     page = getUnicode(page) | ||||||
|  | 
 | ||||||
|             for _ in (getattr(conn, "redcode", None), code): |             for _ in (getattr(conn, "redcode", None), code): | ||||||
|                 if _ is not None and _ in conf.abortCode: |                 if _ is not None and _ in conf.abortCode: | ||||||
|                     errMsg = "aborting due to detected HTTP code '%d'" % _ |                     errMsg = "aborting due to detected HTTP code '%d'" % _ | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue
	
	Block a user