sqlmapproject/sqlmap
1
1
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2024-11-22 09:36:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

minor update

Browse Source
This commit is contained in:
Miroslav Stampar 2011-10-09 21:21:41 +00:00
parent a31a0aa8d4
commit 323aa7bf2f
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/THANKS
View File

@ -639,6 +639,9 @@ ragos <ragos@joker.ms>
shiftzwei <shiftzwei@gmail.com> shiftzwei <shiftzwei@gmail.com>
for reporting a couple of bugs for reporting a couple of bugs
smith <esmyl911@gmail.com>
for reporting a minor bug
Stuffe <stuffe.dk@gmail.com> Stuffe <stuffe.dk@gmail.com>
for reporting a minor bug and a feature request for reporting a minor bug and a feature request

5
lib/core/option.py
View File

@ -104,6 +104,7 @@ from lib.core.settings import LOCALHOST
from lib.core.settings import MAX_NUMBER_OF_THREADS from lib.core.settings import MAX_NUMBER_OF_THREADS
from lib.core.settings import PARAMETER_SPLITTING_REGEX from lib.core.settings import PARAMETER_SPLITTING_REGEX
from lib.core.settings import TIME_DELAY_CANDIDATES from lib.core.settings import TIME_DELAY_CANDIDATES
from lib.core.settings import UNION_CHAR_REGEX
from lib.core.settings import UNKNOWN_DBMS_VERSION from lib.core.settings import UNKNOWN_DBMS_VERSION
from lib.core.settings import WEBSCARAB_SPLITTER from lib.core.settings import WEBSCARAB_SPLITTER
from lib.core.update import update from lib.core.update import update
@ -1811,6 +1812,10 @@ def __basicOptionValidation():
errMsg = "value for --time-sec option must be an integer greater than 0" errMsg = "value for --time-sec option must be an integer greater than 0"
raise sqlmapSyntaxException, errMsg raise sqlmapSyntaxException, errMsg
if conf.uChar and not re.match(UNION_CHAR_REGEX, conf.uChar):
errMsg = "value for --union-char option must be an alpha-numeric value (e.g. 1)"
raise sqlmapSyntaxException, errMsg
if isinstance(conf.uCols, basestring): if isinstance(conf.uCols, basestring):
if not conf.uCols.isdigit() and ("-" not in conf.uCols or len(conf.uCols.split("-")) != 2): if not conf.uCols.isdigit() and ("-" not in conf.uCols or len(conf.uCols.split("-")) != 2):
errMsg = "value for --union-cols must be a range with hyphon " errMsg = "value for --union-cols must be a range with hyphon "

3
lib/core/settings.py
View File

@ -397,3 +397,6 @@ MAX_TIME_REVALIDATION_STEPS = 5
# Characters that can be used to split parameter values in provided command line (e.g. in --tamper) # Characters that can be used to split parameter values in provided command line (e.g. in --tamper)
PARAMETER_SPLITTING_REGEX = r'[,|;]' PARAMETER_SPLITTING_REGEX = r'[,|;]'
# Regular expression describing possible union char value (e.g. used in --union-char)
UNION_CHAR_REGEX = r'\A\w+\Z'