Skip to content

Commit

Permalink
test(NODE-3777): move csfle back to integration
Browse files Browse the repository at this point in the history
  • Loading branch information
@durran
durran committed Feb 9, 2022
1 parent 2f1c62a commit 2c2dbd4
Show file tree
Hide file tree
Showing 7 changed files with 36 additions and 57 deletions.
2 changes: 1 addition & 1 deletion package.json
View file
Expand Up @@ -116,7 +116,7 @@
"check:tls": "mocha --config test/manual/mocharc.json test/manual/tls_support.test.js",
"check:ldap": "mocha --config test/manual/mocharc.json test/manual/ldap.test.js",
"check:socks5": "mocha --config test/manual/mocharc.json test/manual/socks5.test.ts",
"check:csfle": "mocha --config test/mocha_mongodb.json test/manual/client-side-encryption",
"check:csfle": "mocha --config test/mocha_mongodb.json test/integration/client-side-encryption",
"check:snappy": "mocha test/unit/assorted/snappy.test.js",
"prepare": "node etc/prepare.js",
"release": "standard-version -i HISTORY.md",
Expand Down
0 test/manual/client-side-encryption/.gitkeep → ...tegration/client-side-encryption/.gitkeep
View file
File renamed without changes.
0 ...lient_side_encryption.corpus.spec.test.js → ...lient_side_encryption.corpus.spec.test.js
View file
File renamed without changes.
0 .../client_side_encryption.prose.deadlock.js → .../client_side_encryption.prose.deadlock.js
View file
File renamed without changes.
91 changes: 35 additions & 56 deletions ...tion/client_side_encryption.prose.test.js → ...tion/client_side_encryption.prose.test.js
View file
Expand Up @@ -162,22 +162,6 @@ describe('Client Side Encryption Prose Tests', metadata, function () {
);
});

beforeEach(async function () {
await clientNoTls.connect();
await clientWithTls.connect();
await clientWithTlsExpired.connect();
await clientWithInvalidHostname.connect();
await dropCollection(clientNoTls.db(keyVaultDbName), keyVaultCollName);
await dropCollection(clientNoTls.db(keyVaultDbName), keyVaultCollName);
});

afterEach(async function () {
await clientNoTls.close();
await clientWithTls.close();
await clientWithTlsExpired.close();
await clientWithInvalidHostname.close();
});

