mirror of
https://github.com/sqlmapproject/sqlmap.git
synced 2025-02-03 13:14:13 +03:00
Docstring update and smalldict update (merge with top1575)
This commit is contained in:
Miroslav Stampar
parent
2b56bdfaa6
commit
4c25a20efc
|
|
@ -165,6 +165,7 @@ from lib.core.settings import URI_QUESTION_MARKER
|
|||
from lib.core.settings import URLENCODE_CHAR_LIMIT
|
||||
from lib.core.settings import URLENCODE_FAILSAFE_CHARS
|
||||
from lib.core.settings import USER_AGENT_ALIASES
|
||||
from lib.core.settings import VERSION
|
||||
from lib.core.settings import VERSION_STRING
|
||||
from lib.core.settings import WEBSCARAB_SPLITTER
|
||||
from lib.core.threads import getCurrentThreadData
|
||||
|
|
@ -1165,6 +1166,9 @@ def getHeader(headers, key):
|
|||
def checkFile(filename, raiseOnError=True):
|
||||
"""
|
||||
Checks for file existence and readability
|
||||
|
||||
>>> checkFile(__file__)
|
||||
True
|
||||
"""
|
||||
|
||||
valid = True
|
||||
|
|
@ -1647,6 +1651,9 @@ def parseUnionPage(page):
|
|||
def parseFilePaths(page):
|
||||
"""
|
||||
Detects (possible) absolute system paths inside the provided page content
|
||||
|
||||
>>> _ = "/var/www/html/index.php"; parseFilePaths("<html>Error occurred at line 207 of: %s<br>Please contact your administrator</html>" % _); _ in kb.absFilePaths
|
||||
True
|
||||
"""
|
||||
|
||||
if page:
|
||||
|
|
@ -2039,6 +2046,9 @@ def parseXmlFile(xmlFile, handler):
|
|||
def getSQLSnippet(dbms, sfile, **variables):
|
||||
"""
|
||||
Returns content of SQL snippet located inside 'procs/' directory
|
||||
|
||||
>>> 'RECONFIGURE' in getSQLSnippet(DBMS.MSSQL, "activate_sp_oacreate")
|
||||
True
|
||||
"""
|
||||
|
||||
if sfile.endswith('.sql') and os.path.exists(sfile):
|
||||
|
|
@ -2078,9 +2088,12 @@ def getSQLSnippet(dbms, sfile, **variables):
|
|||
|
||||
return retVal
|
||||
|
||||
def readCachedFileContent(filename, mode='rb'):
|
||||
def readCachedFileContent(filename, mode="rb"):
|
||||
"""
|
||||
Cached reading of file content (avoiding multiple same file reading)
|
||||
|
||||
>>> "readCachedFileContent" in readCachedFileContent(__file__)
|
||||
True
|
||||
"""
|
||||
|
||||
if filename not in kb.cache.content:
|
||||
|
|
@ -2137,6 +2150,9 @@ def average(values):
|
|||
def calculateDeltaSeconds(start):
|
||||
"""
|
||||
Returns elapsed time from start till now
|
||||
|
||||
>>> calculateDeltaSeconds(0) > 1151721660
|
||||
True
|
||||
"""
|
||||
|
||||
return time.time() - start
|
||||
|
|
@ -2144,6 +2160,9 @@ def calculateDeltaSeconds(start):
|
|||
def initCommonOutputs():
|
||||
"""
|
||||
Initializes dictionary containing common output values used by "good samaritan" feature
|
||||
|
||||
>>> initCommonOutputs(); "information_schema" in kb.commonOutputs["Databases"]
|
||||
True
|
||||
"""
|
||||
|
||||
kb.commonOutputs = {}
|
||||
|
|
@ -3351,6 +3370,9 @@ def unhandledExceptionMessage():
|
|||
def getLatestRevision():
|
||||
"""
|
||||
Retrieves latest revision from the offical repository
|
||||
|
||||
>>> getLatestRevision() == VERSION
|
||||
True
|
||||
"""
|
||||
|
||||
retVal = None
|
||||
|
|
@ -4149,6 +4171,9 @@ def checkSystemEncoding():
|
|||
def evaluateCode(code, variables=None):
|
||||
"""
|
||||
Executes given python code given in a string form
|
||||
|
||||
>>> _ = {}; evaluateCode("a = 1; b = 2; c = a", _); _["c"]
|
||||
1
|
||||
"""
|
||||
|
||||
try:
|
||||
|
|
@ -4202,6 +4227,9 @@ def incrementCounter(technique):
|
|||
def getCounter(technique):
|
||||
"""
|
||||
Returns query counter for a given technique
|
||||
|
||||
>>> resetCounter(PAYLOAD.TECHNIQUE.STACKED); incrementCounter(PAYLOAD.TECHNIQUE.STACKED); getCounter(PAYLOAD.TECHNIQUE.STACKED)
|
||||
1
|
||||
"""
|
||||
|
||||
return kb.counters.get(technique, 0)
|
||||
|
|
@ -4441,6 +4469,9 @@ def zeroDepthSearch(expression, value):
|
|||
"""
|
||||
Searches occurrences of value inside expression at 0-depth level
|
||||
regarding the parentheses
|
||||
|
||||
>>> _ = "SELECT (SELECT id FROM users WHERE 2>1) AS result FROM DUAL"; _[zeroDepthSearch(_, "FROM")[0]:]
|
||||
'FROM DUAL'
|
||||
"""
|
||||
|
||||
retVal = []
|
||||
|
|
@ -4476,7 +4507,7 @@ def pollProcess(process, suppress_errors=False):
|
|||
Checks for process status (prints . if still running)
|
||||
"""
|
||||
|
||||
while True:
|
||||
while process:
|
||||
dataToStdout(".")
|
||||
time.sleep(1)
|
||||
|
||||
|
|
@ -4701,12 +4732,33 @@ def getSafeExString(ex, encoding=None):
|
|||
return getUnicode(retVal or "", encoding=encoding).strip()
|
||||
|
||||
def safeVariableNaming(value):
|
||||
"""
|
||||
Returns escaped safe-representation of a given variable name that can be used in Python evaluated code
|
||||
|
||||
>>> safeVariableNaming("foo bar")
|
||||
'foo__SAFE__20bar'
|
||||
"""
|
||||
|
||||
return re.sub(r"[^\w]", lambda match: "%s%02x" % (SAFE_VARIABLE_MARKER, ord(match.group(0))), value)
|
||||
|
||||
def unsafeVariableNaming(value):
|
||||
"""
|
||||
Returns unescaped safe-representation of a given variable name
|
||||
|
||||
>>> unsafeVariableNaming("foo__SAFE__20bar")
|
||||
'foo bar'
|
||||
"""
|
||||
|
||||
return re.sub(r"%s([0-9a-f]{2})" % SAFE_VARIABLE_MARKER, lambda match: match.group(1).decode("hex"), value)
|
||||
|
||||
def firstNotNone(*args):
|
||||
"""
|
||||
Returns first not-None value from a given list of arguments
|
||||
|
||||
>>> firstNotNone(None, None, 1, 2, 3)
|
||||
1
|
||||
"""
|
||||
|
||||
retVal = None
|
||||
|
||||
for _ in args:
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ from lib.core.enums import DBMS_DIRECTORY_NAME
|
|||
from lib.core.enums import OS
|
||||
|
||||
# sqlmap version (<major>.<minor>.<month>.<monthly commit>)
|
||||
VERSION = "1.2.9.10"
|
||||
VERSION = "1.2.9.11"
|
||||
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)
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ c7443613a0a2505b1faec931cee2a6ef lib/controller/handler.py
|
|||
1e5532ede194ac9c083891c2f02bca93 lib/controller/__init__.py
|
||||
8eb0a5dbd79bd58fedac4c0cc344246b lib/core/agent.py
|
||||
fd8f239e259afaf5f24bcf34a0ad187f lib/core/bigarray.py
|
||||
6e73b39f7c51f75ae64a652dec69ab2f lib/core/common.py
|
||||
a69c59bec0b35442139d1c29f1b05797 lib/core/common.py
|
||||
0d082da16c388b3445e656e0760fb582 lib/core/convert.py
|
||||
9f87391b6a3395f7f50830b391264f27 lib/core/data.py
|
||||
72016ea5c994a711a262fd64572a0fcd lib/core/datatype.py
|
||||
|
|
@ -50,7 +50,7 @@ c8c386d644d57c659d74542f5f57f632 lib/core/patch.py
|
|||
0c3eef46bdbf87e29a3f95f90240d192 lib/core/replication.py
|
||||
a7db43859b61569b601b97f187dd31c5 lib/core/revision.py
|
||||
fcb74fcc9577523524659ec49e2e964b lib/core/session.py
|
||||
021d606c9405fd23d630108bf5c39853 lib/core/settings.py
|
||||
e595397f965c89ed29d9b4b89aada743 lib/core/settings.py
|
||||
dd68a9d02fccb4fa1428b20e15b0db5d lib/core/shell.py
|
||||
a7edc9250d13af36ac0108f259859c19 lib/core/subprocessng.py
|
||||
815d1cf27f0f8738d81531e73149867d lib/core/target.py
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user