From 18d78a34cc67690f09d79b2eb46c735bf7ff6339 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Mon, 6 Nov 2017 13:53:35 +0100 Subject: [PATCH] Removing unused methods --- lib/core/agent.py | 10 ---------- lib/core/common.py | 15 --------------- lib/core/settings.py | 2 +- lib/core/threads.py | 3 --- txt/checksum.md5 | 10 +++++----- 5 files changed, 6 insertions(+), 34 deletions(-) diff --git a/lib/core/agent.py b/lib/core/agent.py index b89da862b..b115c1d08 100644 --- a/lib/core/agent.py +++ b/lib/core/agent.py @@ -207,16 +207,6 @@ class Agent(object): return retVal - def fullPayload(self, query): - if conf.direct: - return self.payloadDirect(query) - - query = self.prefixQuery(query) - query = self.suffixQuery(query) - payload = self.payload(newValue=query) - - return payload - def prefixQuery(self, expression, prefix=None, where=None, clause=None): """ This method defines how the input expression has to be escaped diff --git a/lib/core/common.py b/lib/core/common.py index 2aeddff03..027d9a943 100644 --- a/lib/core/common.py +++ b/lib/core/common.py @@ -3428,21 +3428,6 @@ def listToStrValue(value): return retVal -def getExceptionFrameLocals(): - """ - Returns dictionary with local variable content from frame where exception has been raised - """ - - retVal = {} - - if sys.exc_info(): - trace = sys.exc_info()[2] - while trace.tb_next: - trace = trace.tb_next - retVal = trace.tb_frame.f_locals - - return retVal - def intersect(valueA, valueB, lowerCase=False): """ Returns intersection of the array-ized values diff --git a/lib/core/settings.py b/lib/core/settings.py index 7dcf20aab..724e20358 100644 --- a/lib/core/settings.py +++ b/lib/core/settings.py @@ -19,7 +19,7 @@ from lib.core.enums import DBMS_DIRECTORY_NAME from lib.core.enums import OS # sqlmap version (...) -VERSION = "1.1.11.4" +VERSION = "1.1.11.5" 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) diff --git a/lib/core/threads.py b/lib/core/threads.py index 910eb47f8..89b1098bf 100644 --- a/lib/core/threads.py +++ b/lib/core/threads.py @@ -64,9 +64,6 @@ class _ThreadData(threading.local): ThreadData = _ThreadData() -def getCurrentThreadUID(): - return hash(threading.currentThread()) - def readInput(message, default=None, checkBatch=True, boolean=False): # It will be overwritten by original from lib.core.common pass diff --git a/txt/checksum.md5 b/txt/checksum.md5 index 5ed3c43dd..fd3d736db 100644 --- a/txt/checksum.md5 +++ b/txt/checksum.md5 @@ -25,9 +25,9 @@ f96467fc5cd1d87f52dd7966c8ae6e79 extra/shutils/regressiontest.py 91c9ef44927b270ea53b6739ff5b2e76 lib/controller/controller.py d2cdb9e832e18a81e936ca3348144b16 lib/controller/handler.py 5fb9aaf874daa47ea2b672a22740e56b lib/controller/__init__.py -3672210ed0043fe094df8615e4c5c0c0 lib/core/agent.py +c1ba81136151b327c71fd01376376451 lib/core/agent.py d55b4b58019d6dbfddd40ec919f9f172 lib/core/bigarray.py -3c6534b1ccaa3987565e6c3f683acef5 lib/core/common.py +abcdd166b8b7c7d84bfa3d70a1778f06 lib/core/common.py 54326d3a690f8b26fe5a5da1a589b369 lib/core/convert.py 90b1b08368ac8a859300e6fa6a8c796e lib/core/data.py 1c14bdbf47b8dba31f73da9ad731a54a lib/core/datatype.py @@ -46,12 +46,12 @@ ec6a778b0e74749b916caead78ba88b7 lib/core/option.py 760d9df2a27ded29109b390ab202e72d lib/core/replication.py a2466b62e67f8b31736bac4dac590e51 lib/core/revision.py 02d4762140a72fd44668d3dab5eabda9 lib/core/session.py -5a6219d2ab49c9c702002f2d6c77c808 lib/core/settings.py +5cfc263d2081144f63918be068e126e3 lib/core/settings.py 35bffbad762eb9e03db9e93b1c991103 lib/core/shell.py a59ec28371ae067a6fdd8f810edbee3d lib/core/subprocessng.py 7c9f2af3c0a8dd89223cfe07b0a0b826 lib/core/target.py df8f6475a53d83400c1a3967c0a21bd7 lib/core/testing.py -20ae9917fa959ea423d8c28c297b37fe lib/core/threads.py +632538fe50f6b3179e1a5a85e8b79741 lib/core/threads.py a119989ca03f8c8fbdf7d3035084eb31 lib/core/unescaper.py e7fb8c09fe7520c32895b859c4edf77a lib/core/update.py c976dd450b663cb4455cd9efbbcf625b lib/core/wordlist.py @@ -432,7 +432,7 @@ b03fdbf8f427ab614303a03416970927 waf/secureiis.py 2dee94358969c6b8dab8acb2e9560417 waf/sonicwall.py b384581ce833d147690c7c77c9509bdc waf/sophos.py e9127a67621440fba41e1cd176890851 waf/stingray.py -6c87858fc902d272d5effc9ebb944deb waf/sucuri.py +b9ede1695617c883e4230e6018753ba4 waf/sucuri.py 313245e511fbe1ee6fb5fd344be88240 waf/tencent.py 64c0e9c4c32adfd3c230705a7f17a63a waf/teros.py 9df516cb9793ba7f906dc0597fdd73a0 waf/trafficshield.py