Mirrors/sherlock
2
0
Fork 0
mirror of https://github.com/sherlock-project/sherlock synced 2024-11-22 20:03:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix Slides F+, Add multi err code support

Browse source 
Error codes module expanded to support arrays of error codes rather than only one.
Using this new functionality, Slides was set to error codes 404 (as standard) AND 204 (non standard), to accomodate for that website's odd edge case.
This commit is contained in:
Paul Pfeister 2024-04-08 23:19:50 -04:00
parent eb89787dcd
commit e6d0f1ee7b
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
sherlock/resources/data.json
View file

@ -1757,6 +1757,7 @@
"username_claimed": "blue" "username_claimed": "blue"
}, },
"Slides": { "Slides": {
"errorCode": [204, 404],
"errorType": "status_code", "errorType": "status_code",
"url": "https://slides.com/{}", "url": "https://slides.com/{}",
"urlMain": "https://slides.com/", "urlMain": "https://slides.com/",

14
sherlock/sherlock.py
View file

@ -351,7 +351,6 @@ def sherlock(
# Get the expected error type # Get the expected error type
error_type = net_info["errorType"] error_type = net_info["errorType"]
error_code = net_info.get("errorCode")
# Retrieve future and ensure it has finished # Retrieve future and ensure it has finished
future = net_info["request_future"] future = net_info["request_future"]
@ -407,14 +406,19 @@ def sherlock(
else: else:
query_status = QueryStatus.AVAILABLE query_status = QueryStatus.AVAILABLE
elif error_type == "status_code": elif error_type == "status_code":
# Checks if the Status Code is equal to the optional "errorCode" given in 'data.json'
if error_code == r.status_code:
query_status = QueryStatus.AVAILABLE query_status = QueryStatus.AVAILABLE
error_codes = net_info.get("errorCode")
if error_codes: # (if set in data.json)
if isinstance(error_codes, int):
if error_codes != r.status_code:
query_status = QueryStatus.CLAIMED
else:
if r.status_code not in error_codes:
query_status = QueryStatus.CLAIMED
# Checks if the status code of the response is 2XX # Checks if the status code of the response is 2XX
elif not r.status_code >= 300 or r.status_code < 200: elif not r.status_code >= 300 or r.status_code < 200:
query_status = QueryStatus.CLAIMED query_status = QueryStatus.CLAIMED
else:
query_status = QueryStatus.AVAILABLE
elif error_type == "response_url": elif error_type == "response_url":
# For this detection method, we have turned off the redirect. # For this detection method, we have turned off the redirect.
# So, there is no need to check the response URL: it will always # So, there is no need to check the response URL: it will always