mirror of
https://github.com/sqlmapproject/sqlmap.git
synced 2026-07-03 15:01:13 +00:00
Minor patch
This commit is contained in:
parent
fe69e6bfcc
commit
2719ce6c59
5 changed files with 18 additions and 9 deletions
|
|
@ -181,15 +181,15 @@ c2db614a3ce7dda889152bea8bd6d709e5d8c2b556741fdbfe44469f27ce266b lib/core/enums
|
|||
5387168e5dfedd94ae22af7bb255f27d6baaca50b24179c6b98f4f325f5cc7b4 lib/core/exception.py
|
||||
1966ca704961fb987ab757f0a4afddbf841d1a880631b701487c75cef63d60c3 lib/core/__init__.py
|
||||
914a13ee21fd610a6153a37cbe50830fcbd1324c7ebc1e7fc206d5e598b0f7ad lib/core/log.py
|
||||
91cc64c3dadf05eae666fcbbb0cd44c8ed8dd60592334b419ec8748cdded5f30 lib/core/optiondict.py
|
||||
227716f876f3af24e2c5ae4818d1e3b9bc17627f1876d66bcefc4953e660f1af lib/core/option.py
|
||||
47c9828bdfa606a02f07925539d7af55c5eaf1fda61d05ecc40f73d77df036f9 lib/core/optiondict.py
|
||||
3ac60716cf1c619b80038acb8b213c728cc607e7c5a387911e01635a23fbc92b lib/core/option.py
|
||||
21b2b1745107c211fc7593923a3da7a808d40763c00091c28de5f7c129bcf3bc lib/core/patch.py
|
||||
49c0fa7e3814dfda610d665ee02b12df299b28bc0b6773815b4395514ddf8dec lib/core/profiling.py
|
||||
0c36a65b6237732eb001d333f80f0c58c088ff01ae80cf07e4dcc6da2a806364 lib/core/readlineng.py
|
||||
9bf174058f15d14e24e94f9aaf42df045119d3617c6c54bd2f3af79b462f331d lib/core/replication.py
|
||||
0b8c38a01bb01f843d94a6c5f2075ee47520d0c4aa799cecea9c3e2c5a4a23a6 lib/core/revision.py
|
||||
888daba83fd4a34e9503fe21f01fef4cc730e5cde871b1d40e15d4cbc847d56c lib/core/session.py
|
||||
1769800f72aa1e88c885ffb641e6e816d7d569b8c4a554bf7c7de821961a5235 lib/core/settings.py
|
||||
3871d1b0d2ec82e2b0ed4705199519a473f92dbbf0db911e96ca613774961021 lib/core/settings.py
|
||||
c7804223319e18eb0b8e2cbf0a8b6896d1cefb7b0b1a2e9f1cf826a8a3b56750 lib/core/shell.py
|
||||
a2e98a94b231432736d6b304fc75525c8b5fdb4768c418387c5b4c1a610dad64 lib/core/subprocessng.py
|
||||
15d36cdac9389d0a54a6c33fbb89f32bb65e303f50de573773dcb6d4618bca64 lib/core/target.py
|
||||
|
|
@ -200,7 +200,7 @@ b9aacb840310173202f79c2ba125b0243003ee6b44c92eca50424f2bdfc83c02 lib/core/unesc
|
|||
2400e465fa4d13e4c32795910878c71ff212e4361b46428d57ce43983f5e997c lib/core/wordlist.py
|
||||
1966ca704961fb987ab757f0a4afddbf841d1a880631b701487c75cef63d60c3 lib/__init__.py
|
||||
54bfd31ebded3ffa5848df1c644f196eb704116517c7a3d860b5d081e984d821 lib/parse/banner.py
|
||||
1a67c8e0c46fb1244535d3961c35300da4aecd1872fd1fe2e3a752a5643875ed lib/parse/cmdline.py
|
||||
fef119c6f3f2fe6a092112fd832d645c58e4c3c2af0bd97ace4487372c1e3574 lib/parse/cmdline.py
|
||||
02d82e4069bd98c52755417f8b8e306d79945672656ac24f1a45e7a6eff4b158 lib/parse/configfile.py
|
||||
c5b258be7485089fac9d9cd179960e774fbd85e62836dc67cce76cc028bb6aeb lib/parse/handler.py
|
||||
5c9a9caee948843d5537745640cc7b98d70a0412cc0949f59d4ebe8b2907c06c lib/parse/headers.py
|
||||
|
|
|
|||
|
|
@ -502,14 +502,17 @@ def _setOpenApiTargets():
|
|||
warnMsg = "option '--method' will override the HTTP method(s) derived from the OpenAPI/Swagger specification"
|
||||
logger.warning(warnMsg)
|
||||
|
||||
origin = None
|
||||
# origin resolves a spec's relative 'servers' to absolute target URLs: an explicit '--openapi-base'
|
||||
# (needed for a host-less local spec) or, when fetched by URL, the fetch URL itself.
|
||||
origin = conf.openApiBase.rstrip('/') if conf.openApiBase else None
|
||||
if re.match(r"(?i)\Ahttps?://", conf.openApiFile):
|
||||
infoMsg = "fetching OpenAPI/Swagger specification from '%s'" % conf.openApiFile
|
||||
logger.info(infoMsg)
|
||||
from lib.request.connect import Connect as Request
|
||||
content = Request.getPage(url=conf.openApiFile, raise404=True)[0]
|
||||
match = re.match(r"(?i)(https?://[^/]+)", conf.openApiFile)
|
||||
origin = match.group(1) if match else None
|
||||
if not origin:
|
||||
match = re.match(r"(?i)(https?://[^/]+)", conf.openApiFile)
|
||||
origin = match.group(1) if match else None
|
||||
else:
|
||||
conf.openApiFile = safeExpandUser(conf.openApiFile)
|
||||
checkFile(conf.openApiFile)
|
||||
|
|
@ -549,6 +552,8 @@ def _setOpenApiTargets():
|
|||
logger.warning(warnMsg)
|
||||
else:
|
||||
warnMsg = "no usable targets derived from the OpenAPI/Swagger specification"
|
||||
if not conf.openApiBase:
|
||||
warnMsg += " (if it uses relative 'servers', provide a base with '--openapi-base' or fetch it by URL)"
|
||||
logger.warning(warnMsg)
|
||||
|
||||
def _findPageForms():
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@ optDict = {
|
|||
"googleDork": "string",
|
||||
"configFile": "string",
|
||||
"openApiFile": "string",
|
||||
"openApiBase": "string",
|
||||
},
|
||||
|
||||
"Request": {
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ from lib.core.enums import OS
|
|||
from thirdparty import six
|
||||
|
||||
# sqlmap version (<major>.<minor>.<month>.<monthly commit>)
|
||||
VERSION = "1.10.7.17"
|
||||
VERSION = "1.10.7.18"
|
||||
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)
|
||||
|
|
|
|||
|
|
@ -145,7 +145,10 @@ def cmdLineParser(argv=None):
|
|||
help="Load options from a configuration INI file")
|
||||
|
||||
target.add_argument("--openapi", dest="openApiFile",
|
||||
help="Derive targets from an OpenAPI/Swagger specification (file or URL)")
|
||||
help="Derive targets from OpenAPI/Swagger (file/URL)")
|
||||
|
||||
target.add_argument("--openapi-base", dest="openApiBase",
|
||||
help="Base URL for a host-less OpenAPI/Swagger spec")
|
||||
|
||||
# Request options
|
||||
request = parser.add_argument_group("Request", "These options can be used to specify how to connect to the target URL")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue