secstate/Iris
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Removing select_subptotocol as it breaks in tornado 5+; Include nano

Browse Source
This commit is contained in:
James Barnsley
2019-10-13 10:51:12 +13:00
parent 0c55665fd6
commit 103bcd5ba4
2 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile
View File

@ -1,5 +1,7 @@
FROM debian:buster-slim FROM debian:buster-slim
COPY . /iris
RUN set -ex \ RUN set -ex \
# Official Mopidy install for Debian/Ubuntu along with some extensions # Official Mopidy install for Debian/Ubuntu along with some extensions
# (see https://docs.mopidy.com/en/latest/installation/debian/ ) # (see https://docs.mopidy.com/en/latest/installation/debian/ )
@ -15,6 +17,7 @@ RUN set -ex \
python-pykka \ python-pykka \
python-tornado \ python-tornado \
git \ git \
nano \
&& curl -L https://apt.mopidy.com/mopidy.gpg | apt-key add - \ && curl -L https://apt.mopidy.com/mopidy.gpg | apt-key add - \
&& curl -L https://apt.mopidy.com/mopidy.list -o /etc/apt/sources.list.d/mopidy.list \ && curl -L https://apt.mopidy.com/mopidy.list -o /etc/apt/sources.list.d/mopidy.list \
&& apt-get update \ && apt-get update \

14
mopidy_iris/handlers.py
View File

@ -16,20 +16,6 @@ class WebsocketHandler(tornado.websocket.WebSocketHandler):
def check_origin(self, origin): def check_origin(self, origin):
return True return True
def select_subprotocol(self, subprotocols):
# select one of our subprotocol elements and return it. This confirms the connection has been accepted.
protocols = mem.iris.digest_protocol(subprotocols)
# if we've auto-generated some ids, the provided subprotocols was a string, so just return it right back
# this allows a connection to be completed
if protocols['generated']:
return subprotocols[0]
# otherwise, just return one of the supplied subprotocols
else:
return protocols['client_id']
def open(self): def open(self):