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

Make torrequest optional

Browse source
This commit is contained in:
Paul Pfeister 2024-06-30 22:49:16 -04:00
parent 501cb3dce2
commit efc6b12c65
No known key found for this signature in database
GPG key ID: 70D33A96CBD7A994
2 changed files with 12 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"

10
sherlock/sherlock.py
View file

@ -30,7 +30,6 @@ from .__init__ import ( # noqa: E402
) )
from requests_futures.sessions import FuturesSession # noqa: E402 from requests_futures.sessions import FuturesSession # noqa: E402
from torrequest import TorRequest # noqa: E402
from sherlock.result import QueryStatus # noqa: E402 from sherlock.result import QueryStatus # noqa: E402
from sherlock.result import QueryResult # noqa: E402 from sherlock.result import QueryResult # noqa: E402
from sherlock.notify import QueryNotify # noqa: E402 from sherlock.notify import QueryNotify # noqa: E402
@ -206,6 +205,15 @@ 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("> Dependencies for --tor and --unique-tor are now optional, and WILL BE DEPRECATED in a future release of Sherlock.")
print("> If you've installed Sherlock via pipx, you can install the dependency with `pipx install sherlock-project[tor]`.")
print("> Other packages should refer to their packager maintainer's documentation, or install separately with `pipx install torrequest`.\n")
sys.exit(query_notify.finish())
# Requests using Tor obfuscation # Requests using Tor obfuscation
try: try:
underlying_request = TorRequest() underlying_request = TorRequest()