Skip to content

Commit 330dfe1

Browse files
ppfeisterppfeister
authored
Merge branch 'master' into feature/schema
2 parents 0cd6ad8 + 49b190f commit 330dfe1

File tree

8 files changed

+282
-130
lines changed

8 files changed

+282
-130
lines changed

‎.github/workflows/pull_request.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,12 @@ jobs:
3434
- name: Install Dependencies
3535
run: |
3636
python -m pip install --upgrade pip
37-
pip install flake8 pytest
37+
pip install ruff flake8 pytest
3838
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
39-
- name: Lint With flake8
39+
- name: Lint With Ruff
4040
run: |
4141
# stop the build if there are Python syntax errors or undefined names
42-
flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
43-
42+
ruff check . --output-format=github --select=E9,F63,F7,F82
4443
# exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
4544
flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
4645
- name: Sherlock Site Detect Tests

‎removed_sites.json

Lines changed: 37 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -492,13 +492,6 @@
492492
"urlMain": "https://www.cloob.com/",
493493
"username_claimed": "blue"
494494
},
495-
"1337x": {
496-
"errorMsg": "Bad Username",
497-
"errorType": "message",
498-
"url": "https://1337x.to/user/{}/",
499-
"urlMain": "https://1337x.to",
500-
"username_claimed": "TheMorozko"
501-
},
502495
"TM-Ladder": {
503496
"errorMsg": "player unknown or invalid",
504497
"errorType": "message",
@@ -763,14 +756,6 @@
763756
"urlProbe": "https://onlyfans.com/api2/v2/users/{}",
764757
"username_claimed": "theemilylynne"
765758
},
766-
"Instagram": {
767-
"errorMsg": "Nothing found!",
768-
"errorType": "message",
769-
"url": "https://www.instagram.com/{}",
770-
"urlMain": "https://www.instagram.com/",
771-
"urlProbe": "https://www.picuki.com/profile/{}",
772-
"username_claimed": "blue"
773-
},
774759
"OK": {
775760
"errorType": "status_code",
776761
"regexCheck": "^[a-zA-Z][a-zA-Z0-9_.-]*$",
@@ -869,5 +854,42 @@
869854
"url": "https://ebio.gg/{}",
870855
"urlMain": "https:/ebio.gg",
871856
"username_claimed": "dev"
857+
},
858+
"metacritic": {
859+
"errorMsg": "User not found",
860+
"errorType": "message",
861+
"regexCheck": "^(?![-_].)[A-Za-z0-9-_]{3,15}$",
862+
"url": "https://www.metacritic.com/user/{}",
863+
"urlMain": "https://www.metacritic.com/",
864+
"username_claimed": "blue"
865+
},
866+
"Oracle Communities": {
867+
"errorType": "status_code",
868+
"url": "https://community.oracle.com/people/{}",
869+
"urlMain": "https://community.oracle.com",
870+
"username_claimed": "dev"
871+
},
872+
"HexRPG": {
873+
"errorMsg": "Error : User ",
874+
"errorType": "message",
875+
"regexCheck": "^[a-zA-Z0-9_ ]{3,20}$",
876+
"url": "https://www.hexrpg.com/userinfo/{}",
877+
"urlMain": "https://www.hexrpg.com/",
878+
"username_claimed": "blue"
879+
},
880+
"G2G": {
881+
"errorType": "response_url",
882+
"errorUrl": "https://www.g2g.com/{}",
883+
"regexCheck": "^[A-Za-z][A-Za-z0-9_]{2,11}$",
884+
"url": "https://www.g2g.com/{}",
885+
"urlMain": "https://www.g2g.com/",
886+
"username_claimed": "user"
887+
},
888+
"BitCoinForum": {
889+
"errorMsg": "The user whose profile you are trying to view does not exist.",
890+
"errorType": "message",
891+
"url": "https://bitcoinforum.com/profile/{}",
892+
"urlMain": "https://bitcoinforum.com",
893+
"username_claimed": "bitcoinforum.com"
872894
}
873895
}

‎removed_sites.md

Lines changed: 62 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1178,19 +1178,6 @@ As of 2021-10-25, Cloob seems to be down and their site is not responding.
11781178
}
11791179
```
11801180

1181-
### 1337x
1182-
As of 2021-11-21, 1337x seems to be down causing false positives.
1183-
```json
1184-
"1337x": {
1185-
"errorMsg": "Bad Username",
1186-
"errorType": "message",
1187-
"url": "https://1337x.to/user/{}/",
1188-
"urlMain": "https://1337x.to",
1189-
"username_claimed": "TheMorozko",
1190-
"username_unclaimed": "noonewouldeverusethis7"
1191-
}
1192-
```
1193-
11941181
### TM-Ladder
11951182
As of 2021-11-30, TM-Ladder is returning false positives due to rate limits.
11961183

@@ -1700,20 +1687,6 @@ As of 2023.04.20, OnlyFans returns false negatives on checking usernames with th
17001687
}
17011688
```
17021689

