sqlmapproject/sqlmap
1
1
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2025-02-03 05:04:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

minor refactoring for regarding --forms

Browse Source
This commit is contained in:
Miroslav Stampar 2011-10-29 08:32:24 +00:00
parent d7866ac78d
commit ddc4dfe5ff
2 changed files with 72 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
lib/core/common.py
View File

@ -43,6 +43,8 @@ from xml.etree import ElementTree as ET
from xml.dom import minidom
from xml.sax import parse
from extra.clientform.clientform import ParseResponse
from extra.clientform.clientform import ParseError
from extra.cloak.cloak import decloak
from extra.magic import magic
from extra.odict.odict import OrderedDict
@ -53,10 +55,12 @@ from lib.core.data import paths
from lib.core.data import queries
from lib.core.convert import htmlunescape
from lib.core.convert import safecharencode
from lib.core.convert import unicodeencode
from lib.core.convert import urldecode
from lib.core.convert import urlencode
from lib.core.enums import DBMS
from lib.core.enums import HTTPHEADER
from lib.core.enums import HTTPMETHOD
from lib.core.enums import OS
from lib.core.enums import PLACE
from lib.core.enums import PAYLOAD
@ -3013,7 +3017,7 @@ def randomizeParameterValue(value):
return retVal
def asciifyUrl(url, force_quote=False):
def asciifyUrl(url, forceQuote=False):
"""
Attempts to make a unicode url usuable with ``urllib/urllib2``.
@ -3046,7 +3050,7 @@ def asciifyUrl(url, force_quote=False):
# Triggers on non-ascii characters - another option would be:
# urllib.quote(s.replace('%', '')) != s.replace('%', '')
# which would trigger on all %-characters, e.g. "&".
if s.encode('ascii', 'replace') != s or force_quote:
if s.encode('ascii', 'replace') != s or forceQuote:
return urllib.quote(s.encode('utf8'), safe=safe)
return s
@ -3065,4 +3069,66 @@ def asciifyUrl(url, force_quote=False):
if parts.port:
netloc += ':' + str(parts.port)
return urlparse.urlunsplit([parts.scheme, netloc, path, query, parts.fragment])
return urlparse.urlunsplit([parts.scheme, netloc, path, query, parts.fragment])
def findPageForms(content, url, raise_=False, addToTargets=False):
class _(StringIO):
def __init__(self):
StringIO.__init__(self, unicodeencode(content, kb.pageEncoding) if isinstance(content, unicode) else content)
self._url = url
def geturl(self):
return self._url
if raise_ and not content:
errMsg = "can't parse forms as the page content appears to be blank"
raise sqlmapGenericException, errMsg
retVal = set()
response = _()
try:
forms = ParseResponse(response, backwards_compat=False)
except ParseError:
errMsg = "badly formed HTML at the target url. will try to filter it"
logger.error(errMsg)
response.seek(0)
filtered = _("".join(re.findall(r'<form.+?</form>', response.read(), re.I | re.S)), response.geturl())
try:
forms = ParseResponse(filtered, backwards_compat=False)
except ParseError:
errMsg = "no success"
if raise_:
raise sqlmapGenericException, errMsg
else:
logger.debug(errMsg)
if forms:
for form in forms:
for control in form.controls:
if hasattr(control, 'items'):
# if control has selectable items select first non-disabled
for item in control.items:
if not item.disabled:
item.selected = True
break
request = form.click()
url = urldecode(request.get_full_url(), kb.pageEncoding)
method = request.get_method()
data = urldecode(request.get_data(), kb.pageEncoding) if request.has_data() else None
if not data and method and method.upper() == HTTPMETHOD.POST:
debugMsg = "invalid POST form with blank data detected"
logger.debug(debugMsg)
continue
target = (url, method, data, conf.cookie)
retVal.add(target)
else:
errMsg = "there were no forms found at the given target url"
if raise_:
raise sqlmapGenericException, errMsg
else:
logger.debug(errMsg)
if addToTargets and retVal:
for target in retVal:
kb.targetUrls.add(target)
return retVal

57
lib/core/option.py
View File

@ -15,7 +15,6 @@ import logging
import os
import re
import socket
import StringIO
import sys
import threading
import urllib2
@ -24,8 +23,6 @@ import urlparse
import lib.core.common
import lib.core.threads
from extra.clientform.clientform import ParseResponse
from extra.clientform.clientform import ParseError
from extra.keepalive import keepalive
from extra.oset.pyoset import oset
from lib.controller.checks import checkConnection
@ -34,6 +31,7 @@ from lib.core.common import dataToStdout
from lib.core.common import getPublicTypeMembers
from lib.core.common import extractRegexResult
from lib.core.common import filterStringValue
from lib.core.common import findPageForms
from lib.core.common import getConsoleWidth
from lib.core.common import getFileItems
from lib.core.common import getFileType
@ -524,13 +522,6 @@ def __setBulkMultipleTargets():
f.close()
def __findPageForms():
class _(StringIO.StringIO):
def __init__(self, content, url):
StringIO.StringIO.__init__(self, content)
self._url = url
def geturl(self):
return self._url
if not conf.forms:
return
@ -540,50 +531,9 @@ def __findPageForms():
infoMsg = "searching for forms"
logger.info(infoMsg)
response, headers = Request.queryPage(response=True)
page, _ = Request.queryPage(content=True)
if response is None or isinstance(response, basestring):
errMsg = "can't do form parsing as no valid response "
errMsg += "object found. please check previous log messages "
errMsg += "for connection issues"
raise sqlmapGenericException, errMsg
response = _(response.read(), response.geturl())
try:
forms = ParseResponse(response, backwards_compat=False)
except ParseError:
errMsg = "badly formed HTML at the target url. will try to filter it"
logger.error(errMsg)
response.seek(0)
filtered = _("".join(re.findall(r'<form.+?</form>', response.read(), re.I | re.S)), response.geturl())
try:
forms = ParseResponse(filtered, backwards_compat=False)
except ParseError:
raise sqlmapGenericException, "no success"
if forms:
for form in forms:
for control in form.controls:
if hasattr(control, 'items'):
# if control has selectable items select first non-disabled
for item in control.items:
if not item.disabled:
item.selected = True
break
request = form.click()
url = urldecode(request.get_full_url(), kb.pageEncoding)
method = request.get_method()
data = urldecode(request.get_data(), kb.pageEncoding) if request.has_data() else None
if not data and method and method.upper() == HTTPMETHOD.POST:
debugMsg = "invalid POST form with blank data detected"
logger.debug(debugMsg)
continue
target = (url, method, data, conf.cookie)
kb.targetUrls.add(target)
kb.formNames.append(target)
else:
errMsg = "there were no forms found at the given target url"
raise sqlmapGenericException, errMsg
findPageForms(page, conf.url, True, True)
def __setMetasploit():
if not conf.osPwn and not conf.osSmb and not conf.osBof:
@ -1456,7 +1406,6 @@ def __setKnowledgeBaseAttributes(flushAll=True):
kb.explicitSettings = set()
kb.errorIsNone = True
kb.forcedDbms = None
kb.formNames = []
kb.headersCount = 0
kb.headersFp = {}
kb.heuristicTest = None