Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit a6448e8

Browse files
stamparmstamparm
committed
Update for an Issue #287 
1 parent ef33729 commit a6448e8

5 files changed

Lines changed: 54 additions & 15 deletions

File tree

‎_sqlmap.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"""
77

88
import bdb
9+
import logging
910
import os
1011
import sys
1112
import time
@@ -33,6 +34,7 @@
3334
from lib.core.option import init
3435
from lib.core.profiling import profile
3536
from lib.core.settings import LEGAL_DISCLAIMER
37+
from lib.core.settings import XMLRPC_SERVER_PORT
3638
from lib.core.testing import smokeTest
3739
from lib.core.testing import liveTest
3840
from lib.parse.cmdline import cmdLineParser
@@ -63,7 +65,8 @@ def main():
6365
cmdLineOptions.update(cmdLineParser().__dict__)
6466

6567
if cmdLineOptions.xmlRpc:
66-
server = XMLRPCServer()
68+
logger.setLevel(logging.INFO)
69+
server = XMLRPCServer(cmdLineOptions.xmlRpcPort or XMLRPC_SERVER_PORT)
6770
server.serve()
6871
else:
6972
init(cmdLineOptions)

‎lib/core/common.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -421,11 +421,11 @@ def getIdentifiedDbms():
421421
dbms = Backend.getForcedDbms()
422422
elif Backend.getDbms() is not None:
423423
dbms = kb.dbms
424-
elif conf.get('dbms'):
424+
elif conf.get("dbms"):
425425
dbms = conf.dbms
426426
elif Backend.getErrorParsedDBMSes():
427427
dbms = unArrayizeValue(Backend.getErrorParsedDBMSes())
428-
elif kb.injection.dbms:
428+
elif kb.get("injection") and kb.injection.dbms:
429429
dbms = unArrayizeValue(kb.injection.dbms)
430430

431431
return aliasToDbmsEnum(dbms)

‎lib/core/settings.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@
483483
LIMITED_ROWS_TEST_NUMBER = 15
484484

485485
# Default TCP port used for XML-RPC server instance
486-
XML_RPC_SERVER_PORT = 8776
486+
XMLRPC_SERVER_PORT = 8776
487487

488488
# Regular expression for SOAP-like POST data
489489
SOAP_RECOGNITION_REGEX = r"(?s)\A(<\?xml[^>]+>)?\s*<([^> ]+)( [^>]+)?>.+</\2.*>\s*\Z"

‎lib/parse/cmdline.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -685,6 +685,9 @@ def cmdLineParser():
685685
parser.add_option("--xmlrpc", dest="xmlRpc", action="store_true",
686686
help=SUPPRESS_HELP)
687687

688+
parser.add_option("--xmlrpc-port", dest="xmlRpcPort", type="int",
689+
help=SUPPRESS_HELP)
690+
688691
parser.add_option_group(target)
689692
parser.add_option_group(request)
690693
parser.add_option_group(optimization)

‎lib/utils/xmlrpc.py‎

Lines changed: 44 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,25 @@
55
See the file 'doc/COPYING' for copying permission
66
"""
77

8-
from SimpleXMLRPCServer import SimpleXMLRPCServer
8+
import sys
9+
import xmlrpclib
910

10-
from lib.controller.controller import start
11-
from lib.core.datatype import AttribDict
12-
from lib.core.data import cmdLineOptions
13-
from lib.core.data import logger
14-
from lib.core.option import init
15-
from lib.core.settings import XML_RPC_SERVER_PORT
16-
from lib.core.settings import UNICODE_ENCODING
11+
try:
12+
from SimpleXMLRPCServer import SimpleXMLRPCServer
13+
14+
from lib.controller.controller import start
15+
from lib.core.datatype import AttribDict
16+
from lib.core.data import cmdLineOptions
17+
from lib.core.data import logger
18+
from lib.core.option import init
19+
from lib.core.settings import UNICODE_ENCODING
20+
from lib.core.settings import XMLRPC_SERVER_PORT
21+
except ImportError:
22+
pass
1723

1824
class XMLRPCServer:
19-
def __init__(self):
25+
def __init__(self, port):
26+
self.port = port
2027
self.reset()
2128

2229
def reset(self):
@@ -36,11 +43,37 @@ def run(self):
3643
return start()
3744

3845
def serve(self):
39-
server = SimpleXMLRPCServer(addr=("", XML_RPC_SERVER_PORT), logRequests=False, allow_none=True, encoding=UNICODE_ENCODING)
40-
server.register_introspection_functions()
46+
server = SimpleXMLRPCServer(addr=("", self.port), logRequests=False, allow_none=True, encoding=UNICODE_ENCODING)
4147
server.register_function(self.reset)
4248
server.register_function(self.set_option)
4349
server.register_function(self.get_option)
4450
server.register_function(self.get_option_names)
4551
server.register_function(self.run)
52+
logger.info("Registering RPC methods: %s" % str(server.system_listMethods()).strip("[]"))
53+
server.register_introspection_functions()
54+
logger.info("Running XML-RPC server at '0.0.0.0:%d'..." % self.port)
4655
server.serve_forever()
56+
57+
if __name__ == "__main__":
58+
try:
59+
import readline
60+
except ImportError:
61+
pass
62+
63+
server = xmlrpclib.ServerProxy("http://localhost:%d" % (int(sys.argv[1]) if len(sys.argv) > 1 else 8776))
64+
65+
print "[o] Server instance: 'server'"
66+
print "[i] Available RPC methods: %s" % str(server.system.listMethods()).strip("[]")
67+
print "[i] Sample usage: 'server.system.listMethods()'"
68+
69+
while True:
70+
try:
71+
_ = raw_input("> ")
72+
if not _.startswith("print"):
73+
print eval(_) or ""
74+
else:
75+
exec(_)
76+
except KeyboardInterrupt:
77+
exit(0)
78+
except Exception, ex:
79+
print "[x] '%s'" % str(ex)

0 commit comments

Comments
 (0)