1703-
## Instagram
1704-
As of 2023.04.21, Instagram returns false positives as picuki.com was used to query for usernames but they now user Cloudflare
1705-
1706-
```json
1707-
"Instagram": {
1708-
"errorMsg": "Nothing found!",
1709-
"errorType": "message",
1710-
"url": "https://www.instagram.com/{}",
1711-
"urlMain": "https://www.instagram.com/",
1712-
"urlProbe": "https://www.picuki.com/profile/{}",
1713-
"username_claimed": "blue"
1714-
}
1715-
```
1716-
17171690
## OK
17181691
As of 2023.04.21, Ok.ru returns false positives
17191692
```json
@@ -1882,4 +1855,66 @@ As of 2023.12.21, Ebio returns false positives.
18821855
"urlMain": "https:/ebio.gg",
18831856
"username_claimed": "dev"
18841857
},
1858+
```
1859+
1860+
## HexRPG
1861+
__2024-04-07 :__ HexRPG behind authentication wall. Unable to check usernames without logging in.
1862+
```json
1863+
"HexRPG": {
1864+
"errorMsg": "Error : User ",
1865+
"errorType": "message",
1866+
"regexCheck": "^[a-zA-Z0-9_ ]{3,20}$",
1867+
"url": "https://www.hexrpg.com/userinfo/{}",
1868+
"urlMain": "https://www.hexrpg.com/",
1869+
"username_claimed": "blue"
1870+
}
1871+
```
1872+
1873+
## Oracle Communities
1874+
__2024-04-07 :__ Oracle Communities behind authentication wall. Unable to check usernames without logging in.
1875+
```json
1876+
"Oracle Communities": {
1877+
"errorType": "status_code",
1878+
"url": "https://community.oracle.com/people/{}",
1879+
"urlMain": "https://community.oracle.com",
1880+
"username_claimed": "dev"
1881+
}
1882+
```
1883+
1884+
## Metacritic
1885+
__2024-04-07 :__ Non-existent users seemingly displayed as real users with no activity. Needs adjustment.
1886+
```json
1887+
"metacritic": {
1888+
"errorMsg": "User not found",
1889+
"errorType": "message",
1890+
"regexCheck": "^(?![-_].)[A-Za-z0-9-_]{3,15}$",
1891+
"url": "https://www.metacritic.com/user/{}",
1892+
"urlMain": "https://www.metacritic.com/",
1893+
"username_claimed": "blue"
1894+
}
1895+
```
1896+
1897+
## G2G
1898+
__2024-04-10 :__ Seems to be loading profiles with some wierd javascript setup that sherlock doesn't like, leading to difficult to control false positives
1899+
```json
1900+
"G2G": {
1901+
"errorType": "response_url",
1902+
"errorUrl": "https://www.g2g.com/{}",
1903+
"regexCheck": "^[A-Za-z][A-Za-z0-9_]{2,11}$",
1904+
"url": "https://www.g2g.com/{}",
1905+
"urlMain": "https://www.g2g.com/",
1906+
"username_claimed": "user"
1907+
}
1908+
```
1909+
1910+
## Bitcoin Forum
1911+
__2024-04-24 :__ BCF seems to have gone defunct. Uncertain.
1912+
```json
1913+
"BitCoinForum": {
1914+
"errorMsg": "The user whose profile you are trying to view does not exist.",
1915+
"errorType": "message",
1916+
"url": "https://bitcoinforum.com/profile/{}",
1917+
"urlMain": "https://bitcoinforum.com",
1918+
"username_claimed": "bitcoinforum.com"
1919+
}
18851920
```

‎sherlock/notify.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,15 @@ def update(self, result):
238238
Fore.WHITE + "]" +
239239
Fore.GREEN + f" {self.result.site_name}:" +
240240
Fore.YELLOW + f" {msg}")
241+
242+
elif result.status == QueryStatus.WAF:
243+
if self.print_all:
244+
print(Style.BRIGHT + Fore.WHITE + "[" +
245+
Fore.RED + "-" +
246+
Fore.WHITE + "]" +
247+
Fore.GREEN + f" {self.result.site_name}:" +
248+
Fore.RED + " Blocked by bot detection" +
249+
Fore.YELLOW + " (proxy may help)")
241250

242251
else:
243252
# It should be impossible to ever get here...

0 commit comments

Comments
 (0)