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.

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

Added patch to fix ssl.wrap_socket error #170

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion LGTV/auth.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from ws4py.client.threadedclient import WebSocketClient
# from ws4py.client.threadedclient import WebSocketClient
from .ws4py_patch import WebSocketClientPatch as WebSocketClient
from getmac import get_mac_address
import subprocess
import socket
Expand Down
3 changes: 2 additions & 1 deletion LGTV/cursor.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
from time import sleep

from .remote import LGTVRemote
from ws4py.client.threadedclient import WebSocketClient
# from ws4py.client.threadedclient import WebSocketClient
from .ws4py_patch import WebSocketClientPatch as WebSocketClient


class LGTVCursor(WebSocketClient):
Expand Down
3 changes: 2 additions & 1 deletion LGTV/remote.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from ws4py.client.threadedclient import WebSocketClient
# from ws4py.client.threadedclient import WebSocketClient
from .ws4py_patch import WebSocketClientPatch as WebSocketClient
from types import FunctionType
from urllib.parse import parse_qs, urlparse
from wakeonlan import send_magic_packet
Expand Down
55 changes: 55 additions & 0 deletions LGTV/ws4py_patch.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
from ws4py.client.threadedclient import WebSocketClient
import ssl

class WebSocketClientPatch(WebSocketClient):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)

def connect(self):
"""
Connects this websocket and starts the upgrade handshake
with the remote endpoint.
"""
if self.scheme == "wss":
# default port is now 443; upgrade self.sender to send ssl
context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
if self.ssl_options.get('certfile', None):
context.load_cert_chain(self.ssl_options.get('certfile'), self.ssl_options.get('keyfile'))
# Prevent check_hostname requires server_hostname (ref #187)
if "cert_reqs" not in self.ssl_options:
context.check_hostname = False
context.verify_mode = ssl.CERT_NONE
self.sock = context.wrap_socket(self.sock)
self._is_secure = True

self.sock.connect(self.bind_addr)

self._write(self.handshake_request)

response = b''
doubleCLRF = b'\r\n\r\n'
while True:
bytes = self.sock.recv(128)
if not bytes:
break
response += bytes
if doubleCLRF in response:
break

if not response:
self.close_connection()
raise HandshakeError("Invalid response")

headers, _, body = response.partition(doubleCLRF)
response_line, _, headers = headers.partition(b'\r\n')

try:
self.process_response_line(response_line)
self.protocols, self.extensions = self.process_handshake_header(headers)
except HandshakeError:
self.close_connection()
raise

self.handshake_ok()
if body:
self.process(body)