-
Notifications
You must be signed in to change notification settings - Fork 122
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix skipped tests in Mariadb integration CI (#1533)
1. Apparently the new errors we recently turned off are due to the default auto-chaining behavior in OpenSSL. I applied a patch to enable auto-chaining in Mariadb, since consumers will likely be looking for the default behavior Mariadb tries to enable. 2. Not sure what desc_index_min_max does, but it does seem to have a history of being flaky based on this commit: MariaDB/server@03fa2c3. It seems unrelated to AWS-LC, so I think it's alright to leave off. 3. My guess is that ssl_crl is trying to connect to the server containing the crl, but there are instances where the crl server is unresponsive (possibly due to too much load on the server, common issue with crls). Why our CI still fails, is due the error message being overwritten in the original patch. The patch correctly encapsulates new AWS-LC errors, but we've also overwritten the potential error message that was being expected. I've generated a new patch for the CI.
- Loading branch information
1 parent
d940162
commit 8ccd85b
Showing
4 changed files
with
30 additions
and
33 deletions.
There are no files selected for viewing
28 changes: 0 additions & 28 deletions
28
...integration/mariadb_patch/0003-WIP-Use-replace_regex-in-mysql-test-run-to-make-SSL-.patch
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
diff --git a/vio/viosslfactories.c b/vio/viosslfactories.c | ||
index 530872c4..235bf76f 100644 | ||
--- a/vio/viosslfactories.c | ||
+++ b/vio/viosslfactories.c | ||
@@ -354,6 +354,11 @@ new_VioSSLFd(const char *key_file, const char *cert_file, const char *ca_file, | ||
} | ||
|
||
SSL_CTX_set_options(ssl_fd->ssl_context, ssl_ctx_options); | ||
+ /* | ||
+ This reverts AWS-LC to the default OpenSSL auto-chaining behavior. Since | ||
+ OpenSSL enables auto-chaining by default, this is a no-op with OpenSSL. | ||
+ */ | ||
+ SSL_CTX_clear_mode(ssl_fd->ssl_context, SSL_MODE_NO_AUTO_CHAIN); | ||
|
||
/* | ||
Set the ciphers that can be used |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
diff --git a/mysql-test/main/ssl_crl.test b/mysql-test/main/ssl_crl.test | ||
index 9b475857..58d23087 100644 | ||
--- a/mysql-test/main/ssl_crl.test | ||
+++ b/mysql-test/main/ssl_crl.test | ||
@@ -8,6 +8,6 @@ | ||
|
||
--echo # try logging in with a certificate in the server's --ssl-crl : should fail | ||
# OpenSSL 1.1.1a correctly rejects the certificate, but the error message is different | ||
---replace_regex /ERROR 2013 \(HY000\): Lost connection to server at '.*', system error: [0-9]+/ERROR 2026 (HY000): TLS\/SSL error: sslv3 alert certificate revoked/ | ||
+--replace_regex /ERROR 2013 \(HY000\): Lost connection to server at '.*', system error: [0-9]+/ERROR 2026 (HY000): TLS\/SSL error: sslv3 alert certificate revoked/ /SSLV3_ALERT_CERTIFICATE_REVOKED/sslv3 alert certificate revoked/ | ||
--error 1 | ||
--exec $MYSQL --ssl-ca=$MYSQL_TEST_DIR/std_data/cacert.pem --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem test -e "SHOW STATUS LIKE 'Ssl_version'" 2>&1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters