Skip to content

fix(core): honor tor rotation interval and override IP wiring #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mkilijanek wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(core): honor tor rotation interval and override IP wiring #18

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 23 additions & 6 deletions core/interceptor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1068,12 +1068,19 @@ def _get_delay(self, response: InterceptedResponse) -> float:


class Magic:
def __init__(self, tcp: Optional[TCPOptionsManipulator] = None, tls: Optional[TLSFingerprinter] = None, tor: Optional[TorRotator] = None):
def __init__(
self,
tcp: Optional[TCPOptionsManipulator] = None,
tls: Optional[TLSFingerprinter] = None,
tor: Optional[TorRotator] = None,
rotate_every: int = 1,
):
self._tcp = tcp or TCPOptionsManipulator()
self._tls = tls or TLSFingerprinter()
self._tor = tor or TorRotator()
self._lock = threading.Lock()
self._request_count = 0
self._rotate_every = max(1, rotate_every)

def apply(self, technique: str = "") -> Dict[str, Any]:
with self._lock:
Expand All @@ -1085,7 +1092,7 @@ def apply(self, technique: str = "") -> Dict[str, Any]:
"tls": {"session": tls_sess, "identifier": tls_id},
"tor": {},
}
if technique == "ip_rotation" or self._tor.should_rotate(self._request_count):
if technique == "ip_rotation" or self._tor.should_rotate(self._request_count, self._rotate_every):
if self._tor.is_tor_alive():
ok, ip = self._tor.rotate_and_verify()
result["tor"] = {"active": ok, "ip": ip, "proxies": self._tor.get_proxy_dict()}
Expand Down Expand Up @@ -1163,7 +1170,11 @@ def __init__(
self._proxy_rotator = ProxyRotator(proxy_urls=upstream_proxies) if upstream_proxies else None

self.ca = CertificateAuthority()
self._handshaker = MITMHandshaker(self.ca, proxy_rotator=self._proxy_rotator)
self._handshaker = MITMHandshaker(
self.ca,
override_ip=self._override_ip,
proxy_rotator=self._proxy_rotator,
)
self._forwarder = Forwarder()

self._tor = TorRotator(
Expand All @@ -1173,7 +1184,12 @@ def __init__(
)
self._tcp_manip = TCPOptionsManipulator()
self._tls_fp = TLSFingerprinter()
self._magic = Magic(tcp=self._tcp_manip, tls=self._tls_fp, tor=self._tor)
self._magic = Magic(
tcp=self._tcp_manip,
tls=self._tls_fp,
tor=self._tor,
rotate_every=tor_rotate_every,
)
self._advisor = ResponseAdvisor(self._magic)

self.intercept_https = intercept_https
Expand Down Expand Up @@ -1216,7 +1232,8 @@ def _process_http_request(self, req: InterceptedRequest) -> InterceptedResponse:
req.host = host
req.port = port

sock = self._create_upstream_connection(host, port, timeout=30)
connect_host = self._override_ip or host
sock = self._create_upstream_connection(connect_host, port, timeout=30)

if parsed.scheme == "https":
ctx = TLSContextFactory.client_context(alpn=["http/1.1"])
Expand Down Expand Up @@ -1508,4 +1525,4 @@ def create_interceptor(
target_host=target_host,
upstream_proxies=upstream_proxies,
)