8000 Add support for socks proxy by gfreezy · Pull Request #338 · slackapi/python-slack-sdk · GitHub
[go: up one dir, main page]
Skip to content

Add support for socks proxy #338

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

Closed
gfreezy wants to merge 2 commits into from
Closed

Add support for socks proxy #338

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1990fb9
add support for socks proxy
gfreezy Jul 28, 2018
63c307e
proxy type defaults to http
gfreezy Jul 28, 2018
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
19 changes: 9 additions & 10 deletions slackclient/server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,21 +176,20 @@ def parse_slack_login_data(self, login_data, use_rtm_start):

def connect_slack_websocket(self, ws_url):
"""Uses http proxy if available"""
if self.proxies and "http" in self.proxies:
parts = parse_url(self.proxies["http"])
proxy_host, proxy_port = parts.host, parts.port
if self.proxies and 'http' in self.proxies:
parts = parse_url(self.proxies['http'])
proxy_type, proxy_host, proxy_port = parts.scheme, parts.host, parts.port
auth = parts.auth
proxy_auth = auth and auth.split(":")
else:
proxy_auth, proxy_port, proxy_host = None, None, None
proxy_type, proxy_auth, proxy_port, proxy_host = 'http', None, None, None

try:
self.websocket = create_connection(
ws_url,
http_proxy_host=proxy_host,
http_proxy_port=proxy_port,
http_proxy_auth=proxy_auth,
)
self.websocket = create_connection(ws_url,
proxy_type=proxy_type,
http_proxy_host=proxy_host,
http_proxy_port=proxy_port,
http_proxy_auth=proxy_auth)
self.connected = True
self.last_connected_at = time.time()
logging.debug("RTM connected")
Expand Down
0