heckyel/yt-local
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add setting for tor_port

Browse Source
This commit is contained in:
user938120 2020-09-19 12:23:30 +00:00
parent 753f6c5389
commit 3ffe5d0120
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server.py
View File

@ -164,5 +164,5 @@ if settings.allow_foreign_addresses:
else: else:
server = WSGIServer(('127.0.0.1', settings.port_number), site_dispatch, server = WSGIServer(('127.0.0.1', settings.port_number), site_dispatch,
log=FilteredRequestLog()) log=FilteredRequestLog())
print('Started httpserver on port ' , settings.port_number) print('Started httpserver on port' , settings.port_number)
server.serve_forever() server.serve_forever()

6
settings.py
View File

@ -22,6 +22,12 @@ SETTINGS_INFO = collections.OrderedDict([
], ],
}), }),
('tor_port', {
'type': int,
'default': 9150,
'comment': '',
}),
('port_number', { ('port_number', {
'type': int, 'type': int,
'default': 8080, 'default': 8080,

6
youtube/util.py
View File

@ -54,7 +54,7 @@ URL_ORIGIN = "/https://www.youtube.com"
connection_pool = urllib3.PoolManager(cert_reqs = 'CERT_REQUIRED') connection_pool = urllib3.PoolManager(cert_reqs = 'CERT_REQUIRED')
old_tor_connection_pool = None old_tor_connection_pool = None
tor_connection_pool = urllib3.contrib.socks.SOCKSProxyManager('socks5://127.0.0.1:9150/', cert_reqs = 'CERT_REQUIRED') tor_connection_pool = urllib3.contrib.socks.SOCKSProxyManager('socks5://127.0.0.1:' + str(settings.tor_port) + '/', cert_reqs = 'CERT_REQUIRED')
tor_pool_refresh_time = time.monotonic() # prevent problems due to clock changes tor_pool_refresh_time = time.monotonic() # prevent problems due to clock changes
@ -74,7 +74,7 @@ def get_pool(use_tor):
# Keep a reference for 5 min to avoid it getting garbage collected while sockets still in use # Keep a reference for 5 min to avoid it getting garbage collected while sockets still in use
old_tor_connection_pool = tor_connection_pool old_tor_connection_pool = tor_connection_pool
tor_connection_pool = urllib3.contrib.socks.SOCKSProxyManager('socks5://127.0.0.1:9150/', cert_reqs = 'CERT_REQUIRED') tor_connection_pool = urllib3.contrib.socks.SOCKSProxyManager('socks5://127.0.0.1:' + str(settings.tor_port) + '/', cert_reqs = 'CERT_REQUIRED')
tor_pool_refresh_time = current_time tor_pool_refresh_time = current_time
return tor_connection_pool return tor_connection_pool
@ -156,7 +156,7 @@ def fetch_url_response(url, headers=(), timeout=15, data=None,
cookie_processor = HTTPAsymmetricCookieProcessor(cookiejar_send=cookiejar_send, cookiejar_receive=cookiejar_receive) cookie_processor = HTTPAsymmetricCookieProcessor(cookiejar_send=cookiejar_send, cookiejar_receive=cookiejar_receive)
if use_tor and settings.route_tor: if use_tor and settings.route_tor:
opener = urllib.request.build_opener(sockshandler.SocksiPyHandler(socks.PROXY_TYPE_SOCKS5, "127.0.0.1", 9150), cookie_processor) opener = urllib.request.build_opener(sockshandler.SocksiPyHandler(socks.PROXY_TYPE_SOCKS5, "127.0.0.1", settings.tor_port), cookie_processor)
else: else:
opener = urllib.request.build_opener(cookie_processor) opener = urllib.request.build_opener(cookie_processor)