mirror of
				https://github.com/sqlmapproject/sqlmap.git
				synced 2025-11-04 18:07:46 +03:00 
			
		
		
		
	Fixes #2656
This commit is contained in:
		
							parent
							
								
									5b6926ae05
								
							
						
					
					
						commit
						a761e1d165
					
				| 
						 | 
					@ -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.8.5"
 | 
					VERSION = "1.1.8.6"
 | 
				
			||||||
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)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -46,7 +46,7 @@ from lib.utils.htmlentities import htmlEntities
 | 
				
			||||||
from thirdparty.chardet import detect
 | 
					from thirdparty.chardet import detect
 | 
				
			||||||
from thirdparty.odict.odict import OrderedDict
 | 
					from thirdparty.odict.odict import OrderedDict
 | 
				
			||||||
 | 
					
 | 
				
			||||||
def forgeHeaders(items=None):
 | 
					def forgeHeaders(items=None, base=None):
 | 
				
			||||||
    """
 | 
					    """
 | 
				
			||||||
    Prepare HTTP Cookie, HTTP User-Agent and HTTP Referer headers to use when performing
 | 
					    Prepare HTTP Cookie, HTTP User-Agent and HTTP Referer headers to use when performing
 | 
				
			||||||
    the HTTP requests
 | 
					    the HTTP requests
 | 
				
			||||||
| 
						 | 
					@ -58,7 +58,7 @@ def forgeHeaders(items=None):
 | 
				
			||||||
        if items[_] is None:
 | 
					        if items[_] is None:
 | 
				
			||||||
            del items[_]
 | 
					            del items[_]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    headers = OrderedDict(conf.httpHeaders)
 | 
					    headers = OrderedDict(base or conf.httpHeaders)
 | 
				
			||||||
    headers.update(items.items())
 | 
					    headers.update(items.items())
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    class _str(str):
 | 
					    class _str(str):
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -384,11 +384,7 @@ class Connect(object):
 | 
				
			||||||
                headers = forgeHeaders({HTTP_HEADER.COOKIE: cookie})
 | 
					                headers = forgeHeaders({HTTP_HEADER.COOKIE: cookie})
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            if auxHeaders:
 | 
					            if auxHeaders:
 | 
				
			||||||
                for key, value in auxHeaders.items():
 | 
					                headers = forgeHeaders(auxHeaders, headers)
 | 
				
			||||||
                    for _ in headers.keys():
 | 
					 | 
				
			||||||
                        if _.upper() == key.upper():
 | 
					 | 
				
			||||||
                            del headers[_]
 | 
					 | 
				
			||||||
                    headers[key] = value
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
            for key, value in headers.items():
 | 
					            for key, value in headers.items():
 | 
				
			||||||
                del headers[key]
 | 
					                del headers[key]
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -46,7 +46,7 @@ a44d7a4cc6c9a67a72d6af2f25f4ddac  lib/core/exception.py
 | 
				
			||||||
d8e9250f3775119df07e9070eddccd16  lib/core/replication.py
 | 
					d8e9250f3775119df07e9070eddccd16  lib/core/replication.py
 | 
				
			||||||
785f86e3f963fa3798f84286a4e83ff2  lib/core/revision.py
 | 
					785f86e3f963fa3798f84286a4e83ff2  lib/core/revision.py
 | 
				
			||||||
40c80b28b3a5819b737a5a17d4565ae9  lib/core/session.py
 | 
					40c80b28b3a5819b737a5a17d4565ae9  lib/core/session.py
 | 
				
			||||||
6a496efd1775932aca395051ab950529  lib/core/settings.py
 | 
					7fba5bfabbc94b29a9998869faca440f  lib/core/settings.py
 | 
				
			||||||
d91291997d2bd2f6028aaf371bf1d3b6  lib/core/shell.py
 | 
					d91291997d2bd2f6028aaf371bf1d3b6  lib/core/shell.py
 | 
				
			||||||
2ad85c130cc5f2b3701ea85c2f6bbf20  lib/core/subprocessng.py
 | 
					2ad85c130cc5f2b3701ea85c2f6bbf20  lib/core/subprocessng.py
 | 
				
			||||||
4a6ecdd8a6e44bb4737bd9bc7f9b5743  lib/core/target.py
 | 
					4a6ecdd8a6e44bb4737bd9bc7f9b5743  lib/core/target.py
 | 
				
			||||||
| 
						 | 
					@ -66,9 +66,9 @@ ad74fc58fc7214802fd27067bce18dd2  lib/core/unescaper.py
 | 
				
			||||||
0b010b7cdb2e42b5aa0caa59607279ad  lib/parse/payloads.py
 | 
					0b010b7cdb2e42b5aa0caa59607279ad  lib/parse/payloads.py
 | 
				
			||||||
997d0452e6fc22411f81a334511bcb3d  lib/parse/sitemap.py
 | 
					997d0452e6fc22411f81a334511bcb3d  lib/parse/sitemap.py
 | 
				
			||||||
403d873f1d2fd0c7f73d83f104e41850  lib/request/basicauthhandler.py
 | 
					403d873f1d2fd0c7f73d83f104e41850  lib/request/basicauthhandler.py
 | 
				
			||||||
3ba1c71e68953d34fc526a9d79d5a457  lib/request/basic.py
 | 
					a06eddbdb529d4253c57250decb8e960  lib/request/basic.py
 | 
				
			||||||
ef48de622b0a6b4a71df64b0d2785ef8  lib/request/comparison.py
 | 
					ef48de622b0a6b4a71df64b0d2785ef8  lib/request/comparison.py
 | 
				
			||||||
e7ee2724486004129d4006f235b8556d  lib/request/connect.py
 | 
					38515a786ff9839436a864fb33dbc27b  lib/request/connect.py
 | 
				
			||||||
fb6b788d0016ab4ec5e5f661f0f702ad  lib/request/direct.py
 | 
					fb6b788d0016ab4ec5e5f661f0f702ad  lib/request/direct.py
 | 
				
			||||||
cc1163d38e9b7ee5db2adac6784c02bb  lib/request/dns.py
 | 
					cc1163d38e9b7ee5db2adac6784c02bb  lib/request/dns.py
 | 
				
			||||||
5dcdb37823a0b5eff65cd1018bcf09e4  lib/request/httpshandler.py
 | 
					5dcdb37823a0b5eff65cd1018bcf09e4  lib/request/httpshandler.py
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue
	
	Block a user