Commit graph

940 commits

Author SHA1 Message Date
Christopher K. Hoadley
2a8f83924d Remove some unneeded imports. Add minor comment. 2019-12-27 11:01:34 -06:00
Christopher K. Hoadley
2a1ab1c281 Add result module to hold results of site queries. The QueryResult() object contains an enumeration for the possible status about a given username on a site, and additional error information that might be handy. Rework all code to use this object instead of the "exists" key in the result dictionary that was used previously. 2019-12-27 10:17:10 -06:00
Christopher K. Hoadley
519ac34346 Extract all print statements from function that gets the response. Also, print out social network for error messages. 2019-12-26 14:00:44 -06:00
Christopher K. Hoadley
6114ca263d Remove Proxy List Support
While doing the restructuring, I am testing in more depth as I change the code. And, I am trying to grok how the proxy options work. Specifically, how the proxy list works. Or, does not work.

There is code in the main function that randomly selects proxies from a list, but it does not actually use the result. This was noticed in #292. It looks like the only place where the proxy list is used is when there is a proxy error during get_response()...in that case a new random proxy is chosen. But, there is no care taken to ensure that we do not get the same proxy that just errored out. It seems like problematic proxies should be blacklisted if there is that type of failure.

Moreover, there is a check earlier in the code that does not allow the proxy list and proxy command line option to be used simultaneously. So, I can see no way that the proxy list has any functionality: if you do define the proxy list, then there is no way to kick off the general request with a proxy.

I also noticed that the recursive get_response() call does not pass its return tuples back up the call chain. The existing code would never get any good from the switchover to an alternate proxy (even if the other problems mentioned above were resolved).

For now, I am removing the support.  This feature may be looked at after the restructuring is done.
2019-12-26 10:59:52 -06:00
Christopher K. Hoadley
9e8e1a5aa4 Merge remote-tracking branch 'origin/master' into restructure_take1
# Conflicts:
#	sherlock/sherlock.py
2019-12-24 17:17:43 -06:00
Christopher Kent Hoadley
3eb478e58f
Merge pull request #471 from sherlock-project/limit_request_workers
Limit Number Of Parallel Requests To 20 (Instead Of Number Of Sites)
2019-12-24 17:04:15 -06:00
Christopher K. Hoadley
5d16a720a5 Update site list and version. 2019-12-24 16:57:32 -06:00
Christopher K. Hoadley
e0d2102810 Limit Number Of Parallel Requests To 20 (Instead Of Number Of Sites)
Previous code was allocating room for as many workers as there was sites.  The problem is that as the number of sites has grown, there has not been enough memory to allocate all of those requests.  In reality, having all of these requests in parallel does not really speed the processing: on my computer, the time to do a query for all of the sites was 1 minute 10 seconds before the change, and was 1 minute 9 seconds after the change.

Limiting the number of workers to 10 did increase the query time to 1 minute 17s.  I am not sure if that is just inconsistencies in network traffic, but I will leave the limit at 20 for now.

