Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 0 additions & 18 deletions packages/osd-dev-utils/certs/ca.crt
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,4 @@ Bag Attributes
subject=/CN=OpenSearch Certificate Tool Autogenerated CA
issuer=/CN=OpenSearch Certificate Tool Autogenerated CA
-----BEGIN CERTIFICATE-----
MIIDSzCCAjOgAwIBAgIUW0brhEtYK3tUBYlXnUa+AMmAX6kwDQYJKoZIhvcNAQEL
BQAwNDEyMDAGA1UEAxMpRWxhc3RpYyBDZXJ0aWZpY2F0ZSBUb29sIEF1dG9nZW5l
cmF0ZWQgQ0EwIBcNMTkxMjI3MTcwMjMyWhgPMjA2OTEyMTQxNzAyMzJaMDQxMjAw
BgNVBAMTKUVsYXN0aWMgQ2VydGlmaWNhdGUgVG9vbCBBdXRvZ2VuZXJhdGVkIENB
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAplO5m5Xy8xERyA0/G5SM
Nu2QXkfS+m7ZTFjSmtwqX7BI1I6ISI4Yw8QxzcIgSbEGlSqb7baeT+A/1JQj0gZN
KOnKbazl+ujVRJpsfpt5iUsnQyVPheGekcHkB+9WkZPgZ1oGRENr/4Eb1VImQf+Y
yo/FUj8X939tYW0fficAqYKv8/4NWpBUbeop8wsBtkz738QKlmPkMwC4FbuF2/bN
vNuzQuRbGMVmPeyivZJRfDAMKExoXjCCLmbShdg4dUHsUjVeWQZ6s4vbims+8qF9
b4bseayScQNNU3hc5mkfhEhSM0KB0lDpSvoCxuXvXzb6bOk7xIdYo+O4vHUhvSkQ
mwIDAQABo1MwUTAdBgNVHQ4EFgQUGu0mDnvDRnBdNBG8DxwPdWArB0kwHwYDVR0j
BBgwFoAUGu0mDnvDRnBdNBG8DxwPdWArB0kwDwYDVR0TAQH/BAUwAwEB/zANBgkq
hkiG9w0BAQsFAAOCAQEASv/FYOwWGnQreH8ulcVupGeZj25dIjZiuKfJmslH8QN/
pVCIzAxNZjGjCpKxbJoCu5U9USaBylbhigeBJEq4wmYTs/WPu4uYMgDj0MILuHin
RQqgEVG0uADGEgH2nnk8DeY8gQvGpJRQGlXNK8pb+pCsy6F8k/svGOeBND9osHfU
CVEo5nXjfq6JCFt6hPx7kl4h3/j3C4wNy/Dv/QINdpPsl6CnF17Q9R9d60WFv42/
pkl7W1hszCG9foNJOJabuWfVoPkvKQjoCvPitZt/hCaFZAW49PmAVhK+DAohQ91l
TZhDmYqHoXNiRDQiUT68OS7RlfKgNpr/vMTZXDxpmw==
-----END CERTIFICATE-----
Binary file modified packages/osd-dev-utils/certs/opensearch.p12
Binary file not shown.
Binary file modified packages/osd-dev-utils/certs/opensearch_dashboards.p12
Binary file not shown.
Binary file modified packages/osd-dev-utils/certs/opensearch_emptypassword.p12
Binary file not shown.
Binary file modified packages/osd-dev-utils/certs/opensearch_nopassword.p12
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,8 @@ describe('#start(installPath)', () => {
await expect(cluster.start()).rejects.toThrowError('OpenSearch has already been started');
});

it('sets up SSL when enabled', async () => {
// TODO: [RENAMEME] REPLACE PKCS12 FILES, CERTS, AND KEYS. Temporarily removed until we regenerate them ourselves.
it.skip('sets up SSL when enabled', async () => {
mockOpenSearchBin({ start: true, ssl: true });

const cluster = new Cluster({ log, ssl: true });
Expand Down
5 changes: 5 additions & 0 deletions src/core/server/utils/crypto/__fixtures__/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# PKCS12 Test Fixtures

```shell
TODO: REPLACE PKCS12 FILES, CERTS, AND KEYS.
Temporarily removed until we regenerate them ourselves.
```

These PKCS12 files are used to test different scenarios. Each has an empty password.

Including `-noiter` uses a single encryption iteration, and `-nomaciter` uses a single MAC verification iteration.
Expand Down
6 changes: 4 additions & 2 deletions src/core/server/utils/crypto/pkcs12.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ beforeAll(() => {
pemKey = readPem(OPENSEARCH_KEY_PATH);
});

describe('#readPkcs12Keystore', () => {
// TODO: [RENAMEME] REPLACE PKCS12 FILES, CERTS, AND KEYS. Temporarily removed until we regenerate them ourselves.
describe.skip('#readPkcs12Keystore', () => {
const expectKey = (pkcs12ReadResult: Pkcs12ReadResult) => {
const result = reformatPem(pkcs12ReadResult.key!);
expect(result).toEqual(pemKey);
Expand Down Expand Up @@ -209,7 +210,8 @@ describe('#readPkcs12Keystore', () => {
});
});

describe('#readPkcs12Truststore', () => {
// TODO: [RENAMEME] REPLACE PKCS12 FILES, CERTS, AND KEYS. Temporarily removed until we regenerate them ourselves.
describe.skip('#readPkcs12Truststore', () => {
it('reads all certificates into one CA array and discards any certificates that have keys', () => {
const ca = readPkcs12Truststore(OPENSEARCH_P12_PATH, OPENSEARCH_P12_PASSWORD);
const result = ca?.map((x) => reformatPem(x));
Expand Down