Merge branch 'master' into master

2 years ago · cdfc8fdbfb
parent 0f36c50b5b be42ae729a
commit cdfc8fdbfb
9 changed files with 128 additions and 31 deletions
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@ -9,7 +9,7 @@ jobs:
    runs-on: ubuntu-latest
    strategy:
      matrix:
-        python-version: [3.6, 3.7, 3.8]
+        python-version: [3.7, 3.8]

    steps:
    - uses: actions/checkout@v2
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@ -10,7 +10,7 @@ jobs:
    runs-on: ubuntu-latest
    strategy:
      matrix:
-        python-version: [3.6]
+        python-version: [3.8]

    steps:
    - uses: actions/checkout@v2
--- a/README.md
+++ b/README.md
@ -133,9 +133,11 @@ Use the following command to access the saved results:
 docker run --rm -t -v "$PWD/results:/opt/sherlock/results" mysherlock-image -o /opt/sherlock/results/text.txt user123
 ```

-The ```-v "$PWD/results:/opt/sherlock/results"``` options tell docker to create (or use) the folder `results` in the
+<!-- The ```-v "$PWD/results:/opt/sherlock/results"``` options tell docker to create (or use) the folder `results` in the
 present working directory and to mount it at `/opt/sherlock/results` on the docker container.
-The `-o /opt/sherlock/results/text.txt` option tells `sherlock` to output the result.
+The `-o /opt/sherlock/results/text.txt` option tells `sherlock` to output the result. -->
+
+Docker is instructed to create (or use) the folder `results` in the current working directory and to mount it at `/opt/sherlock/results` on the docker container by using the ```-v "$PWD/results:/opt/sherlock/results"``` options. `Sherlock` is instructed to export the result using the `-o /opt/sherlock/results/text.txt` option.

 Or you can use "Docker Hub" to run `sherlock`:
 ```
--- a/removed_sites.json
+++ b/removed_sites.json
@ -689,5 +689,28 @@
    "url": "https://mastodon.technology/@{}",
    "urlMain": "https://mastodon.xyz/",
    "username_claimed": "ashfurrow",
+  },
+  "Arduino": {
+    "errorMsg":"<title>Arduino Cloud</title>",
+    "errorType": "message",
+    "regexCheck": "^(?![_-])[A-Za-z0-9_-]{3,}$",
+    "url": "https://projecthub.arduino.cc/{}",
+    "urlMain": "https://www.arduino.cc/",
+    "username_claimed": "blue"
+  },
+  "zoomit": {
+    "errorMsg": "\u0645\u062a\u0627\u0633\u0641\u0627\u0646\u0647 \u0635\u0641\u062d\u0647 \u06cc\u0627\u0641\u062a \u0646\u0634\u062f",
+    "errorType": "message",
+    "url": "https://www.zoomit.ir/user/{}",
+    "urlMain": "https://www.zoomit.ir",
+    "username_claimed": "kossher"
+  },
+  "Facebook": {
+    "errorType": "status_code",
+    "regexCheck": "^[a-zA-Z0-9\\.]{3,49}(?<!\\.com|\\.org|\\.net)$",
+    "url": "https://www.facebook.com/{}",
+    "urlMain": "https://www.facebook.com/",
+    "urlProbe": "https://www.facebook.com/{}/videos/",
+    "username_claimed": "hackerman"
  }
 }
