Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update test for have_ssl removal #425

Merged
merged 2 commits into from
May 1, 2024
Merged

Update test for have_ssl removal #425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f01283d
Update test for `have_ssl` removal
dveeden May 1, 2024
b2c2809
CI: Test with MySQL 8.4
dveeden May 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ jobs:
server: "8.0"
- os: ubuntu-20.04
client: "8.0"
server: "8.3"
server: "8.4"
- os: ubuntu-22.04
client: "8.3"
server: "8.3"
client: "8.4"
server: "8.4"
- os: ubuntu-22.04
client: "8.3"
client: "8.4"
server: "8.0"
runs-on: ${{ matrix.os }}
services:
Expand All @@ -40,15 +40,15 @@ jobs:
sudo debconf-set-selections <<EOF
mysql-apt-config mysql-apt-config/select-server select mysql-8.0
EOF
- if: matrix.client == '8.3'
- if: matrix.client == '8.4'
run: |
sudo debconf-set-selections <<EOF
mysql-apt-config mysql-apt-config/select-server select mysql-innovation
mysql-apt-config mysql-apt-config/select-server select mysql-8.4-lts
EOF
- name: "Setup mysql libs"
run: |
wget https://dev.mysql.com/get/mysql-apt-config_0.8.29-1_all.deb
DEBIAN_FRONTEND="noninteractive" sudo dpkg -i mysql-apt-config_0.8.29-1_all.deb
wget https://dev.mysql.com/get/mysql-apt-config_0.8.30-1_all.deb
DEBIAN_FRONTEND="noninteractive" sudo dpkg -i mysql-apt-config_0.8.30-1_all.deb
sudo apt update
sudo apt install -y libmysqlclient-dev
- name: "Run build"
Expand Down
3 changes: 3 additions & 0 deletions t/92ssl_backronym_vulnerability.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ my $have_ssl = eval { $dbh->selectrow_hashref("SHOW VARIABLES WHERE Variable_nam
$dbh->disconnect();
plan skip_all => 'Server supports SSL connections, cannot test false-positive enforcement' if $have_ssl and $have_ssl->{Value} eq 'YES';

# `have_ssl` has been deprecated in 8.0.26 and removed in 8.4.0...
plan skip_all => 'Server might support SSL connections, cannot test false-positive enforcement' if not $have_ssl;

plan tests => 4;

$dbh = DBI->connect($test_dsn, $test_user, $test_password, { PrintError => 0, RaiseError => 0, mysql_ssl => 1 });
Expand Down
3 changes: 3 additions & 0 deletions t/92ssl_optional.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ my $have_ssl = eval { $dbh->selectrow_hashref("SHOW VARIABLES WHERE Variable_nam
$dbh->disconnect();
plan skip_all => 'Server supports SSL connections, cannot test fallback to plain text' if $have_ssl and $have_ssl->{Value} eq 'YES';

# `have_ssl` has been deprecated in 8.0.26 and removed in 8.4.0...
plan skip_all => 'Server might support SSL connections, cannot test false-positive enforcement' if not $have_ssl;

plan tests => 2;

$dbh = DBI->connect($test_dsn, $test_user, $test_password, { PrintError => 1, RaiseError => 0, mysql_ssl => 1, mysql_ssl_optional => 1 });
Expand Down
3 changes: 3 additions & 0 deletions t/92ssl_riddle_vulnerability.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ my $have_ssl = eval { $dbh->selectrow_hashref("SHOW VARIABLES WHERE Variable_nam
$dbh->disconnect();
plan skip_all => 'Server supports SSL connections, cannot test false-positive enforcement' if $have_ssl and $have_ssl->{Value} eq 'YES';

# `have_ssl` has been deprecated in 8.0.26 and removed in 8.4.0...
plan skip_all => 'Server might support SSL connections, cannot test false-positive enforcement' if not $have_ssl;

plan tests => 4;

$dbh = DBI->connect($test_dsn, '4yZ73s9qeECdWi', '64heUGwAsVoNqo', { PrintError => 0, RaiseError => 0, mysql_ssl => 1 });
Expand Down
Loading