More work for Issue #66

lib/controller/controller.py

@@ -57,7 +57,7 @@ from lib.core.settings import REFERER_ALIASES
 from lib.core.settings import USER_AGENT_ALIASES
 from lib.core.target import initTargetEnv
 from lib.core.target import setupTargetEnv
-from extra.pagerank.pagerank import get_pagerank
+from thirdparty.pagerank.pagerank import get_pagerank
 
 def __selectInjection():
     """

lib/core/common.py

@@ -42,13 +42,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
 from extra.safe2bin.safe2bin import safecharencode
-from extra.termcolor.termcolor import colored
 from lib.core.bigarray import BigArray
 from lib.core.data import conf
 from lib.core.data import kb
@@ -130,6 +125,11 @@ from lib.core.settings import TEXT_TAG_REGEX
 from lib.core.settings import UNION_UNIQUE_FIFO_LENGTH
 from lib.core.settings import URI_QUESTION_MARKER
 from lib.core.threads import getCurrentThreadData
+from thirdparty.clientform.clientform import ParseResponse
+from thirdparty.clientform.clientform import ParseError
+from thirdparty.magic import magic
+from thirdparty.odict.odict import OrderedDict
+from thirdparty.termcolor.termcolor import colored
 
 class UnicodeRawConfigParser(RawConfigParser):
     """

lib/core/log.py

@@ -8,8 +8,8 @@ See the file 'doc/COPYING' for copying permission
 import logging
 import sys
 
-from extra.ansistrm.ansistrm import ColorizingStreamHandler
 from lib.core.enums import CUSTOM_LOGGING
+from thirdparty.ansistrm.ansistrm import ColorizingStreamHandler
 
 logging.addLevelName(CUSTOM_LOGGING.PAYLOAD, "PAYLOAD")
 logging.addLevelName(CUSTOM_LOGGING.TRAFFIC_OUT, "TRAFFIC OUT")

lib/core/option.py

@@ -20,10 +20,6 @@ import urlparse
 import lib.core.common
 import lib.core.threads
 
-from extra.colorama.initialise import init as coloramainit
-from extra.keepalive import keepalive
-from extra.oset.pyoset import oset
-from extra.socks import socks
 from lib.controller.checks import checkConnection
 from lib.core.common import Backend
 from lib.core.common import boldifyMessage
@@ -130,6 +126,10 @@ from lib.request.templates import getPageTemplate
 from lib.utils.crawler import Crawler
 from lib.utils.deps import checkDependencies
 from lib.utils.google import Google
+from thirdparty.colorama.initialise import init as coloramainit
+from thirdparty.keepalive import keepalive
+from thirdparty.oset.pyoset import oset
+from thirdparty.socks import socks
 from xml.etree.ElementTree import ElementTree
 
 authHandler = urllib2.BaseHandler()

lib/core/profiling.py

@@ -20,8 +20,8 @@ def profile(profileOutputFile=None, dotOutputFile=None, imageOutputFile=None):
     """
 
     try:
-        from extra.gprof2dot import gprof2dot
-        from extra.xdot import xdot
+        from thirdparty.gprof2dot import gprof2dot
+        from thirdparty.xdot import xdot
         import gobject
         import gtk
         import pydot

lib/core/xmldump.py

@@ -7,16 +7,15 @@ import xml
 
 import xml.sax.saxutils as saxutils
 
-from xml.dom.minidom import Document
-from xml.parsers.expat import ExpatError
-
-from extra.prettyprint import prettyprint
 from lib.core.common import getUnicode
 from lib.core.data import conf
 from lib.core.data import kb
 from lib.core.data import logger
 from lib.core.exception import sqlmapFilePathException
 from lib.core.settings import UNICODE_ENCODING
+from thirdparty.prettyprint import prettyprint
+from xml.dom.minidom import Document
+from xml.parsers.expat import ExpatError
 
 TECHNIC_ELEM_NAME = "Technic"
 TECHNICS_ELEM_NAME = "Technics"

lib/request/basic.py

@@ -12,7 +12,6 @@ import re
 import StringIO
 import zlib
 
-from extra.chardet import detect
 from lib.core.common import extractErrorMessage
 from lib.core.common import extractRegexResult
 from lib.core.common import getUnicode
@@ -30,6 +29,7 @@ from lib.core.settings import META_CHARSET_REGEX
 from lib.core.settings import PARSE_HEADERS_LIMIT
 from lib.parse.headers import headersParser
 from lib.parse.html import htmlParser
+from thirdparty.chardet import detect
 
 def forgeHeaders(items=None):
     """

lib/request/connect.py

@@ -14,9 +14,6 @@ import urlparse
 import traceback
 
 from extra.safe2bin.safe2bin import safecharencode
-from extra.socks.socks import ProxyError
-from extra.multipart import multipartpost
-
 from lib.core.agent import agent
 from lib.core.common import asciifyUrl
 from lib.core.common import calculateDeltaSeconds
@@ -67,6 +64,8 @@ from lib.request.direct import direct
 from lib.request.comparison import comparison
 from lib.request.methodrequest import MethodRequest
 from lib.utils.checkpayload import checkPayload
+from thirdparty.socks.socks import ProxyError
+from thirdparty.multipart import multipartpost
 
 
 class Connect:

lib/takeover/icmpsh.py

@@ -9,7 +9,6 @@ import os
 import time
 
 from extra.icmpsh.icmpsh_m import main as icmpshmaster
-
 from lib.core.common import getLocalIP
 from lib.core.common import getRemoteIP
 from lib.core.common import normalizePath

lib/utils/crawler.py

@@ -22,8 +22,8 @@ from lib.core.settings import CRAWL_EXCLUDE_EXTENSIONS
 from lib.core.threads import getCurrentThreadData
 from lib.core.threads import runThreads
 from lib.request.connect import Connect as Request
-from extra.beautifulsoup.beautifulsoup import BeautifulSoup
-from extra.oset.pyoset import oset
+from thirdparty.beautifulsoup.beautifulsoup import BeautifulSoup
+from thirdparty.oset.pyoset import oset
 
 class Crawler:
     """

lib/utils/hash.py

@@ -8,7 +8,7 @@ See the file 'doc/COPYING' for copying permission
 try:
     from crypt import crypt
 except ImportError, _:
-    from extra.fcrypt.fcrypt import crypt
+    from thirdparty.fcrypt.fcrypt import crypt
 
 _multiprocessing = None
 try:
@@ -30,8 +30,6 @@ from hashlib import md5
 from hashlib import sha1
 from Queue import Queue
 
-from extra.pydes.pyDes import des
-from extra.pydes.pyDes import CBC
 from lib.core.common import Backend
 from lib.core.common import checkFile
 from lib.core.common import clearConsoleLine
@@ -66,6 +64,8 @@ from lib.core.settings import ML
 from lib.core.settings import UNICODE_ENCODING
 from lib.core.settings import ROTATING_CHARS
 from lib.core.wordlist import Wordlist
+from thirdparty.pydes.pyDes import des
+from thirdparty.pydes.pyDes import CBC
 
 def mysql_passwd(password, uppercase=True):
     """