--- a/removed_sites.md
+++ b/removed_sites.md
@ -700,7 +700,7 @@ If an alternative way to check for usernames is found then it will added.
 ```

 ## YandexCollection
-As of 2020-08-11, YandexCollection presents us with a rechapta which prevents us from checking for usernames
+As of 2020-08-11, YandexCollection presents us with a recaptcha which prevents us from checking for usernames
 ```json
  "YandexCollection": {
    "errorType": "status_code",
@ -1024,7 +1024,7 @@ As of 2021-06-27, GDProfiles takes way too long to respond. Must be an issue on

 ## AllTrails

-As of 2021-06-27, AllTrails has a chapta which prevents us from checking for usernames on the site.
+As of 2021-06-27, AllTrails has a captcha which prevents us from checking for usernames on the site.
 ```json
  "AllTrails": {
    "errorMsg": "class=\"home index\"",
@ -1082,7 +1082,7 @@ As of 2021-06-27, Kali Community requires us to be logged in order to check if a

 ## NameMC

-As of 2021-06-27, NameMC uses chapta through CloudFlare which prevents us from checking if usernames exists on the site.
+As of 2021-06-27, NameMC uses captcha through CloudFlare which prevents us from checking if usernames exists on the site.

 ```json
  "NameMC (Minecraft.net skins)": {
@ -1097,7 +1097,7 @@ As of 2021-06-27, NameMC uses chapta through CloudFlare which prevents us from c

 ## SteamID

-As of 2021-06-27, Steam uses chapta through CloudFlare which prevents us from checking if usernames exists on the site.
+As of 2021-06-27, Steam uses captcha through CloudFlare which prevents us from checking if usernames exists on the site.
 ```json
  "Steamid": {
    "errorMsg": "<link rel=\"canonical\" href=\"https://steamid.uk\" />",
@ -1345,19 +1345,6 @@ As og 2022-05-01, Countable returns false positives
  },
 ```

-## Spotify
-
-As og 2022-05-01, Spotify returns false positives
-```json
-  "Spotify": {
-    "errorType": "status_code",
-    "url": "https://open.spotify.com/user/{}",
-    "urlMain": "https://open.spotify.com/",
-    "username_claimed": "blue",
-    "username_unclaimed": "noonewouldeverusethis7"
-  },
-```
-
 ## Steam

 As og 2022-05-01, Steam returns false positives
@ -1577,4 +1564,48 @@ As of 18.12.2022, mastodon.technology has no A/AAAA records and the [website was
    "username_claimed": "ashfurrow",
    "username_unclaimed": "noonewouldeverusethis7"
  },
+```
+
+
+## Aruino
+As of 04.02.2023, Arduino returns false positives. Finding a fix is doable but takes some time. Will be fixed later
+
+```json
+"Arduino": {
+    "errorMsg":"<title>Arduino Cloud</title>",
+    "errorType": "message",
+    "regexCheck": "^(?![_-])[A-Za-z0-9_-]{3,}$",
+    "url": "https://projecthub.arduino.cc/{}",
+    "urlMain": "https://www.arduino.cc/",
+    "username_claimed": "blue",
+    "username_unclaimed": "noonewould"
+  },
+
+```
+
+## Zoomit
+As of 04.02.2023, Zoomit return false positves. An attempt at finding a fix was made but a lot of time was used without luck. Therefore, it wont be prioritized at the moment.
+```json
+  "zoomit": {
+    "errorMsg": "\u0645\u062a\u0627\u0633\u0641\u0627\u0646\u0647 \u0635\u0641\u062d\u0647 \u06cc\u0627\u0641\u062a \u0646\u0634\u062f",
+    "errorType": "message",
+    "url": "https://www.zoomit.ir/user/{}",
+    "urlMain": "https://www.zoomit.ir",
+    "username_claimed": "kossher",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
+```
+
+## Facebook
+As of 04.02.2023, Facebook returns false positives because we get prompted with the login screen to view the data
+```json
+"Facebook": {
+    "errorType": "status_code",
+    "regexCheck": "^[a-zA-Z0-9\\.]{3,49}(?<!\\.com|\\.org|\\.net)$",
+    "url": "https://www.facebook.com/{}",
+    "urlMain": "https://www.facebook.com/",
+    "urlProbe": "https://www.facebook.com/{}/videos/",
+    "username_claimed": "hackerman",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
 ```
--- a/sherlock/notify.py
+++ b/sherlock/notify.py
@ -5,6 +5,7 @@ results of queries.
 """
 from result import QueryStatus
 from colorama import Fore, Style
+import webbrowser
 globvar = 0 # global variable to count the number of results.

 class QueryNotify:
@ -109,7 +110,7 @@ class QueryNotifyPrint(QueryNotify):
    Query notify class that prints results.
    """

-    def __init__(self, result=None, verbose=False, print_all=False):
+    def __init__(self, result=None, verbose=False, print_all=False, browse=False):
        """Create Query Notify Print Object.

        Contains information about a specific method of notifying the results
@ -121,6 +122,7 @@ class QueryNotifyPrint(QueryNotify):
                                  results for this query.
        verbose                -- Boolean indicating whether to give verbose output.
        print_all              -- Boolean indicating whether to only print all sites, including not found.
+        browse                 -- Boolean indicating whether to open found sites in a web browser.

        Return Value:
        Nothing.
@ -129,6 +131,7 @@ class QueryNotifyPrint(QueryNotify):
        super().__init__(result)
        self.verbose = verbose
        self.print_all = print_all
+        self.browse = browse

        return
     
@ -227,7 +230,9 @@ class QueryNotifyPrint(QueryNotify):
                  Fore.GREEN +
                  f" {self.result.site_name}: " +
                  Style.RESET_ALL +
-                  f"{self.result.site_url_user}")       
+                  f"{self.result.site_url_user}") 
+            if self.browse:
+                webbrowser.open(self.result.site_url_user,2)

        elif result.status == QueryStatus.AVAILABLE:
            if self.print_all:
--- a/sherlock/resources/data.json
+++ b/sherlock/resources/data.json
@ -388,6 +388,14 @@
    "urlMain": "https://www.codechef.com/",
    "username_claimed": "blue"
  },
+  "Codeforces": {
+    "errorType": "status_code",
+    "url": "https://codeforces.com/profile/{}",
+    "urlMain": "https://codeforces.com/",
+    "urlProbe": "https://codeforces.com/api/user.info?handles={}",
+    "username_claimed": "tourist",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
  "Codepen": {
    "errorType": "status_code",
    "url": "https://codepen.io/{}",
@ -1133,6 +1141,14 @@
    "urlProbe": "https://api.mixcloud.com/{}/",
    "username_claimed": "jenny"
  },
+  "Monkeytype": {
+    "errorType": "status_code",
+    "url": "https://monkeytype.com/profile/{}",
+    "urlMain": "https://monkeytype.com/",
+    "urlProbe": "https://api.monkeytype.com/users/{}/profile",
+    "username_claimed": "Lost_Arrow",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
  "Motorradfrage": {
    "errorType": "status_code",
    "url": "https://www.motorradfrage.net/nutzer/{}",
@ -1667,7 +1683,7 @@
    "username_claimed": "blue"
  },
  "Strava": {
-    "errorMsg": "Strava | Run and Cycling Tracking on the Social Network for Athletes",
+    "errorMsg": "Strava | Running, Cycling &amp; Hiking App - Train, Track &amp; Share",
    "errorType": "message",
    "url": "https://www.strava.com/athletes/{}",
    "urlMain": "https://www.strava.com/",
@ -1758,8 +1774,7 @@
    "username_claimed": "blue"
  },
  "TrashboxRU": {
-    "errorMsg": "\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d",
-    "errorType": "message",
+    "errorType": "status_code",
    "regexCheck": "^[A-Za-z0-9_-]{3,16}$",
    "url": "https://trashbox.ru/users/{}",
    "urlMain": "https://trashbox.ru/",
@ -2069,9 +2084,11 @@
    "username_claimed": "blue"
  },
  "dailykos": {
-    "errorType": "status_code",
+    "errorType": "message",
+    "errorMsg": "{\"result\":true,\"message\":null}",
    "url": "https://www.dailykos.com/user/{}",
    "urlMain": "https://www.dailykos.com",
+    "urlProbe": "https://www.dailykos.com/signup/check_nickname?nickname={}",
    "username_claimed": "blue"
  },
  "datingRU": {
@ -2231,7 +2248,7 @@
    "username_claimed": "yeahkenny"
  },
  "koo": {
-    "errorMsg": "is available",
+    "errorMsg": "This profile does not exist",
    "errorType": "message",
    "url": "https://www.kooapp.com/profile/{}",
    "urlMain": "https://www.kooapp.com",
@ -2287,6 +2304,13 @@
    "urlMain": "https://mastodon.xyz/",
    "username_claimed": "ashfurrow"
  },
+  "mastodon.technology": {
+    "errorType": "status_code",
+    "url": "https://mastodon.technology/@{}",
+    "urlMain": "https://mastodon.xyz/",
+    "username_claimed": "ashfurrow",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
  "mastodon.xyz": {
    "errorType": "status_code",
    "url": "https://mastodon.xyz/@{}",
@ -2498,6 +2522,16 @@
    },
    "url": "https://www.youtube.com/user/{}",
    "urlMain": "https://www.youtube.com",
-    "username_claimed": "pewdiepie"
+    "username_claimed": "pewdiepie",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
+  "Spotify": {
+    "errorType": "status_code",
+    "headers": {
+      "user-agent": "PostmanRuntime/7.29.2"
+    },
+    "url": "https://open.spotify.com/user/{}",
+    "urlMain": "https://open.spotify.com/",
+    "username_claimed": "blue",
  }
-}
+}
--- a/sherlock/sherlock.py
+++ b/sherlock/sherlock.py
@ -664,7 +664,8 @@ def main():
    # Create notify object for query results.
    query_notify = QueryNotifyPrint(result=None,
                                    verbose=args.verbose,
-                                    print_all=args.print_all)
+                                    print_all=args.print_all, 
+                                    browse=args.browse)

    # Run report on all specified users.

--- a/sherlock/sites.py
+++ b/sherlock/sites.py
@ -41,6 +41,7 @@ class SiteInformation:
                                         be needed by the detection method,
                                         but it is only recorded in this
                                         object for future use.
+        is_nsfw                -- Boolean indicating if site is Not Safe For Work.

        Return Value:
        Nothing.