Fix for cloud: auth key rename, and send SNI even when check_hostname…

…=False
edgedb · Feb 9, 2023 · 27e7a4f · 27e7a4f
1 parent 14363fb
commit 27e7a4f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/edgedb/blocking_client.py b/edgedb/blocking_client.py
@@ -61,14 +61,10 @@ async def connect_addr(self, addr, timeout):
                         raise TimeoutError
 
                     # Upgrade to TLS
-                    if self._params.ssl_ctx.check_hostname:
-                        server_hostname = addr[0]
-                    else:
-                        server_hostname = None
                     sock.settimeout(time_left)
                     try:
                         sock = self._params.ssl_ctx.wrap_socket(
-                            sock, server_hostname=server_hostname
+                            sock, server_hostname=addr[0]
                         )
                     except ssl.CertificateError as e:
                         raise con_utils.wrap_error(e) from e

diff --git a/edgedb/protocol/protocol.pyx b/edgedb/protocol/protocol.pyx
@@ -850,7 +850,7 @@ cdef class SansIOProtocol:
             'database': self.con_params.database,
         }
         if self.con_params.secret_key:
-            params['token'] = self.con_params.secret_key
+            params['secret_key'] = self.con_params.secret_key
         handshake_buf.write_int16(len(params))
         for k, v in params.items():
             handshake_buf.write_len_prefixed_utf8(k)