From 4663fd6a0aa75136e18c42e58af4763e950cbb1f Mon Sep 17 00:00:00 2001 From: glenacota Date: Sun, 25 Oct 2020 01:48:26 +0200 Subject: [PATCH 01/26] Fixed false positive for freelance.habr --- sherlock/resources/data.json | 1 + 1 file changed, 1 insertion(+) diff --git a/sherlock/resources/data.json b/sherlock/resources/data.json index 4de68efd..3d5f8a06 100644 --- a/sherlock/resources/data.json +++ b/sherlock/resources/data.json @@ -560,6 +560,7 @@ "username_unclaimed": "noonewouldeverusethis" }, "Freelance.habr": { + "regexCheck": "^((?!\\.).)*$", "errorMsg": "
", "errorType": "message", "url": "https://freelance.habr.com/freelancers/{}", From 7305cc59a3512cf8119dc1fc9d75ecb70d797474 Mon Sep 17 00:00:00 2001 From: miki164 <32245772+miki164@users.noreply.github.com> Date: Mon, 26 Oct 2020 21:01:40 +0100 Subject: [PATCH 02/26] Update data.json --- sherlock/resources/data.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sherlock/resources/data.json b/sherlock/resources/data.json index 3d5f8a06..a0893a09 100644 --- a/sherlock/resources/data.json +++ b/sherlock/resources/data.json @@ -780,6 +780,13 @@ "username_claimed": "blue", "username_unclaimed": "noonewouldeverusethis7" }, + "jbzd.com.p": { + "errorType": "status_code", + "url": "https://jbzd.com.pl/uzytkownik/{}", + "urlMain": "https://jbzd.com.pl/", + "username_claimed": "blue", + "username_unclaimed": "noonewouldeverusethis7" + }, "Jimdo": { "errorType": "status_code", "noPeriod": "True", @@ -2216,4 +2223,4 @@ "username_claimed": "blue", "username_unclaimed": "noonewouldeverusethis7" } -} \ No newline at end of file +} From d85ea01cc45eec97f1da2a700d9e0545da599642 Mon Sep 17 00:00:00 2001 From: miki164 <32245772+miki164@users.noreply.github.com> Date: Wed, 28 Oct 2020 20:38:13 +0100 Subject: [PATCH 03/26] Fix typo --- sherlock/resources/data.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sherlock/resources/data.json b/sherlock/resources/data.json index a0893a09..9b05d787 100644 --- a/sherlock/resources/data.json +++ b/sherlock/resources/data.json @@ -780,7 +780,7 @@ "username_claimed": "blue", "username_unclaimed": "noonewouldeverusethis7" }, - "jbzd.com.p": { + "jbzd.com.pl": { "errorType": "status_code", "url": "https://jbzd.com.pl/uzytkownik/{}", "urlMain": "https://jbzd.com.pl/", From 717152ebd29aaffa784cb264090c4cd085772019 Mon Sep 17 00:00:00 2001 From: Marcos Felipe Date: Fri, 30 Oct 2020 09:22:24 -0300 Subject: [PATCH 04/26] Adds instagram check --- removed_sites.json | 26 +++++++++----------------- removed_sites.md | 13 ------------- sherlock/resources/data.json | 20 ++++++++++++++++++++ 3 files changed, 29 insertions(+), 30 deletions(-) diff --git a/removed_sites.json b/removed_sites.json index 6f00a8cc..d5b4d4cc 100644 --- a/removed_sites.json +++ b/removed_sites.json @@ -372,14 +372,14 @@ "username_claimed": "deepigoyal", "username_unclaimed": "noonewouldeverusethis7" }, - "mixer.com": { - "errorType": "status_code", - "rank": 1544, - "url": "https://mixer.com/{}", - "urlMain": "https://mixer.com/", - "urlProbe": "https://mixer.com/api/v1/channels/{}", - "username_claimed": "blue", - "username_unclaimed": "noonewouldeverusethis7" + "mixer.com": { + "errorType": "status_code", + "rank": 1544, + "url": "https://mixer.com/{}", + "urlMain": "https://mixer.com/", + "urlProbe": "https://mixer.com/api/v1/channels/{}", + "username_claimed": "blue", + "username_unclaimed": "noonewouldeverusethis7" }, "KanoWorld": { "errorType": "status_code", @@ -521,14 +521,6 @@ "urlMain": "http://www.pokerstrategy.net", "username_claimed": "blue", "username_unclaimed": "noonewouldeverusethis7" - }, - "Instagram": { - "errorType": "status_code", - "request_head_only": false, - "url": "https://www.instagram.com/{}", - "urlMain": "https://www.instagram.com/", - "username_claimed": "blue", - "username_unclaimed": "noonewouldeverusethis7" - }, + } } diff --git a/removed_sites.md b/removed_sites.md index 19c4bf85..6401cadf 100644 --- a/removed_sites.md +++ b/removed_sites.md @@ -1036,16 +1036,3 @@ As of 2020-10-21, PokerStrategy returns false positives. This was reported in #7 "username_unclaimed": "noonewouldeverusethis7" }, ``` - -## Instagram -As of 2020-10-21, Instagram return false positives. This was reported in #764 -``` - "Instagram": { - "errorType": "status_code", - "request_head_only": false, - "url": "https://www.instagram.com/{}", - "urlMain": "https://www.instagram.com/", - "username_claimed": "blue", - "username_unclaimed": "noonewouldeverusethis7" - }, -``` diff --git a/sherlock/resources/data.json b/sherlock/resources/data.json index 9b05d787..3a5f7d9b 100644 --- a/sherlock/resources/data.json +++ b/sherlock/resources/data.json @@ -758,6 +758,26 @@ "username_claimed": "adam", "username_unclaimed": "noonewouldeverusethis" }, + "Instagram": { + "errorType": "message", + "errorMsg": "href=\"/static/bundles/metro/HttpErrorPage.js/", + "url": "https://www.instagram.com/{}", + "urlMain": "https://www.instagram.com/", + "username_claimed": "blue", + "username_unclaimed": "noonewouldeverusethis7", + "headers": { + "authority": "www.instagram.com", + "pragma": "no-cache", + "cache-control": "no-cache", + "upgrade-insecure-requests": "1", + "accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9", + "sec-fetch-site": "same-origin", + "sec-fetch-mode": "navigate", + "sec-fetch-user": "?1", + "sec-fetch-dest": "document", + "accept-language": "en-US,en;q=0.9,pt-BR;q=0.8,pt;q=0.7" + } + }, "Instructables": { "errorMsg": "404: We're sorry, things break sometimes", "errorType": "message", From 144a870cfb8d7435b484b7835295692fdab31100 Mon Sep 17 00:00:00 2001 From: Marcos Felipe Date: Fri, 30 Oct 2020 15:08:47 -0300 Subject: [PATCH 05/26] Remove instagram headers --- sherlock/resources/data.json | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/sherlock/resources/data.json b/sherlock/resources/data.json index 3a5f7d9b..8cdb685e 100644 --- a/sherlock/resources/data.json +++ b/sherlock/resources/data.json @@ -764,19 +764,7 @@ "url": "https://www.instagram.com/{}", "urlMain": "https://www.instagram.com/", "username_claimed": "blue", - "username_unclaimed": "noonewouldeverusethis7", - "headers": { - "authority": "www.instagram.com", - "pragma": "no-cache", - "cache-control": "no-cache", - "upgrade-insecure-requests": "1", - "accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9", - "sec-fetch-site": "same-origin", - "sec-fetch-mode": "navigate", - "sec-fetch-user": "?1", - "sec-fetch-dest": "document", - "accept-language": "en-US,en;q=0.9,pt-BR;q=0.8,pt;q=0.7" - } + "username_unclaimed": "noonewouldeverusethis7" }, "Instructables": { "errorMsg": "404: We're sorry, things break sometimes", From 0c407188d7596f678a2d0bad5955e49d789f07fc Mon Sep 17 00:00:00 2001 From: Lachlan Kemp Date: Sun, 1 Nov 2020 20:54:43 +1030 Subject: [PATCH 06/26] Correct grammar mistake. --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d933b6c1..38eb879f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -27,7 +27,7 @@ file contains sites that were included at one time in Sherlock, but had to be re one reason or another. In regards to adult sites (e.g. PornHub), we have agreed to not include them in Sherlock. -However, we do understand that some users desires this support. The data.json file is easy to add to, +However, we do understand that some users desire this support. The data.json file is easy to add to, so users will be able to maintain their own forks to have this support. This is not ideal. Maybe there could be another repo with an adult data.json? That would avoid forks getting out of date. From a0dd96f8111b177b2f2b4ee57f6d55117cfdde84 Mon Sep 17 00:00:00 2001 From: Lachlan Kemp Date: Sun, 1 Nov 2020 20:56:15 +1030 Subject: [PATCH 07/26] Updated grammar. --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 38eb879f..8c8f712d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -26,7 +26,7 @@ the site may be removed from the list. The file contains sites that were included at one time in Sherlock, but had to be removed for one reason or another. -In regards to adult sites (e.g. PornHub), we have agreed to not include them in Sherlock. +In regards to adult sites (e.g. Pornhub), we have agreed to not include them in Sherlock. However, we do understand that some users desire this support. The data.json file is easy to add to, so users will be able to maintain their own forks to have this support. This is not ideal. Maybe there could be another repo with an adult data.json? That would avoid forks getting out of date. From 3d43088633d792f8adc644582400b0d5d77dc7f9 Mon Sep 17 00:00:00 2001 From: Siddharth Dushantha Date: Sun, 1 Nov 2020 16:58:35 +0100 Subject: [PATCH 08/26] added issue templates --- .github/ISSUE_TEMPLATE/bug-report.md | 38 +++++++++++++++++++ .github/ISSUE_TEMPLATE/feature-request.md | 32 ++++++++++++++++ .github/ISSUE_TEMPLATE/question.md | 33 ++++++++++++++++ .../reporting-false-negative.md | 34 +++++++++++++++++ .../reporting-false-positive.md | 34 +++++++++++++++++ .../ISSUE_TEMPLATE/site-support-request.md | 37 ++++++++++++++++++ 6 files changed, 208 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/bug-report.md create mode 100644 .github/ISSUE_TEMPLATE/feature-request.md create mode 100644 .github/ISSUE_TEMPLATE/question.md create mode 100644 .github/ISSUE_TEMPLATE/reporting-false-negative.md create mode 100644 .github/ISSUE_TEMPLATE/reporting-false-positive.md create mode 100644 .github/ISSUE_TEMPLATE/site-support-request.md diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md new file mode 100644 index 00000000..f7f9b822 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug-report.md @@ -0,0 +1,38 @@ +--- +name: Bug report +about: Report a bug in Sherlock's functionality +title: '' +labels: bug +assignees: '' + +--- + + + + +## Checklist + + +- [ ] I'm reporting a bug in Sherlock's functionality +- [ ] The bug I'm reporting is not a false positive or a false negative +- [ ] I've verified that I'm running the latest version of Sherlock +- [ ] I've checked for similar bug reports including closed ones +- [ ] I've checked for pull requests that attempt to fix this bug + +## Description + + +WRITE DESCRIPTION HERE diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md new file mode 100644 index 00000000..67ec7ecf --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature-request.md @@ -0,0 +1,32 @@ +--- +name: Feature request +about: Request a new functionality for Sherlock +title: '' +labels: enhancement +assignees: '' + +--- + + + +## Checklist + +- [ ] I'm reporting a feature request +- [ ] I've checked for similar feature requests including closed ones + +## Description + + +WRITE DESCRIPTION HERE diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md new file mode 100644 index 00000000..b8a0db3b --- /dev/null +++ b/.github/ISSUE_TEMPLATE/question.md @@ -0,0 +1,33 @@ +--- +name: Question +about: Ask us a question +title: '' +labels: question +assignees: '' + +--- + + + +## Checklist + +- [ ] I'm asking a question regarding Sherlock +- [ ] My question is not a tech support question. + +**We are not your tech support**. +If you have questions related to `pip`, `git`, or something that is not related to Sherlock, please ask them on [StackOverflow](https://stackoverflow.com/) or [r/learnpython](https://www.reddit.com/r/learnpython/) + + +## Question + +ASK YOUR QUESTION HERE diff --git a/.github/ISSUE_TEMPLATE/reporting-false-negative.md b/.github/ISSUE_TEMPLATE/reporting-false-negative.md new file mode 100644 index 00000000..82ba13de --- /dev/null +++ b/.github/ISSUE_TEMPLATE/reporting-false-negative.md @@ -0,0 +1,34 @@ +--- +name: Reporting false negative +about: Reporting a site that is returning false positives +title: '' +labels: false negative +assignees: '' + +--- + + + +## Checklist + +- [ ] I'm reporting a website that is returning **false negative** results +- [ ] I've checked for similar site support requests including closed ones +- [ ] I've checked for pull requests attempting to fix this false negative +- [ ] I'm only reporting **one** site (create a seperate issue for each site) + +## Description + + +WRITE DESCRIPTION HERE diff --git a/.github/ISSUE_TEMPLATE/reporting-false-positive.md b/.github/ISSUE_TEMPLATE/reporting-false-positive.md new file mode 100644 index 00000000..045f66f4 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/reporting-false-positive.md @@ -0,0 +1,34 @@ +--- +name: Reporting false positive +about: Reporting a site that is returning false positives +title: '' +labels: false positive +assignees: '' + +--- + + + +## Checklist + +- [ ] I'm reporting a website that is returning **false positive** results +- [ ] I've checked for similar site support requests including closed ones +- [ ] I've checked for pull requests attempting to fix this false positive +- [ ] I'm only reporting **one** site (create a seperate issue for each site) + +## Description + + +WRITE DESCRIPTION HERE diff --git a/.github/ISSUE_TEMPLATE/site-support-request.md b/.github/ISSUE_TEMPLATE/site-support-request.md new file mode 100644 index 00000000..4b3305ad --- /dev/null +++ b/.github/ISSUE_TEMPLATE/site-support-request.md @@ -0,0 +1,37 @@ +--- +name: Site support request +about: Request support for a new site +title: '' +labels: site support request +assignees: '' + +--- + + + +## Checklist + + +- [ ] I'm requesting support for a new site +- [ ] I've checked for similar site support requests including closed ones +- [ ] I've checked that the site I am requesting has not been removed in the past and is not documented in [removed_sites.md](https://github.com/sherlock-project/sherlock/blob/master/removed_sites.md) +- [ ] The site I am requesting support for is not a pornographic website +- [ ] I'm only requesting support of **one** website (create a seperate issue for each site) + +## Description + + +URL: From 72570b5862aa6aca57da1bf1f007cc87a9119193 Mon Sep 17 00:00:00 2001 From: Jithin Renji Date: Tue, 3 Nov 2020 16:26:01 +0400 Subject: [PATCH 09/26] Change if statement in __main__.py --- sherlock/__main__.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sherlock/__main__.py b/sherlock/__main__.py index 32410212..91140be5 100644 --- a/sherlock/__main__.py +++ b/sherlock/__main__.py @@ -22,10 +22,7 @@ if __name__ == "__main__": python_version = str(sys.version_info[0])+"."+str(sys.version_info[1])+"."+str(sys.version_info[2]) - if major != 3: - print("Sherlock requires Python 3.6+\nYou are using Python %s, which is not supported by Sherlock" % (python_version)) - sys.exit(1) - if minor < 6: + if major != 3 or major == 3 and minor < 6: print("Sherlock requires Python 3.6+\nYou are using Python %s, which is not supported by Sherlock" % (python_version)) sys.exit(1) From a50bbbb91821c3667546e1aad32479b5bde78afd Mon Sep 17 00:00:00 2001 From: Siddharth Dushantha Date: Thu, 5 Nov 2020 17:24:09 +0100 Subject: [PATCH 10/26] fixed EyeEm false positive --- sherlock/resources/data.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sherlock/resources/data.json b/sherlock/resources/data.json index 8cdb685e..bf0d4f11 100644 --- a/sherlock/resources/data.json +++ b/sherlock/resources/data.json @@ -476,8 +476,7 @@ "username_unclaimed": "noonewouldeverusethis7" }, "EyeEm": { - "errorMsg": "Not Found (404) | EyeEm", - "errorType": "message", + "errorType": "status_code", "url": "https://www.eyeem.com/u/{}", "urlMain": "https://www.eyeem.com/", "username_claimed": "blue", From 0e321375cd44577b74195d41b6fb09c644cc666d Mon Sep 17 00:00:00 2001 From: Siddharth Dushantha Date: Thu, 5 Nov 2020 17:26:00 +0100 Subject: [PATCH 11/26] updated Oracle Community's username_claimed The username 'blue' does not exist anymore, therefore we are using the username 'dev' instead. --- sherlock/resources/data.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sherlock/resources/data.json b/sherlock/resources/data.json index bf0d4f11..49c3b1f0 100644 --- a/sherlock/resources/data.json +++ b/sherlock/resources/data.json @@ -1050,7 +1050,7 @@ "errorType": "status_code", "url": "https://community.oracle.com/people/{}", "urlMain": "https://community.oracle.com", - "username_claimed": "blue", + "username_claimed": "dev", "username_unclaimed": "noonewouldeverusethis7" }, "Otzovik": { From d95b524604abba8b2c529a18f05e8a936373689b Mon Sep 17 00:00:00 2001 From: Siddharth Dushantha Date: Thu, 5 Nov 2020 17:29:22 +0100 Subject: [PATCH 12/26] fixed Repl.it false positive --- sherlock/resources/data.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sherlock/resources/data.json b/sherlock/resources/data.json index 49c3b1f0..e3b72092 100644 --- a/sherlock/resources/data.json +++ b/sherlock/resources/data.json @@ -1246,8 +1246,7 @@ "username_unclaimed": "noonewouldeverusethis7" }, "Repl.it": { - "errorMsg": "404", - "errorType": "message", + "errorType": "status_code", "url": "https://repl.it/@{}", "urlMain": "https://repl.it/", "username_claimed": "blue", From f5d30630c2140828b4e3e3332771d5b0059f18e6 Mon Sep 17 00:00:00 2001 From: Siddharth Dushantha Date: Thu, 5 Nov 2020 17:31:17 +0100 Subject: [PATCH 13/26] fixed Vero false positive --- sherlock/resources/data.json | 1 + 1 file changed, 1 insertion(+) diff --git a/sherlock/resources/data.json b/sherlock/resources/data.json index e3b72092..83d5fe59 100644 --- a/sherlock/resources/data.json +++ b/sherlock/resources/data.json @@ -1638,6 +1638,7 @@ }, "Vero": { "errorType": "status_code", + "request_head_only": false, "url": "https://vero.co/{}", "urlMain": "https://vero.co/", "username_claimed": "blue", From 6cad9986e72a37712b5769787073d3e1f387a166 Mon Sep 17 00:00:00 2001 From: Siddharth Dushantha Date: Thu, 5 Nov 2020 17:34:17 +0100 Subject: [PATCH 14/26] fixed VirusTotal false positive --- sherlock/resources/data.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sherlock/resources/data.json b/sherlock/resources/data.json index 83d5fe59..eddb71f5 100644 --- a/sherlock/resources/data.json +++ b/sherlock/resources/data.json @@ -1660,10 +1660,11 @@ "username_unclaimed": "noonewouldeverusethis7" }, "VirusTotal": { - "errorMsg": "not found", - "errorType": "message", + "errorType": "status_code", "url": "https://www.virustotal.com/ui/users/{}/trusted_users", + "urlProbe": "https://www.virustotal.com/ui/users/{}/avatar", "urlMain": "https://www.virustotal.com/", + "request_head_only": false, "username_claimed": "blue", "username_unclaimed": "noonewouldeverusethis7" }, From 7a7f36f7eaaa0eb583478edc352117e1605482ed Mon Sep 17 00:00:00 2001 From: Siddharth Dushantha Date: Thu, 5 Nov 2020 17:39:05 +0100 Subject: [PATCH 15/26] fixed WattPad false positive --- sherlock/resources/data.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sherlock/resources/data.json b/sherlock/resources/data.json index eddb71f5..788bbb25 100644 --- a/sherlock/resources/data.json +++ b/sherlock/resources/data.json @@ -1676,9 +1676,9 @@ "username_unclaimed": "noonewouldeverusethis77777" }, "Wattpad": { - "errorMsg": "userError-404", - "errorType": "message", + "errorType": "status_code", "url": "https://www.wattpad.com/user/{}", + "urlProbe": "https://www.wattpad.com/api/v3/users/{}/", "urlMain": "https://www.wattpad.com/", "username_claimed": "Dogstho7951", "username_unclaimed": "noonewouldeverusethis7" From 028404716c4b36426d7d56bbc0d9c7287c9aaafb Mon Sep 17 00:00:00 2001 From: Siddharth Dushantha Date: Thu, 5 Nov 2020 17:44:35 +0100 Subject: [PATCH 16/26] fixed opennet false positive --- sherlock/resources/data.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sherlock/resources/data.json b/sherlock/resources/data.json index 788bbb25..0ce0f45b 100644 --- a/sherlock/resources/data.json +++ b/sherlock/resources/data.json @@ -2138,7 +2138,7 @@ "opennet": { "errorMsg": "\u0418\u043c\u044f \u0443\u0447\u0430\u0441\u0442\u043d\u0438\u043a\u0430 \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u043e", "errorType": "message", - "regexCheck": "^[^_]*$", + "regexCheck": "^[^-]*$", "url": "https://www.opennet.ru/~{}", "urlMain": "https://www.opennet.ru/", "username_claimed": "anonismus", From 41cceb7b8437c4aaa97a8b780b83afe4d52df5b9 Mon Sep 17 00:00:00 2001 From: Siddharth Dushantha Date: Thu, 5 Nov 2020 17:48:50 +0100 Subject: [PATCH 17/26] fixed Facenama false positive --- sherlock/resources/data.json | 1 + 1 file changed, 1 insertion(+) diff --git a/sherlock/resources/data.json b/sherlock/resources/data.json index 0ce0f45b..112714ba 100644 --- a/sherlock/resources/data.json +++ b/sherlock/resources/data.json @@ -500,6 +500,7 @@ }, "Facenama": { "errorType": "response_url", + "regexCheck": "^[-a-zA-Z0-9_]+$", "errorUrl": "https://facenama.com/404.html", "url": "https://facenama.com/{}", "urlMain": "https://facenama.com/", From 5ce36bc6b334b7b7a805afe2664ddfaa58d50c58 Mon Sep 17 00:00:00 2001 From: Siddharth Dushantha Date: Thu, 5 Nov 2020 17:53:06 +0100 Subject: [PATCH 18/26] brought back Imgur by fixing it's false positive --- removed_sites.json | 8 -------- removed_sites.md | 16 ---------------- sherlock/resources/data.json | 8 ++++++++ 3 files changed, 8 insertions(+), 24 deletions(-) diff --git a/removed_sites.json b/removed_sites.json index d5b4d4cc..68a07514 100644 --- a/removed_sites.json +++ b/removed_sites.json @@ -113,14 +113,6 @@ "username_claimed": "blue", "username_unclaimed": "noonewouldeverusethis7" }, - "Imgur": { - "errorType": "status_code", - "rank": 74, - "url": "https://imgur.com/user/{}", - "urlMain": "https://imgur.com/", - "username_claimed": "blue", - "username_unclaimed": "noonewouldeverusethis7" - }, "Investing.com": { "errorType": "status_code", "rank": 196, diff --git a/removed_sites.md b/removed_sites.md index 6401cadf..8cd786c9 100644 --- a/removed_sites.md +++ b/removed_sites.md @@ -370,22 +370,6 @@ Usernames that exist are not detected. }, ``` -## Imgur - -Looks like they made some changes to the site. Sherlock says that all -usernames are available. - -``` - "Imgur": { - "errorType": "status_code", - "rank": 74, - "url": "https://imgur.com/user/{}", - "urlMain": "https://imgur.com/", - "username_claimed": "blue", - "username_unclaimed": "noonewouldeverusethis7" - }, -``` - ## PowerShell Gallery Accidentally merged even though the original pull request showed that all diff --git a/sherlock/resources/data.json b/sherlock/resources/data.json index 112714ba..915f983e 100644 --- a/sherlock/resources/data.json +++ b/sherlock/resources/data.json @@ -2231,5 +2231,13 @@ "urlMain": "https://uid.me/", "username_claimed": "blue", "username_unclaimed": "noonewouldeverusethis7" + }, + "Imgur": { + "errorType": "status_code", + "urlProbe": "https://api.imgur.com/account/v1/accounts/{}?client_id=546c25a59c58ad7", + "url": "https://imgur.com/user/{}", + "urlMain": "https://imgur.com/", + "username_claimed": "blue", + "username_unclaimed": "noonewouldeverusethis7" } } From aa14f3e299b82f0f05a961b56ff6fffb09c1689e Mon Sep 17 00:00:00 2001 From: Siddharth Dushantha Date: Thu, 5 Nov 2020 17:57:38 +0100 Subject: [PATCH 19/26] fixed Medium false positive --- sherlock/resources/data.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sherlock/resources/data.json b/sherlock/resources/data.json index 915f983e..d50e6699 100644 --- a/sherlock/resources/data.json +++ b/sherlock/resources/data.json @@ -913,8 +913,10 @@ "username_unclaimed": "noonewouldeverusethis7" }, "Medium": { - "errorType": "status_code", + "errorType": "message", + "errorMsg": " Date: Thu, 5 Nov 2020 18:09:25 +0100 Subject: [PATCH 20/26] brough back Codepen by fixing false positive --- removed_sites.json | 8 -------- removed_sites.md | 15 --------------- sherlock/resources/data.json | 7 +++++++ 3 files changed, 7 insertions(+), 23 deletions(-) diff --git a/removed_sites.json b/removed_sites.json index 68a07514..98e92d8c 100644 --- a/removed_sites.json +++ b/removed_sites.json @@ -48,14 +48,6 @@ "username_claimed": "blue", "username_unclaimed": "noonewouldeverusethis7" }, - "Codepen": { - "errorType": "status_code", - "rank": 1359, - "url": "https://codepen.io/{}", - "urlMain": "https://codepen.io/", - "username_claimed": "blue", - "username_unclaimed": "noonewouldeverusethis7" - }, "ColourLovers": { "errorType": "status_code", "rank": 21271, diff --git a/removed_sites.md b/removed_sites.md index 8cd786c9..94f58209 100644 --- a/removed_sites.md +++ b/removed_sites.md @@ -355,21 +355,6 @@ Usernames that exist are not detected. Forbidden Request 403 Error. }, ``` -## Codepen - -Usernames that exist are not detected. - -``` - "Codepen": { - "errorType": "status_code", - "rank": 1359, - "url": "https://codepen.io/{}", - "urlMain": "https://codepen.io/", - "username_claimed": "blue", - "username_unclaimed": "noonewouldeverusethis7" - }, -``` - ## PowerShell Gallery Accidentally merged even though the original pull request showed that all diff --git a/sherlock/resources/data.json b/sherlock/resources/data.json index d50e6699..c0d13a10 100644 --- a/sherlock/resources/data.json +++ b/sherlock/resources/data.json @@ -2241,5 +2241,12 @@ "urlMain": "https://imgur.com/", "username_claimed": "blue", "username_unclaimed": "noonewouldeverusethis7" + }, + "Codepen": { + "errorType": "status_code", + "url": "https://codepen.io/{}", + "urlMain": "https://codepen.io/", + "username_claimed": "blue", + "username_unclaimed": "noonewouldeverusethis7" } } From 74b497262ad9a21b5423ecd816ef19e926a558b7 Mon Sep 17 00:00:00 2001 From: Siddharth Dushantha Date: Thu, 5 Nov 2020 18:11:54 +0100 Subject: [PATCH 21/26] brough back ColourLovers Seems to be working fine now. No changes were needed to the data. --- removed_sites.json | 8 -------- removed_sites.md | 18 ------------------ sherlock/resources/data.json | 7 +++++++ 3 files changed, 7 insertions(+), 26 deletions(-) diff --git a/removed_sites.json b/removed_sites.json index 98e92d8c..0229b205 100644 --- a/removed_sites.json +++ b/removed_sites.json @@ -48,14 +48,6 @@ "username_claimed": "blue", "username_unclaimed": "noonewouldeverusethis7" }, - "ColourLovers": { - "errorType": "status_code", - "rank": 21271, - "url": "https://www.colourlovers.com/lover/{}", - "urlMain": "https://www.colourlovers.com/", - "username_claimed": "blue", - "username_unclaimed": "noonewouldeverusethis7" - }, "EVE Online": { "errorType": "response_url", "errorUrl": "https://eveonline.com", diff --git a/removed_sites.md b/removed_sites.md index 94f58209..47c069b1 100644 --- a/removed_sites.md +++ b/removed_sites.md @@ -61,24 +61,6 @@ required login before access. "username_unclaimed": "noonewouldeverusethis7" }, ``` -## ColourLovers - -As of 2020-05-24, all usernames are reported as claimed. - -There is an API available (https://www.colourlovers.com/api/), but when -there is no match it returns an empty file. So, changes would have to -happen before the lack of a response could be used to detect. - -``` - "ColourLovers": { - "errorType": "status_code", - "rank": 21271, - "url": "https://www.colourlovers.com/lover/{}", - "urlMain": "https://www.colourlovers.com/", - "username_claimed": "blue", - "username_unclaimed": "noonewouldeverusethis7" - }, -``` ## AdobeForums diff --git a/sherlock/resources/data.json b/sherlock/resources/data.json index c0d13a10..0f28307e 100644 --- a/sherlock/resources/data.json +++ b/sherlock/resources/data.json @@ -2248,5 +2248,12 @@ "urlMain": "https://codepen.io/", "username_claimed": "blue", "username_unclaimed": "noonewouldeverusethis7" + }, + "ColourLovers": { + "errorType": "status_code", + "url": "https://www.colourlovers.com/lover/{}", + "urlMain": "https://www.colourlovers.com/", + "username_claimed": "blue", + "username_unclaimed": "noonewouldeverusethis7" } } From c0d4d461792f46d557f64e3f3806d2f4ee79c2df Mon Sep 17 00:00:00 2001 From: Siddharth Dushantha Date: Thu, 5 Nov 2020 18:13:10 +0100 Subject: [PATCH 22/26] added proper description for why Foursquare was removed --- removed_sites.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/removed_sites.md b/removed_sites.md index 47c069b1..c101789a 100644 --- a/removed_sites.md +++ b/removed_sites.md @@ -277,7 +277,11 @@ HTTP Status. ## Foursquare -Usernames that exist are not detected. +When usage of automated tool is detected. Whole IP is banned from future requests. +There is an error message: + +> Please verify you are a human +> Access to this page has been denied because we believe you are using automation tools to browse the website. ``` "Foursquare": { From ef1125e7131e4a85233a984d890e32e3bfbbbc0f Mon Sep 17 00:00:00 2001 From: Siddharth Dushantha Date: Thu, 5 Nov 2020 18:51:50 +0100 Subject: [PATCH 23/26] version bump 0.12.9 --> 0.13.0 --- sherlock/sherlock.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sherlock/sherlock.py b/sherlock/sherlock.py index 6adbb8c8..944d9a16 100644 --- a/sherlock/sherlock.py +++ b/sherlock/sherlock.py @@ -25,7 +25,7 @@ from notify import QueryNotifyPrint from sites import SitesInformation module_name = "Sherlock: Find Usernames Across Social Networks" -__version__ = "0.12.9" +__version__ = "0.13.0" From 12cf1daf38280405f7a6196ecda2377d632af340 Mon Sep 17 00:00:00 2001 From: Siddharth Dushantha Date: Thu, 5 Nov 2020 18:59:10 +0100 Subject: [PATCH 24/26] removed Filmogs because they shut down --- removed_sites.json | 7 +++++++ removed_sites.md | 17 +++++++++++++++++ sherlock/resources/data.json | 7 ------- 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/removed_sites.json b/removed_sites.json index 0229b205..660fa5a2 100644 --- a/removed_sites.json +++ b/removed_sites.json @@ -497,6 +497,13 @@ "urlMain": "http://www.pokerstrategy.net", "username_claimed": "blue", "username_unclaimed": "noonewouldeverusethis7" + }, + "Filmogs": { + "errorType": "status_code", + "url": "https://www.filmo.gs/users/{}", + "urlMain": "https://www.filmo.gs/", + "username_claimed": "cupparober", + "username_unclaimed": "noonewouldeverusethis7" } } diff --git a/removed_sites.md b/removed_sites.md index c101789a..d3df058b 100644 --- a/removed_sites.md +++ b/removed_sites.md @@ -991,3 +991,20 @@ As of 2020-10-21, PokerStrategy returns false positives. This was reported in #7 "username_unclaimed": "noonewouldeverusethis7" }, ``` + +## Filmogs + +Filmogs has closed down. + +> **Filmogs is closed** +> **31-Aug 2020** - We are preparing the last data export and collection of images. It will be published here by 19-Oct 2020. If you have requested an export of your data it will also be emailed to you by 19-Oct 2020. + +``` + "Filmogs": { + "errorType": "status_code", + "url": "https://www.filmo.gs/users/{}", + "urlMain": "https://www.filmo.gs/", + "username_claimed": "cupparober", + "username_unclaimed": "noonewouldeverusethis7" + }, +``` \ No newline at end of file diff --git a/sherlock/resources/data.json b/sherlock/resources/data.json index 0f28307e..87378ea2 100644 --- a/sherlock/resources/data.json +++ b/sherlock/resources/data.json @@ -514,13 +514,6 @@ "username_claimed": "Jungypoo", "username_unclaimed": "noonewouldeverusethis7" }, - "Filmogs": { - "errorType": "status_code", - "url": "https://www.filmo.gs/users/{}", - "urlMain": "https://www.filmo.gs/", - "username_claimed": "cupparober", - "username_unclaimed": "noonewouldeverusethis7" - }, "Flickr": { "errorType": "status_code", "url": "https://www.flickr.com/people/{}", From e2e5d106b009bd0b1ef204361dc7043643898d43 Mon Sep 17 00:00:00 2001 From: h20190563 Date: Fri, 6 Nov 2020 00:21:41 +0530 Subject: [PATCH 25/26] Adding facility to support multiple errors --- sherlock/sherlock.py | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/sherlock/sherlock.py b/sherlock/sherlock.py index 944d9a16..e0990b91 100644 --- a/sherlock/sherlock.py +++ b/sherlock/sherlock.py @@ -326,9 +326,27 @@ def sherlock(username, site_data, query_notify, query_time=response_time, context=error_text) elif error_type == "message": - error = net_info.get("errorMsg") - # Checks if the error message is in the HTML - if not error in r.text: + # error_flag True denotes no error found in the HTML + # error_flag False denotes error found in the HTML + error_flag = True + errors=net_info.get("errorMsg") + # errors will hold the error message + # it can be string or list + # by insinstance method we can detect that + # and handle the case for strings as normal procedure + # and if its list we can iterate the errors + if isinstance(errors,str): + # Checks if the error message is in the HTML + # if error is present we will set flag to False + if errors in r.text: + error_flag = False + else: + # If it's list, it will iterate all the error message + for error in errors: + if error in r.text: + error_flag = False + break + if error_flag: result = QueryResult(username, social_network, url, From 7e041a4d70d9032a97501090b6a71b61e3ecb465 Mon Sep 17 00:00:00 2001 From: h20190563 Date: Fri, 6 Nov 2020 00:23:09 +0530 Subject: [PATCH 26/26] Adding support of multiple errors for Tinder --- sherlock/resources/data.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sherlock/resources/data.json b/sherlock/resources/data.json index 87378ea2..72753214 100644 --- a/sherlock/resources/data.json +++ b/sherlock/resources/data.json @@ -1491,7 +1491,8 @@ "username_unclaimed": "noonewouldeverusethis7" }, "Tinder": { - "errorMsg": "Tinder | Match. Chat. Date.", + "errorMsg": ["Tinder | Dating, Make Friends & Meet New People", + "Tinder | Match. Chat. Date."], "errorType": "message", "url": "https://www.gotinder.com/@{}", "urlMain": "https://tinder.com/",