Skip to content

Commit 43ee64d

Browse files
committed
Allow SSL tests to pass via fingerprint validation.
Signed-off-by: Bradley Grainger <[email protected]>
1 parent 71e680a commit 43ee64d

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

tests/IntegrationTests/MySqlDataSourceTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ public async Task ConnectSslRemoteCertificateValidationCallback(MySqlSslMode ssl
147147

148148
using var dataSource = builder.Build();
149149
using var connection = dataSource.CreateConnection();
150-
if (expectedSuccess)
150+
if (expectedSuccess || AppConfig.SupportedFeatures.HasFlag(ServerFeatures.TlsFingerprintValidation))
151151
await connection.OpenAsync();
152152
else
153153
await Assert.ThrowsAsync<MySqlException>(connection.OpenAsync);

tests/IntegrationTests/SslTests.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,10 @@ public async Task ConnectSslBadCaCertificate()
181181
csb.SslMode = MySqlSslMode.VerifyCA;
182182
csb.SslCa = Path.Combine(AppConfig.CertsPath, "non-ca-client-cert.pem");
183183
using var connection = new MySqlConnection(csb.ConnectionString);
184-
await Assert.ThrowsAsync<MySqlException>(async () => await connection.OpenAsync());
184+
if (AppConfig.SupportedFeatures.HasFlag(ServerFeatures.TlsFingerprintValidation))
185+
await connection.OpenAsync();
186+
else
187+
await Assert.ThrowsAsync<MySqlException>(async () => await connection.OpenAsync());
185188
}
186189

187190
#if !MYSQL_DATA
@@ -198,7 +201,7 @@ public async Task ConnectSslRemoteCertificateValidationCallback(MySqlSslMode ssl
198201
using var connection = new MySqlConnection(csb.ConnectionString);
199202
connection.RemoteCertificateValidationCallback = (s, c, h, e) => true;
200203

201-
if (expectedSuccess)
204+
if (expectedSuccess || AppConfig.SupportedFeatures.HasFlag(ServerFeatures.TlsFingerprintValidation))
202205
await connection.OpenAsync();
203206
else
204207
await Assert.ThrowsAsync<MySqlException>(async () => await connection.OpenAsync());

0 commit comments

Comments
 (0)