This repository was archived by the owner on Mar 13, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 182
Add Websocket streaming support to base #33
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
# Copyright 2017 The Kubernetes Authors. | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
from .stream import stream |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
# Licensed under the Apache License, Version 2.0 (the "License"); you may | ||
# not use this file except in compliance with the License. You may obtain | ||
# a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
# License for the specific language governing permissions and limitations | ||
# under the License. | ||
|
||
from . import ws_client | ||
|
||
|
||
def stream(func, *args, **kwargs): | ||
"""Stream given API call using websocket""" | ||
|
||
def _intercept_request_call(*args, **kwargs): | ||
# old generated code's api client has config. new ones has | ||
# configuration | ||
try: | ||
config = func.__self__.api_client.configuration | ||
except AttributeError: | ||
config = func.__self__.api_client.config | ||
|
||
return ws_client.websocket_call(config, *args, **kwargs) | ||
|
||
prev_request = func.__self__.api_client.request | ||
try: | ||
func.__self__.api_client.request = _intercept_request_call | ||
return func(*args, **kwargs) | ||
finally: | ||
func.__self__.api_client.request = prev_request |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,265 @@ | ||
# Licensed under the Apache License, Version 2.0 (the "License"); you may | ||
# not use this file except in compliance with the License. You may obtain | ||
# a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
# License for the specific language governing permissions and limitations | ||
# under the License. | ||
|
||
from kubernetes.client.rest import ApiException | ||
|
||
import select | ||
import certifi | ||
import time | ||
import collections | ||
from websocket import WebSocket, ABNF, enableTrace | ||
import six | ||
import ssl | ||
from six.moves.urllib.parse import urlencode, quote_plus, urlparse, urlunparse | ||
|
||
STDIN_CHANNEL = 0 | ||
STDOUT_CHANNEL = 1 | ||
STDERR_CHANNEL = 2 | ||
ERROR_CHANNEL = 3 | ||
RESIZE_CHANNEL = 4 | ||
|
||
|
||
class WSClient: | ||
def __init__(self, configuration, url, headers): | ||
"""A websocket client with support for channels. | ||
|
||
Exec command uses different channels for different streams. for | ||
example, 0 is stdin, 1 is stdout and 2 is stderr. Some other API calls | ||
like port forwarding can forward different pods' streams to different | ||
channels. | ||
""" | ||
enableTrace(False) | ||
header = [] | ||
self._connected = False | ||
self._channels = {} | ||
self._all = "" | ||
|
||
# We just need to pass the Authorization, ignore all the other | ||
# http headers we get from the generated code | ||
if headers and 'authorization' in headers: | ||
header.append("authorization: %s" % headers['authorization']) | ||
|
||
if configuration.ws_streaming_protocol: | ||
header.append("Sec-WebSocket-Protocol: %s" % | ||
configuration.ws_streaming_protocol) | ||
|
||
if url.startswith('wss://') and configuration.verify_ssl: | ||
ssl_opts = { | ||
'cert_reqs': ssl.CERT_REQUIRED, | ||
'ca_certs': configuration.ssl_ca_cert or certifi.where(), | ||
} | ||
if configuration.assert_hostname is not None: | ||
ssl_opts['check_hostname'] = configuration.assert_hostname | ||
else: | ||
ssl_opts = {'cert_reqs': ssl.CERT_NONE} | ||
|
||
if configuration.cert_file: | ||
ssl_opts['certfile'] = configuration.cert_file | ||
if configuration.key_file: | ||
ssl_opts['keyfile'] = configuration.key_file | ||
|
||
self.sock = WebSocket(sslopt=ssl_opts, skip_utf8_validation=False) | ||
self.sock.connect(url, header=header) | ||
self._connected = True | ||
|
||
def peek_channel(self, channel, timeout=0): | ||
"""Peek a channel and return part of the input, | ||
empty string otherwise.""" | ||
self.update(timeout=timeout) | ||
if channel in self._channels: | ||
return self._channels[channel] | ||
return "" | ||
|
||
def read_channel(self, channel, timeout=0): | ||
"""Read data from a channel.""" | ||
if channel not in self._channels: | ||
ret = self.peek_channel(channel, timeout) | ||
else: | ||
ret = self._channels[channel] | ||
if channel in self._channels: | ||
del self._channels[channel] | ||
return ret | ||
|
||
def readline_channel(self, channel, timeout=None): | ||
"""Read a line from a channel.""" | ||
if timeout is None: | ||
timeout = float("inf") | ||
start = time.time() | ||
while self.is_open() and time.time() - start < timeout: | ||
if channel in self._channels: | ||
data = self._channels[channel] | ||
if "\n" in data: | ||
index = data.find("\n") | ||
ret = data[:index] | ||
data = data[index+1:] | ||
if data: | ||
self._channels[channel] = data | ||
else: | ||
del self._channels[channel] | ||
return ret | ||
self.update(timeout=(timeout - time.time() + start)) | ||
|
||
def write_channel(self, channel, data): | ||
"""Write data to a channel.""" | ||
self.sock.send(chr(channel) + data) | ||
|
||
def peek_stdout(self, timeout=0): | ||
"""Same as peek_channel with channel=1.""" | ||
return self.peek_channel(STDOUT_CHANNEL, timeout=timeout) | ||
|
||
def read_stdout(self, timeout=None): | ||
"""Same as read_channel with channel=1.""" | ||
return self.read_channel(STDOUT_CHANNEL, timeout=timeout) | ||
|
||
def readline_stdout(self, timeout=None): | ||
"""Same as readline_channel with channel=1.""" | ||
return self.readline_channel(STDOUT_CHANNEL, timeout=timeout) | ||
|
||
def peek_stderr(self, timeout=0): | ||
"""Same as peek_channel with channel=2.""" | ||
return self.peek_channel(STDERR_CHANNEL, timeout=timeout) | ||
|
||
def read_stderr(self, timeout=None): | ||
"""Same as read_channel with channel=2.""" | ||
return self.read_channel(STDERR_CHANNEL, timeout=timeout) | ||
|
||
def readline_stderr(self, timeout=None): | ||
"""Same as readline_channel with channel=2.""" | ||
return self.readline_channel(STDERR_CHANNEL, timeout=timeout) | ||
|
||
def read_all(self): | ||
"""Return buffered data received on stdout and stderr channels. | ||
This is useful for non-interactive call where a set of command passed | ||
to the API call and their result is needed after the call is concluded. | ||
Should be called after run_forever() or update() | ||
|
||
TODO: Maybe we can process this and return a more meaningful map with | ||
channels mapped for each input. | ||
""" | ||
out = self._all | ||
self._all = "" | ||
self._channels = {} | ||
return out | ||
|
||
def is_open(self): | ||
"""True if the connection is still alive.""" | ||
return self._connected | ||
|
||
def write_stdin(self, data): | ||
"""The same as write_channel with channel=0.""" | ||
self.write_channel(STDIN_CHANNEL, data) | ||
|
||
def update(self, timeout=0): | ||
"""Update channel buffers with at most one complete frame of input.""" | ||
if not self.is_open(): | ||
return | ||
if not self.sock.connected: | ||
self._connected = False | ||
return | ||
r, _, _ = select.select( | ||
(self.sock.sock, ), (), (), timeout) | ||
if r: | ||
op_code, frame = self.sock.recv_data_frame(True) | ||
if op_code == ABNF.OPCODE_CLOSE: | ||
self._connected = False | ||
return | ||
elif op_code == ABNF.OPCODE_BINARY or op_code == ABNF.OPCODE_TEXT: | ||
data = frame.data | ||
if six.PY3: | ||
data = data.decode("utf-8") | ||
if len(data) > 1: | ||
channel = ord(data[0]) | ||
data = data[1:] | ||
if data: | ||
if channel in [STDOUT_CHANNEL, STDERR_CHANNEL]: | ||
# keeping all messages in the order they received for | ||
# non-blocking call. | ||
self._all += data | ||
if channel not in self._channels: | ||
self._channels[channel] = data | ||
else: | ||
self._channels[channel] += data | ||
|
||
def run_forever(self, timeout=None): | ||
"""Wait till connection is closed or timeout reached. Buffer any input | ||
received during this time.""" | ||
if timeout: | ||
start = time.time() | ||
while self.is_open() and time.time() - start < timeout: | ||
self.update(timeout=(timeout - time.time() + start)) | ||
else: | ||
while self.is_open(): | ||
self.update(timeout=None) | ||
|
||
def close(self, **kwargs): | ||
""" | ||
close websocket connection. | ||
""" | ||
self._connected = False | ||
if self.sock: | ||
self.sock.close(**kwargs) | ||
|
||
|
||
WSResponse = collections.namedtuple('WSResponse', ['data']) | ||
|
||
|
||
def get_websocket_url(url): | ||
parsed_url = urlparse(url) | ||
parts = list(parsed_url) | ||
if parsed_url.scheme == 'http': | ||
parts[0] = 'ws' | ||
elif parsed_url.scheme == 'https': | ||
parts[0] = 'wss' | ||
return urlunparse(parts) | ||
|
||
|
||
def websocket_call(configuration, *args, **kwargs): | ||
"""An internal function to be called in api-client when a websocket | ||
connection is required. args and kwargs are the parameters of | ||
apiClient.request method.""" | ||
|
||
url = args[1] | ||
query_params = kwargs.get("query_params", {}) | ||
_request_timeout = kwargs.get("_request_timeout", 60) | ||
_preload_content = kwargs.get("_preload_content", True) | ||
headers = kwargs.get("headers") | ||
|
||
# Extract the command from the list of tuples | ||
commands = None | ||
for key, value in query_params: | ||
if key == 'command': | ||
commands = value | ||
break | ||
|
||
# drop command from query_params as we will be processing it separately | ||
query_params = [(key, value) for key, value in query_params if | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Not required if using pop |
||
key != 'command'] | ||
|
||
# if we still have query params then encode them | ||
if query_params: | ||
url += '?' + urlencode(query_params) | ||
|
||
# tack on the actual command to execute at the end | ||
if isinstance(commands, list): | ||
for command in commands: | ||
url += "&command=%s&" % quote_plus(command) | ||
elif commands is not None: | ||
url += '&command=' + quote_plus(commands) | ||
|
||
try: | ||
client = WSClient(configuration, get_websocket_url(url), headers) | ||
if not _preload_content: | ||
return client | ||
client.run_forever(timeout=_request_timeout) | ||
return WSResponse('%s' % ''.join(client.read_all())) | ||
except (Exception, KeyboardInterrupt, SystemExit) as e: | ||
raise ApiException(status=0, reason=str(e)) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
# Copyright 2017 The Kubernetes Authors. | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
import unittest | ||
|
||
from .ws_client import get_websocket_url | ||
|
||
|
||
class WSClientTest(unittest.TestCase): | ||
|
||
def test_websocket_client(self): | ||
for url, ws_url in [ | ||
('http://localhost/api', 'ws://localhost/api'), | ||
('https://localhost/api', 'wss://localhost/api'), | ||
('https://domain.com/api', 'wss://domain.com/api'), | ||
('https://api.domain.com/api', 'wss://api.domain.com/api'), | ||
('http://api.domain.com', 'ws://api.domain.com'), | ||
('https://api.domain.com', 'wss://api.domain.com'), | ||
('http://api.domain.com/', 'ws://api.domain.com/'), | ||
('https://api.domain.com/', 'wss://api.domain.com/'), | ||
]: | ||
self.assertEqual(get_websocket_url(url), ws_url) | ||
|
||
|
||
if __name__ == '__main__': | ||
unittest.main() |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can be written as comands = query_params.pop('command', None)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is an already reviewed code. I will fix it anyway :) I am blocked on this. so I will create a new PR for improvements on ws_client.py and merge this one. I assume you are done with the other files?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
query_params is a list of tuples. pop does not work the way you expected it to work. It is possible to probably make it work, but I would like to ask you to ignore ws_client* files as they are copied from main repo. If we need to improve them, we need to create a separate PR/issue for it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@mbohlool yes done with other files. Sorry for the mess.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No mess. My main repo PR was blocked on this. I will send it your (and @dims) way.