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

Added proxy support for websocket connections #4635

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Added proxy support for websocket connections #4635

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a93c7f6
Added proxy support for websocket
kauppine Apr 9, 2021
121caad
Added missing proxy type
kauppine Apr 10, 2021
7f1119e
Replaced netloc with hostname
kauppine Apr 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 17 additions & 1 deletion lib/request/connect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,9 +506,25 @@ def getPage(**kwargs):
url = getBytes(url) # Note: Python3 requires text while Python2 has problems when mixing text with binary POST

if webSocket:
ws_proxy_port = None
ws_proxy_host = None
ws_proxy_auth = None
ws_proxy_scheme = None

if conf.proxy:
ws_proxy_uri = _urllib.parse.urlsplit(conf.proxy)
ws_proxy_port = ws_proxy_uri.port
ws_proxy_host = ws_proxy_uri.hostname
ws_proxy_scheme = ws_proxy_uri.scheme

if conf.proxyCred:
ws_proxy_auth = conf.proxyCred.split(":")

ws = websocket.WebSocket()
ws.settimeout(WEBSOCKET_INITIAL_TIMEOUT if kb.webSocketRecvCount is None else timeout)
ws.connect(url, header=("%s: %s" % _ for _ in headers.items() if _[0] not in ("Host",)), cookie=cookie) # WebSocket will add Host field of headers automatically
ws.connect(url, header=("%s: %s" % _ for _ in headers.items() if _[0] not in ("Host",)), cookie=cookie,
http_proxy_host=ws_proxy_host, http_proxy_port=ws_proxy_port,
http_proxy_auth=ws_proxy_auth, proxy_type=ws_proxy_scheme) # WebSocket will add Host field of headers automatically
ws.send(urldecode(post or ""))

_page = []
Expand Down