Compare commits
10 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4e401b2de1 | ||
|
|
f8367c12c8 | ||
|
|
0955c897bc | ||
|
|
acf3bb6be7 | ||
|
|
58de3beeb8 | ||
|
|
e2b4599e94 | ||
|
|
921c441f9a | ||
|
|
28e8651598 | ||
|
|
037befa756 | ||
|
|
fe91eabcca |
4 changed files with 27 additions and 43 deletions
4
.gitignore
vendored
4
.gitignore
vendored
|
|
@ -1,3 +1 @@
|
|||
/sherlock-501cb3d.tar.gz
|
||||
/v0.15.0.tar.gz
|
||||
/sherlock-0.15.0.tar.gz
|
||||
/sherlock-*.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,26 +1,17 @@
|
|||
From c5e54735240cdcfca9cf39ee5866e11b4259aabf Mon Sep 17 00:00:00 2001
|
||||
From: Paul Pfeister <code@pfeister.dev>
|
||||
Date: Thu, 25 Jul 2024 16:29:29 -0400
|
||||
Subject: [PATCH] Remove tor
|
||||
|
||||
---
|
||||
sherlock_project/sherlock.py | 64 ++----------------------------------
|
||||
1 file changed, 2 insertions(+), 62 deletions(-)
|
||||
|
||||
diff --git a/sherlock_project/sherlock.py b/sherlock_project/sherlock.py
|
||||
index 031768d..f32668f 100644
|
||||
index 250175a..09caca4 100644
|
||||
--- a/sherlock_project/sherlock.py
|
||||
+++ b/sherlock_project/sherlock.py
|
||||
@@ -170,8 +170,6 @@ def sherlock(
|
||||
username,
|
||||
site_data,
|
||||
@@ -171,8 +171,6 @@ def sherlock(
|
||||
username: str,
|
||||
site_data: dict[str, dict[str, str]],
|
||||
query_notify: QueryNotify,
|
||||
- tor: bool = False,
|
||||
- unique_tor: bool = False,
|
||||
dump_response: bool = False,
|
||||
proxy=None,
|
||||
timeout=60,
|
||||
@@ -187,8 +185,6 @@ def sherlock(
|
||||
proxy: Optional[str] = None,
|
||||
timeout: int = 60,
|
||||
@@ -188,8 +186,6 @@ def sherlock(
|
||||
query_notify -- Object with base type of QueryNotify().
|
||||
This will be used to notify the caller about
|
||||
query results.
|
||||
|
|
@ -29,7 +20,7 @@ index 031768d..f32668f 100644
|
|||
proxy -- String indicating the proxy URL
|
||||
timeout -- Time in seconds to wait before timing out request.
|
||||
Default is 60 seconds.
|
||||
@@ -210,31 +206,9 @@ def sherlock(
|
||||
@@ -211,31 +207,9 @@ def sherlock(
|
||||
# Notify caller that we are starting the query.
|
||||
query_notify.start(username)
|
||||
# Create session based on request methodology
|
||||
|
|
@ -63,7 +54,7 @@ index 031768d..f32668f 100644
|
|||
|
||||
# Limit number of workers to 20.
|
||||
# This is probably vastly overkill.
|
||||
@@ -358,10 +332,6 @@ def sherlock(
|
||||
@@ -359,10 +333,6 @@ def sherlock(
|
||||
# Store future in data for access later
|
||||
net_info["request_future"] = future
|
||||
|
||||
|
|
@ -74,7 +65,7 @@ index 031768d..f32668f 100644
|
|||
# Add this site's results into final dictionary with all the other results.
|
||||
results_total[social_network] = results_site
|
||||
|
||||
@@ -593,22 +563,6 @@ def main():
|
||||
@@ -596,22 +566,6 @@ def main():
|
||||
dest="output",
|
||||
help="If using single username, the output of the result will be saved to this file.",
|
||||
)
|
||||
|
|
@ -97,7 +88,7 @@ index 031768d..f32668f 100644
|
|||
parser.add_argument(
|
||||
"--csv",
|
||||
action="store_true",
|
||||
@@ -736,22 +690,10 @@ def main():
|
||||
@@ -755,22 +709,10 @@ def main():
|
||||
except Exception as error:
|
||||
print(f"A problem occurred while checking for an update: {error}")
|
||||
|
||||
|
|
@ -120,7 +111,7 @@ index 031768d..f32668f 100644
|
|||
if args.no_color:
|
||||
# Disable color output.
|
||||
init(strip=True, convert=False)
|
||||
@@ -830,8 +772,6 @@ def main():
|
||||
@@ -871,8 +813,6 @@ def main():
|
||||
username,
|
||||
site_data,
|
||||
query_notify,
|
||||
|
|
@ -129,6 +120,3 @@ index 031768d..f32668f 100644
|
|||
dump_response=args.dump_response,
|
||||
proxy=args.proxy,
|
||||
timeout=args.timeout,
|
||||
--
|
||||
2.45.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,33 +1,35 @@
|
|||
# Packager: Paul Pfeister <code@pfeister.dev> (GitHub @ppfeister)
|
||||
%global forgeurl https://github.com/sherlock-project/sherlock
|
||||
Version: 0.16.0
|
||||
%forgemeta
|
||||
Name: sherlock-project
|
||||
Version: 0.15.0
|
||||
Release: %autorelease
|
||||
Summary: Hunt down social media accounts by username across social networks
|
||||
|
||||
License: MIT
|
||||
URL: https://github.com/sherlock-project/sherlock
|
||||
Source: %{url}/archive/v%{version}/sherlock-%{version}.tar.gz
|
||||
URL: %{forgeurl}
|
||||
Source: %{forgesource}
|
||||
|
||||
Patch0: 0001-Remove-tor.patch
|
||||
|
||||
BuildArch: noarch
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: help2man
|
||||
BuildRequires: python3-devel
|
||||
|
||||
%global _description %{expand:
|
||||
Hunt down social media accounts by username across 400+ social networks and
|
||||
websites. New targets are tested and implemented regularly.
|
||||
}
|
||||
websites. New targets are tested and implemented regularly.}
|
||||
|
||||
%description %{_description}
|
||||
|
||||
|
||||
%prep
|
||||
%autosetup -p1 -n sherlock-%{version}
|
||||
%forgeautosetup -p1
|
||||
sed -i '/torrequest/d' 'pyproject.toml' # Pending upstream removal
|
||||
|
||||
%generate_buildrequires
|
||||
%pyproject_buildrequires -t -x dev
|
||||
# Relax requirements on pandas and requests, since Fedora Rawhide has newer versions
|
||||
# Also remove torrequest since we patch out tor.
|
||||
sed -i 's/pandas = "\^2.2.1"/pandas = ">=2.2.1"/' pyproject.toml
|
||||
%pyproject_buildrequires -t
|
||||
|
||||
|
||||
%build
|
||||
|
|
@ -66,8 +68,4 @@ PYTHONPATH='%{buildroot}%{python3_sitelib}' help2man \
|
|||
|
||||
|
||||
%changelog
|
||||
* Mon Jul 08 2024 Paul Pfeister <code@pfeister.dev> - 0.15.0-1
|
||||
- Importable module renamed to sherlock_project (see Debian 1072733).
|
||||
- --dump-response flag added to aid in debugging.
|
||||
* Tue May 14 2024 Paul Pfeister <code@pfeister.dev> - 0.14.4-1
|
||||
- Initial package.
|
||||
%autochangelog
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (sherlock-0.15.0.tar.gz) = 9b926e0c4226f669b5549b3f7984a070c063d56e067a8b222e749d79c470d37430cc7615e9d38728833caf6e88cbee3788c10c9ae9dfcdc38dc9e6f73adc3b76
|
||||
SHA512 (sherlock-0.16.0.tar.gz) = 0adba141dde2bde1603ff2a35ae01ddc427d08de777469bccb8b82f8f6635482d20581f2e8eed5bfa5df93bfefa23c4ff2faeed7d8e99b3f3a1a8c32180f96f6
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue