cidoku/AO2XP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove cert check for secure websocket, who cares (famous last words)

Browse Source
This commit is contained in:
cidoku 2025-06-22 16:09:43 -04:00
parent 4cf0920aa1
commit ffc4052191
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AOsocket.py
View File

@ -58,8 +58,9 @@ class AOtcpSocket(object):
class AOwebSocket(object): class AOwebSocket(object):
def __init__(self): def __init__(self):
self.sock = websocket.WebSocket() self.sock = websocket.WebSocket(sslopt={"cert_reqs": ssl.CERT_NONE})
self.isWS = True self.isWS = True
self.isSecure = False
self.header = { self.header = {
"User-Agent": "AO2XP %s, Python %s, %s %s %s" % (GAME_VERSION, platform.python_version(), platform.system(), platform.release(), platform.machine()) "User-Agent": "AO2XP %s, Python %s, %s %s %s" % (GAME_VERSION, platform.python_version(), platform.system(), platform.release(), platform.machine())
} }
@ -70,6 +71,7 @@ class AOwebSocket(object):
try: try:
print "[debug]", "Trying secure websocket..." print "[debug]", "Trying secure websocket..."
self.sock.connect("wss://%s:%s" % (ip, secure_port), header=self.header) self.sock.connect("wss://%s:%s" % (ip, secure_port), header=self.header)
self.isSecure = True
except: except:
print "[debug]", "Connecting to secure websocket failed. Trying websocket..." print "[debug]", "Connecting to secure websocket failed. Trying websocket..."
self.sock.connect("ws://%s:%s" % (ip, port), header=self.header) self.sock.connect("ws://%s:%s" % (ip, port), header=self.header)

2
mainmenu.py
View File

@ -441,7 +441,7 @@ class AOServerInfo(QtCore.QThread):
self.setOnlinePlayers.emit("Couldn't retrieve players") self.setOnlinePlayers.emit("Couldn't retrieve players")
return return
print "[debug]", "Connected! websocket: %s" % self.tcp.isWS print "[debug]", "Connected! websocket: %s" % self.tcp.isWS + " (secure)" if self.tcp.isSecure else ""
self.tcp.sock.settimeout(0.1) self.tcp.sock.settimeout(0.1)
got_stuff = False got_stuff = False