dprevot/php-sqlsrv
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #785 from david-puglielli/ae-test-experiments

Browse source 
Fixed akv test failures with win encryption
This commit is contained in:
David Puglielli 2018-05-29 17:13:05 -07:00 committed by GitHub
parent 9e75dfefa7 9d1eafd6b3
commit 4509756066
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
test/functional/pdo_sqlsrv/pdo_ae_azure_key_vault_keywords.phpt
View file

@ -6,6 +6,12 @@ Test connection keywords for Azure Key Vault for Always Encrypted.
<?php
require_once('pdo_ae_azure_key_vault_common.php');
// This test only applies to Azure Key Vault, or to no encryption at all
if ($keystore != 'none' and $keystore != 'akv') {
echo "Done.\n";
exit();
}
// We will test the direct product (set of all possible combinations) of the following
$columnEncryption = ['enabled', 'disabled', 'notvalid', ''];
$keyStoreAuthentication = ['KeyVaultPassword', 'KeyVaultClientSecret', 'KeyVaultNothing', ''];

10
test/functional/sqlsrv/sqlsrv_ae_azure_key_vault_keywords.phpt
View file

@ -6,6 +6,12 @@ Test connection keywords for Azure Key Vault for Always Encrypted.
<?php
require_once('sqlsrv_ae_azure_key_vault_common.php');
// This test only applies to Azure Key Vault, or to no encryption at all
if ($keystore != 'none' and $keystore != 'akv') {
echo "Done.\n";
exit();
}
// We will test the direct product (set of all possible combinations) of the following
$columnEncryption = ['enabled', 'disabled', 'notvalid', ''];
$keyStoreAuthentication = ['KeyVaultPassword', 'KeyVaultClientSecret', 'KeyVaultNothing', ''];
@ -123,7 +129,7 @@ for ($i = 0; $i < sizeof($columnEncryption); ++$i) {
if (sqlsrv_execute($stmt) == false) {
$errors = sqlsrv_errors();
if (!AE\isColEncrypted()) {
if (!AE\isDataEncrypted()) {
checkErrors(
$errors,
array('CE258', '0'),
@ -142,7 +148,7 @@ for ($i = 0; $i < sizeof($columnEncryption); ++$i) {
} else {
// The INSERT query succeeded with bad credentials, which
// should only happen when encryption is not enabled.
if (AE\isColEncrypted()) {
if (AE\isDataEncrypted()) {
fatalError("Successful insertion with bad credentials\n");
}
}