Merge branch 'main' into multiple-result-sets

bigedev · Jul 2, 2022 · 55ba6df · 55ba6df
2 parents 0c85df6 + 2238cc6
commit 55ba6df
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.0.22
+
+- Check server supports SSL
+
 ## 0.0.21
 
 - Fix _lastError reset in _forceClose() and used after

diff --git a/lib/src/mysql_client/connection.dart b/lib/src/mysql_client/connection.dart
@@ -32,6 +32,7 @@ class MySQLConnection {
   final bool _secure;
   final List<int> _incompleteBufferData = [];
   Object? _lastError;
+  int _serverCapabilities = 0;
 
   MySQLConnection._({
     required Socket socket,
@@ -282,6 +283,14 @@ class MySQLConnection {
       throw MySQLClientException("Expected MySQLPacketInitialHandshake packet");
     }
 
+    _serverCapabilities = payload.capabilityFlags;
+
+    if (_secure && (_serverCapabilities & mysqlCapFlagClientSsl == 0)) {
+      throw MySQLClientException(
+        "Server does not support SSL connection. Pass secure: false to createConnection or enable SSL support",
+      );
+    }
+
     if (_secure) {
       // it secure = true, initiate ssl connection
       Future<void> initiateSSL() async {