From e39ac0f0928303645215614b978830d4d287d446 Mon Sep 17 00:00:00 2001 From: Bernardo Damele Date: Thu, 20 Dec 2012 12:52:26 +0000 Subject: [PATCH 1/3] added OR boolean-based test case --- xml/livetests.xml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/xml/livetests.xml b/xml/livetests.xml index 412126c76..4b8aa9bd6 100644 --- a/xml/livetests.xml +++ b/xml/livetests.xml @@ -756,6 +756,21 @@ + + + + + + + + + + + + + + + @@ -906,5 +921,4 @@ - From a56e384abb2ae6eb94aa345ff98ab340bddb49f4 Mon Sep 17 00:00:00 2001 From: Bernardo Damele Date: Thu, 20 Dec 2012 13:18:45 +0000 Subject: [PATCH 2/3] updated VM.. --- xml/livetests.xml | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/xml/livetests.xml b/xml/livetests.xml index 4b8aa9bd6..d69f9fce9 100644 --- a/xml/livetests.xml +++ b/xml/livetests.xml @@ -37,7 +37,7 @@ - + @@ -80,7 +80,7 @@ - + @@ -123,7 +123,7 @@ - + @@ -166,7 +166,7 @@ - + @@ -192,7 +192,7 @@ - + @@ -223,7 +223,7 @@ - + @@ -702,6 +702,7 @@ + @@ -767,7 +768,7 @@ - + @@ -803,7 +804,7 @@ - + @@ -861,7 +862,7 @@ - + @@ -876,7 +877,7 @@ - + @@ -892,7 +893,7 @@ - + @@ -904,19 +905,19 @@ - + + - - + From 5632279bf7c12cac741138cafc2fe922bf39c691 Mon Sep 17 00:00:00 2001 From: Bernardo Damele Date: Thu, 20 Dec 2012 13:21:07 +0000 Subject: [PATCH 3/3] removed deprecated feature (#287) --- lib/utils/xmlrpc.py | 109 -------------------------------------------- 1 file changed, 109 deletions(-) delete mode 100644 lib/utils/xmlrpc.py diff --git a/lib/utils/xmlrpc.py b/lib/utils/xmlrpc.py deleted file mode 100644 index 93d5c3813..000000000 --- a/lib/utils/xmlrpc.py +++ /dev/null @@ -1,109 +0,0 @@ -#!/usr/bin/env python - -""" -Copyright (c) 2006-2012 sqlmap developers (http://sqlmap.org/) -See the file 'doc/COPYING' for copying permission -""" - -import sys -import threading -import types -import xmlrpclib - -try: - from SimpleXMLRPCServer import SimpleXMLRPCServer - - from lib.controller.controller import start - from lib.core.datatype import AttribDict - from lib.core.data import cmdLineOptions - from lib.core.data import kb - from lib.core.data import logger - from lib.core.option import init - from lib.core.settings import UNICODE_ENCODING - from lib.core.settings import XMLRPC_SERVER_PORT -except ImportError: - XMLRPC_SERVER_PORT = 8776 - -class XMLRPCServer: - def __init__(self, port): - self.port = port - self.reset() - - self.server = SimpleXMLRPCServer(addr=("", self.port), logRequests=False, allow_none=True, encoding=UNICODE_ENCODING) - for _ in dir(self): - if _.startswith("serve"): - continue - if not _.startswith('_') and isinstance(getattr(self, _), types.MethodType): - self.server.register_function(getattr(self, _)) - logger.info("Registering RPC methods: %s" % str(self.server.system_listMethods()).strip("[]")) - self.server.register_introspection_functions() - logger.info("Running XML-RPC server at '0.0.0.0:%d'..." % self.port) - - def reset(self): - self.options = AttribDict(cmdLineOptions) - - def set_option(self, name, value): - self.options[name] = value - return value - - def get_option(self, name): - return self.options[name] - - def get_option_names(self): - return sorted(self.options.keys()) - - def is_busy(self): - return kb.get("busyFlag") - - def read_output(self): - sys.stdout.seek(0) - retval = sys.stdout.read() - sys.stdout.truncate(0) - - if not retval and not self.is_busy(): - retval = None - - return retval - - def run(self): - if not self.is_busy(): - init(self.options, True) - thread = threading.Thread(target=start) - thread.daemon = True - thread.start() - else: - raise Exception, "sqlmap busy" - - def serve(self): - self.server.serve_forever() - -if __name__ == "__main__": - try: - import readline - except ImportError: - pass - - try: - addr = "http://localhost:%d" % (int(sys.argv[1]) if len(sys.argv) > 1 else XMLRPC_SERVER_PORT) - print "[i] Starting debug XML-RPC client to '%s'..." % addr - - server = xmlrpclib.ServerProxy(addr) - print "[i] Available RPC methods: %s" % str(server.system.listMethods()).strip("[]") - print "[i] Server instance name: 'server'" - print "[i] Sample usage: 'server.system.listMethods()'" - except Exception, ex: - if ex: - print "[x] '%s'" % str(ex) - else: - while True: - try: - cmd = raw_input("> ") - try: - result = eval(cmd) - print result if result is not None else "" - except SyntaxError: - exec(cmd) - except KeyboardInterrupt: - exit(0) - except Exception, ex: - print "[x] '%s'" % str(ex)