mirror of
				https://github.com/sqlmapproject/sqlmap.git
				synced 2025-11-04 09:57:38 +03:00 
			
		
		
		
	Trivial refactoring
This commit is contained in:
		
							parent
							
								
									b3f4c6d0fc
								
							
						
					
					
						commit
						a42ec7d9cb
					
				| 
						 | 
				
			
			@ -18,7 +18,7 @@ from lib.core.enums import OS
 | 
			
		|||
from thirdparty.six import unichr as _unichr
 | 
			
		||||
 | 
			
		||||
# sqlmap version (<major>.<minor>.<month>.<monthly commit>)
 | 
			
		||||
VERSION = "1.4.8.9"
 | 
			
		||||
VERSION = "1.4.8.10"
 | 
			
		||||
TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
 | 
			
		||||
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)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -111,7 +111,7 @@ def _setRequestParams():
 | 
			
		|||
        def process(match, repl):
 | 
			
		||||
            retVal = match.group(0)
 | 
			
		||||
 | 
			
		||||
            if not (conf.testParameter and match.group("name") not in [removePostHintPrefix(_) for _ in conf.testParameter]) and match.group("name") == match.group("name").strip('\\'):
 | 
			
		||||
            if not (conf.testParameter and match.group("name") not in (removePostHintPrefix(_) for _ in conf.testParameter)) and match.group("name") == match.group("name").strip('\\'):
 | 
			
		||||
                retVal = repl
 | 
			
		||||
                while True:
 | 
			
		||||
                    _ = re.search(r"\\g<([^>]+)>", retVal)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1131,7 +1131,7 @@ class Connect(object):
 | 
			
		|||
                            uri = _adjustParameter(uri, token.name, token.value)
 | 
			
		||||
                        elif candidate == PLACE.GET and get:
 | 
			
		||||
                            get = _adjustParameter(get, token.name, token.value)
 | 
			
		||||
                        elif candidate in [PLACE.POST, PLACE.CUSTOM_POST] and post:
 | 
			
		||||
                        elif candidate in (PLACE.POST, PLACE.CUSTOM_POST) and post:
 | 
			
		||||
                            post = _adjustParameter(post, token.name, token.value)
 | 
			
		||||
 | 
			
		||||
                for i in xrange(len(conf.httpHeaders)):
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -58,7 +58,7 @@ class HTTPSConnection(_http_client.HTTPSConnection):
 | 
			
		|||
        # Reference(s): https://docs.python.org/2/library/ssl.html#ssl.SSLContext
 | 
			
		||||
        #               https://www.mnot.net/blog/2014/12/27/python_2_and_tls_sni
 | 
			
		||||
        if re.search(r"\A[\d.]+\Z", self.host) is None and kb.tlsSNI.get(self.host) is not False and hasattr(ssl, "SSLContext"):
 | 
			
		||||
            for protocol in [_ for _ in _protocols if _ >= ssl.PROTOCOL_TLSv1]:
 | 
			
		||||
            for protocol in (_ for _ in _protocols if _ >= ssl.PROTOCOL_TLSv1):
 | 
			
		||||
                try:
 | 
			
		||||
                    sock = create_sock()
 | 
			
		||||
                    if protocol not in _contexts:
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue
	
	Block a user