disconnect.me turned into a DuckDuckGo proxy

stamparm · stamparm · commit 8c88a095fbeb · 2017-10-09T14:07:27.000+02:00
diff --git a/lib/core/settings.py b/lib/core/settings.py
@@ -19,7 +19,7 @@
 from lib.core.enums import OS
 
 # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.1.10.1"
+VERSION = "1.1.10.2"
 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)
@@ -100,9 +100,6 @@
 # Regular expression used for extracting results from DuckDuckGo search
 DUCKDUCKGO_REGEX = r'"u":"([^"]+)'
 
-# Regular expression used for extracting results from Disconnect Search
-DISCONNECT_SEARCH_REGEX = r'<p class="url wrapword">([^<]+)</p>'
-
 # Dummy user agent for search (if default one returns different results)
 DUMMY_SEARCH_USER_AGENT = "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:49.0) Gecko/20100101 Firefox/49.0"
 
diff --git a/lib/utils/search.py b/lib/utils/search.py
@@ -28,7 +28,6 @@
 from lib.core.exception import SqlmapUserQuitException
 from lib.core.settings import DUMMY_SEARCH_USER_AGENT
 from lib.core.settings import DUCKDUCKGO_REGEX
-from lib.core.settings import DISCONNECT_SEARCH_REGEX
 from lib.core.settings import GOOGLE_REGEX
 from lib.core.settings import HTTP_ACCEPT_ENCODING_HEADER_VALUE
 from lib.core.settings import UNICODE_ENCODING
@@ -109,21 +108,12 @@ def _search(dork):
     if not retVal:
         message = "no usable links found. What do you want to do?"
         message += "\n[1] (re)try with DuckDuckGo (default)"
-        message += "\n[2] (re)try with Disconnect Search"
-        message += "\n[3] quit"
+        message += "\n[2] quit"
         choice = readInput(message, default='1')
 
-        if choice == '3':
+        if choice == '2':
             raise SqlmapUserQuitException
-        elif choice == '2':
-            url = "https://search.disconnect.me/searchTerms/search?"
-            url += "start=nav&option=Web"
-            url += "&query=%s" % urlencode(dork, convall=True)
-            url += "&ses=Google&location_option=US"
-            url += "&nextDDG=%s" % urlencode("/search?q=%s&setmkt=en-US&setplang=en-us&setlang=en-us&first=%d&FORM=PORE" % (urlencode(dork, convall=True), (gpage - 1) * 10), convall=True)
-            url += "&sa=N&showIcons=false&filterIcons=none&js_enabled=1"
-            regex = DISCONNECT_SEARCH_REGEX
-        else:
+        elif choice == '1':
             url = "https://duckduckgo.com/d.js?"
             url += "q=%s&p=%d&s=100" % (urlencode(dork, convall=True), gpage)
             regex = DUCKDUCKGO_REGEX
diff --git a/txt/checksum.md5 b/txt/checksum.md5
@@ -46,7 +46,7 @@ e8e9fd4f224ead0caa1569312b5b2582  lib/core/optiondict.py
 d8e9250f3775119df07e9070eddccd16  lib/core/replication.py
 785f86e3f963fa3798f84286a4e83ff2  lib/core/revision.py
 40c80b28b3a5819b737a5a17d4565ae9  lib/core/session.py
-00551710c935268b4f54ea28e5220712  lib/core/settings.py
+6161dfdfa4899bc9fe4b0ca10af24382  lib/core/settings.py
 d91291997d2bd2f6028aaf371bf1d3b6  lib/core/shell.py
 2ad85c130cc5f2b3701ea85c2f6bbf20  lib/core/subprocessng.py
 effc153067a00bd43461bfc1cdec1122  lib/core/target.py
@@ -111,7 +111,7 @@ e76a08237ee6a4cd6855af79610ea8a5  lib/utils/htmlentities.py
 9d8c858417d356e49e1959ba253aede4  lib/utils/pivotdumptable.py
 8520a745c9b4db3814fe46f4c34c6fbc  lib/utils/progress.py
 2c3638d499f3c01c34187e531f77d004  lib/utils/purge.py
-4bd7dd4fc8f299f1566a26ed6c2cefb5  lib/utils/search.py
+7610a89573b32291a4bea66d4ee10a5c  lib/utils/search.py
 fe2be081f924abf08767ed89ab12b418  lib/utils/sqlalchemy.py
 caeea96ec9c9d489f615f282259b32ca  lib/utils/timeout.py
 6fa36b9742293756b226cddee11b7d52  lib/utils/versioncheck.py
