itsscb/sqlx
1
0
Fork 0
mirror of https://github.com/launchbadge/sqlx.git synced 2026-03-27 13:46:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix some behaviors with TLS in MySQL

Browse Source
This commit is contained in:
Austin Bonander
2020-01-13 20:42:49 -08:00
parent d129dead81
commit c92ee619c3
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sqlx-core/src/mysql/connection.rs
View File

@@ -206,6 +206,10 @@ impl MySqlConnection {
client_capabilities |= Capabilities::CONNECT_WITH_DB;
}
if cfg!(feature = "tls") {
client_capabilities |= Capabilities::SSL;
}
self.capabilities =
(client_capabilities & handshake.server_capabilities) | Capabilities::PROTOCOL_41;
@@ -462,7 +466,7 @@ impl MySqlConnection {
// try to upgrade
#[cfg(feature = "tls")]
"PREFERRED" => if let Err(e) = self_.try_ssl(&url, None, true).await {
log::warn!("server does not support TLS");
log::warn!("TLS handshake failed, falling back to insecure: {}", e);
// fallback, redo connection
self_ = Self::new(&url).await?;
handshake = self_.receive_handshake(&url).await?;

6
sqlx-core/src/mysql/protocol/ssl_request.rs
View File

@@ -14,9 +14,11 @@ pub struct SslRequest {
impl Encode for SslRequest {
fn encode(&self, buf: &mut Vec<u8>, capabilities: Capabilities) {
// client capabilities : int<4>
// SSL must be set or else it makes no sense to ask for an upgrade
buf.put_u32::<LittleEndian>((capabilities | Capabilities::SSL).bits() as u32);
assert!(capabilities.contains(Capabilities::SSL), "SSL bit must be set for Capabilities");
// client capabilities : int<4>
buf.put_u32::<LittleEndian>(capabilities.bits() as u32);
// max packet size : int<4>
buf.put_u32::<LittleEndian>(self.max_packet_size);