Skip to content
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

Jump to bottom

fixs socks5 getaddrinfo&dns leak, and enable auth #1195

Merged
merged 1 commit into from
Nov 16, 2022
Merged

fixs socks5 getaddrinfo&dns leak, and enable auth #1195

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
24 changes: 10 additions & 14 deletions PixivBrowserFactory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ class PixivBrowser(mechanize.Browser):
_locale = ""

_is_logged_in_to_FANBOX = False
_orig_getaddrinfo = None

__oauth_manager = None

Expand Down Expand Up @@ -113,12 +112,6 @@ def back(self):
mechanize.Browser.back(self)
return

def getaddrinfo(self, *args):
try:
return self._orig_getaddrinfo(*args)
except socket.gaierror:
return [(socket.AF_INET, socket.SOCK_STREAM, 6, '', (args[0], args[1]))]

def _configureBrowser(self, config):
if config is None:
PixivHelper.get_logger().info("No config given")
Expand All @@ -133,17 +126,20 @@ def _configureBrowser(self, config):
if config.proxyAddress.startswith('socks'):
parseResult = urllib.parse.urlparse(config.proxyAddress)
assert parseResult.scheme and parseResult.hostname and parseResult.port
socksType = socks.PROXY_TYPE_SOCKS5 if parseResult.scheme == 'socks5' else socks.PROXY_TYPE_SOCKS4
PixivHelper.get_logger().info(f"Using SOCKS5 Proxy= {parseResult.hostname}:{parseResult.port}")
socksType = socks.PROXY_TYPE_SOCKS5 if 'socks5' in parseResult.scheme else socks.PROXY_TYPE_SOCKS4
PixivHelper.get_logger().info(f"Using SOCKS5 Proxy= {parseResult.hostname}:{parseResult.port} @ {parseResult.username}")

# https://stackoverflow.com/a/14512227
socks.setdefaultproxy(socksType, parseResult.hostname, parseResult.port)
socks.setdefaultproxy(socksType, parseResult.hostname, parseResult.port,
True, parseResult.username, parseResult.password)
socket.socket = socks.socksocket

# https://github.com/Nandaka/PixivUtil2/issues/592#issuecomment-659516296
if self._orig_getaddrinfo is None:
self._orig_getaddrinfo = socket.getaddrinfo
socket.getaddrinfo = self._orig_getaddrinfo
# https://stackoverflow.com/a/13214222 and
# https://github.com/Anorov/PySocks/issues/22
def getaddrinfo(*args):
return [(socket.AF_INET, socket.SOCK_STREAM, 6, '', (args[0], args[1]))]
self._orig_getaddrinfo = socket.getaddrinfo
socket.getaddrinfo = getaddrinfo

else:
self.set_proxies(config.proxy)
Expand Down