Note that with the limit of 20, my query detected more sites than it did previously.  It appears that some of the requests were failing on my computer because of memory reasons (as opposed to actual detection on the site).
2019-12-24 16:56:10 -06:00
Christopher K. Hoadley
4b6d2c1166 Do not create session and request objects if we are going to end up creating new one for Tor requests. This just wastes time. 2019-12-24 16:25:37 -06:00
Siddharth Dushantha
e664273746
added d3RU, fixes #470 2019-12-24 10:12:25 +01:00
Christopher K. Hoadley
0a455339c2 Merge remote-tracking branch 'origin/master' into restructure_take1 2019-12-21 17:12:17 -06:00
Siddharth Dushantha
94141f1818
Merge pull request #469 from AL3INO/master
Fixed_LabPentestIt
2019-12-21 18:48:27 +01:00
AL3INO
de00894c1e
Updated data.json
Fixed username_claimed for labpentestit
2019-12-21 23:21:34 +11:00
Siddharth Dushantha
2723553069
added labpentestit 2019-12-20 20:59:29 +01:00
Siddharth Dushantha
8bc9ee39a3
added datingRU 2019-12-20 18:10:39 +01:00
Siddharth Dushantha
4a7662b08e
added hackster 2019-12-20 10:10:24 +01:00
Siddharth Dushantha
475ad6abd0
version bump 0.9.15 --> 0.9.16 2019-12-20 10:03:27 +01:00
Siddharth Dushantha
b4dafa1742
Merge pull request #463 from Scoder12/no-color
Add --no-color option
2019-12-20 10:00:31 +01:00
Scoder12
e8949666fb
Add --no-color option 2019-12-19 15:37:12 -08:00
Siddharth Dushantha
d6410268ee
updated license 2019-12-19 22:31:15 +01:00
Siddharth Dushantha
a739ebf0e7
changed copyright holder to Sherlock Project 2019-12-19 22:30:42 +01:00
Siddharth Dushantha
f63e17066d
added a few more sites 2019-12-18 21:38:55 +01:00
Siddharth Dushantha
c864318b6f
Removed install_packages.sh
It is not really useful because people who are using this script use Linux and all Linux distros come with Python and pip, so there is no need to have a script to install it. Also, it only works on Linux.
2019-12-18 21:22:55 +01:00
Siddharth Dushantha
d5c0e2a9c2
Merge pull request #449 from LameLemon/bodybuilding
Added BodyBuilding
2019-12-13 14:02:46 +01:00
Lame Lemon
bbedf13071 Added BodyBuilding 2019-12-13 12:27:10 +00:00
Siddharth Dushantha
bfa73e8165
Version bump 0.9.14 --> 0.9.15 2019-12-13 12:54:05 +01:00
Siddharth Dushantha
937f562456
Merge pull request #448 from boschhd/patch-1
Remove an extra space in data.json
2019-12-13 12:52:17 +01:00
Harald Bosch
f0d314771c
Remove an extra space in data.json
Fix #447
Remove an extra space in data.json which causes a KeyError
2019-12-13 11:33:37 +01:00
Siddharth Dushantha
d9c6a987a4
Merge pull request #444 from Czechball/master
added 7 new sites
2019-12-12 19:36:25 +01:00
Czechball
499392dc6a added GunsAndAmmo 2019-12-12 16:16:13 +01:00
Czechball
0c73df829b added akniga 2019-12-12 16:14:50 +01:00
Czechball
7827f0f978 added leasehackr 2019-12-12 16:13:13 +01:00
Czechball
bae5316e51 added HackTheBox 2019-12-12 16:12:10 +01:00
Czechball
7bbd7767a7 added TrashboxRU 2019-12-12 16:11:11 +01:00
Czechball
11bacb3382 added babyRU and babyblogRU 2019-12-12 16:08:43 +01:00
Siddharth Dushantha
a6f7884480
Merge pull request #442 from Czechball/master
added 3 new sites
2019-12-12 06:10:25 +01:00
Czechball
43c5605576 Merge https://github.com/sherlock-project/sherlock 2019-12-09 10:01:33 +01:00
Christopher K. Hoadley
6d28376ad0 Merge remote-tracking branch 'origin/master' 2019-12-08 07:30:50 -06:00
Christopher K. Hoadley
69b818bb3b Update version and help text. 2019-12-08 07:30:02 -06:00
Christopher K. Hoadley
fdc45b9f2c Update user URL for CashMe. Looks like the site changed their layout. 2019-12-08 07:29:15 -06:00
Siddharth Dushantha
d6694fc954
added spletnik, fixes #434 2019-12-08 12:34:18 +01:00
Christopher K. Hoadley
b92b931504 Merge remote-tracking branch 'origin/master' into restructure_take1
# Conflicts:
#	sherlock/sherlock.py
2019-12-07 17:58:39 -06:00
Christopher K. Hoadley
15157fd7da Update version and help text. 2019-12-07 17:43:09 -06:00
Christopher K. Hoadley
4f1e2d0545 Update site list. 2019-12-07 17:42:45 -06:00
Christopher K. Hoadley
dc9813fa8d Fix Avizo name. 2019-12-07 17:40:46 -06:00
Christopher K. Hoadley
7e2eb5bab3 Clean up code that only reads the headers if we are doing HTTP Status detection. Remove special check for GitHub: everything works fine without it. 2019-12-07 17:29:07 -06:00
Christopher K. Hoadley
208db5a7c1 Remove unneeded assignment of results before main Sherlock call. 2019-12-07 17:27:11 -06:00
Christopher K. Hoadley
a228a00753 Clarify meaning of "Total Websites" count. It is really "Total Websites Username Detected On". 2019-12-07 17:25:18 -06:00
Christopher K. Hoadley
2c2c6dd42f Get rid of global variable amount. This is no longer used. 2019-12-07 17:24:48 -06:00
Christopher K. Hoadley
b1efe75eee Remove timeout global and make it available on the command line. Change default to no timeout. 2019-12-07 17:24:09 -06:00