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

Merge branch '2130-torrequest' into release/0.15.0-rc2

Browse source
This commit is contained in:
Paul Pfeister 2024-07-08 04:56:21 -04:00
commit 930ed2ac7c
No known key found for this signature in database
GPG key ID: 70D33A96CBD7A994
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pyproject.toml
View file

@ -52,6 +52,9 @@ torrequest = "^0.1.0"
pandas = ">=1.0.0,<3.0.0" pandas = ">=1.0.0,<3.0.0"
openpyxl = "^3.0.10" openpyxl = "^3.0.10"
[tool.poetry.extras]
tor = ["torrequest"]
[tool.poetry.group.dev.dependencies] [tool.poetry.group.dev.dependencies]
jsonschema = "^4.0.0" jsonschema = "^4.0.0"

14
sherlock_project/sherlock.py
View file

@ -10,7 +10,7 @@ networks.
import sys import sys
try: try:
from sherlock.__init__ import import_error_test_var # noqa: F401 from sherlock_project.__init__ import import_error_test_var # noqa: F401
except ImportError: except ImportError:
print("Did you run Sherlock with `python3 sherlock/sherlock.py ...`?") print("Did you run Sherlock with `python3 sherlock/sherlock.py ...`?")
print("This is an outdated method. Please see https://sherlockproject.xyz/installation for up to date instructions.") print("This is an outdated method. Please see https://sherlockproject.xyz/installation for up to date instructions.")
@ -211,6 +211,18 @@ def sherlock(
query_notify.start(username) query_notify.start(username)
# Create session based on request methodology # Create session based on request methodology
if tor or unique_tor: if tor or unique_tor:
try:
from torrequest import TorRequest # noqa: E402
except ImportError:
print("Important!")
print("> --tor and --unique-tor are now DEPRECATED, and may be removed in a future release of Sherlock.")
print("> If you've installed Sherlock via pip, you can include the optional dependency via `pip install 'sherlock-project[tor]'`.")
print("> Other packages should refer to their documentation, or install it separately with `pip install torrequest`.\n")
sys.exit(query_notify.finish())
print("Important!")
print("> --tor and --unique-tor are now DEPRECATED, and may be removed in a future release of Sherlock.")
# Requests using Tor obfuscation # Requests using Tor obfuscation
try: try:
underlying_request = TorRequest() underlying_request = TorRequest()