// Case 1.
context('Case 1: AWS', metadata, function () {
const masterKey = {
Expand All @@ -188,40 +172,39 @@ describe('Client Side Encryption Prose Tests', metadata, function () {
const masterKeyExpired = { ...masterKey, endpoint: '127.0.0.1:8000' };
const masterKeyInvalidHostname = { ...masterKey, endpoint: '127.0.0.1:8001' };

it('fails with no tls', metadata, async function () {
it('fails with various invalid tls options', metadata, async function () {
try {
await clientNoTls.connect();
await clientEncryptionNoTls.createDataKey('aws', { masterKey });
expect.fail('it must fail with no tls');
} catch (e) {
expect(e.originalError.message).to.include('certificate required');
await clientNoTls.close();
}
});

it('passes with tls but fails to parse', metadata, async function () {
try {
await clientWithTls.connect();
await clientEncryptionWithTls.createDataKey('aws', { masterKey });
expect.fail('it must fail to parse response');
} catch (e) {
await clientWithTls.close();
expect(e.message).to.include('parse error');
}
});

it('fails with expired certificates', metadata, async function () {
try {
await clientWithTlsExpired.connect();
await clientEncryptionWithTlsExpired.createDataKey('aws', { masterKeyExpired });
expect.fail('it must fail with invalid certificate');
} catch (e) {
await clientWithTlsExpired.close();
expect(e.message).to.include('expected UTF-8 key');
}
});

it('fails with invalid hostnames', metadata, async function () {
try {
await clientWithInvalidHostname.connect();
await clientEncryptionWithInvalidHostname.createDataKey('aws', {
masterKeyInvalidHostname
});
expect.fail('it must fail with invalid hostnames');
} catch (e) {
await clientWithInvalidHostname.close();
expect(e.message).to.include('expected UTF-8 key');
}
});
Expand All @@ -234,38 +217,37 @@ describe('Client Side Encryption Prose Tests', metadata, function () {
keyName: 'foo'
};

it('fails with no tls', metadata, async function () {
it('fails with various invalid tls options', metadata, async function () {
try {
await clientNoTls.connect();
await clientEncryptionNoTls.createDataKey('azure', { masterKey });
expect.fail('it must fail with no tls');
} catch (e) {
await clientNoTls.close();
expect(e.originalError.message).to.include('certificate required');
}
});

it('fails with invalid host', metadata, async function () {
try {
await clientWithTls.connect();
await clientEncryptionWithTls.createDataKey('azure', { masterKey });
expect.fail('it must fail with invalid host');
} catch (e) {
await clientWithTls.close();
expect(e.message).to.include('HTTP status=404');
}
});

it('fails with expired certificates', metadata, async function () {
try {
await clientWithTlsExpired.connect();
await clientEncryptionWithTlsExpired.createDataKey('azure', { masterKey });
expect.fail('it must fail with expired certificates');
} catch (e) {
await clientWithTlsExpired.close();
expect(e.originalError.message).to.include('certificate has expired');
}
});

it('fails with invalid hostnames', metadata, async function () {
try {
await clientWithInvalidHostname.connect();
await clientEncryptionWithInvalidHostname.createDataKey('azure', { masterKey });
expect.fail('it must fail with invalid hostnames');
} catch (e) {
await clientWithInvalidHostname.close();
expect(e.originalError.message).to.include('does not match certificate');
}
});
Expand All @@ -280,70 +262,67 @@ describe('Client Side Encryption Prose Tests', metadata, function () {
keyName: 'foo'
};

it('fails with no tls', metadata, async function () {
it('fails with various invalid tls options', metadata, async function () {
try {
await clientNoTls.connect();
await clientEncryptionNoTls.createDataKey('gcp', { masterKey });
expect.fail('it must fail with no tls');
} catch (e) {
await clientNoTls.close();
expect(e.originalError.message).to.include('certificate required');
}
});

it('fails with invalid host', metadata, async function () {
try {
await clientWithTls.connect();
await clientEncryptionWithTls.createDataKey('gcp', { masterKey });
expect.fail('it must fail with invalid host');
} catch (e) {
await clientWithTls.close();
expect(e.message).to.include('HTTP status=404');
}
});

it('fails with expired certificates', metadata, async function () {
try {
await clientWithTlsExpired.connect();
await clientEncryptionWithTlsExpired.createDataKey('gcp', { masterKey });
expect.fail('it must fail with expired certificates');
} catch (e) {
await clientWithTlsExpired.close();
expect(e.originalError.message).to.include('certificate has expired');
}
});

it('fails with invalid hostnames', metadata, async function () {
try {
await clientWithInvalidHostname.connect();
await clientEncryptionWithInvalidHostname.createDataKey('gcp', { masterKey });
expect.fail('it must fail with invalid hostnames');
} catch (e) {
await clientWithInvalidHostname.close();
expect(e.originalError.message).to.include('does not match certificate');
}
});
});

// Case 4. The success test is skipped as the client was closing from the after
// block before the it block actually finished. But we have another test in the
// KMIP section that tests the same thing and works.
// Case 4.
context('Case 4: KMIP', metadata, function () {
it('fails with no tls', metadata, async function () {
it('fails with various invalid tls options', metadata, async function () {
try {
await clientNoTls.connect();
await clientEncryptionNoTls.createDataKey('kmip');
expect.fail('it must fail with no tls');
} catch (e) {
await clientNoTls.close();
expect(e.originalError.message).to.include('before secure TLS connection');
}
});

it('fails with expired certificates', metadata, async function () {
try {
await clientWithTlsExpired.connect();
await clientEncryptionWithTlsExpired.createDataKey('kmip');
expect.fail('it must fail with expired certificates');
} catch (e) {
await clientWithTlsExpired.close();
expect(e.originalError.message).to.include('certificate has expired');
}
});

it('fails with invalid hostnames', metadata, async function () {
try {
await clientWithInvalidHostname.connect();
await clientEncryptionWithInvalidHostname.createDataKey('kmip');
expect.fail('it must fail with invalid hostnames');
} catch (e) {
await clientWithInvalidHostname.close();
expect(e.originalError.message).to.include('does not match certificate');
}
});
Expand Down
0 ...ption/client_side_encryption.spec.test.js → ...ption/client_side_encryption.spec.test.js
View file
File renamed without changes.
0 ...ual/client-side-encryption/driver.test.js → ...ion/client-side-encryption/driver.test.js
View file
File renamed without changes.

0 comments on commit 2c2dbd4

Please sign in to comment.