create the @kbn/crypto package

elastic · Mar 24, 2021 · 54ee08a · 54ee08a
1 parent 0967c20
commit 54ee08a
Show file tree

Hide file tree

Showing 20 changed files with 49 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -122,6 +122,7 @@
     "@kbn/apm-utils": "link:packages/kbn-apm-utils",
     "@kbn/config": "link:packages/kbn-config",
     "@kbn/config-schema": "link:packages/kbn-config-schema",
+    "@kbn/crypto": "link:packages/kbn-crypto",
     "@kbn/http-tools": "link:packages/kbn-http-tools",
     "@kbn/i18n": "link:packages/kbn-i18n",
     "@kbn/interpreter": "link:packages/kbn-interpreter",

diff --git a/packages/kbn-crypto/jest.config.js b/packages/kbn-crypto/jest.config.js
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+module.exports = {
+  preset: '@kbn/test',
+  rootDir: '../..',
+  roots: ['<rootDir>/packages/kbn-crypto'],
+};
diff --git a/packages/kbn-crypto/package.json b/packages/kbn-crypto/package.json
@@ -0,0 +1,16 @@
+{
+  "name": "@kbn/crypto",
+  "version": "1.0.0",
+  "private": true,
+  "license": "SSPL-1.0 OR Elastic License 2.0",
+  "main": "./target/index.js",
+  "scripts": {
+    "build": "../../node_modules/.bin/tsc",
+    "kbn:bootstrap": "yarn build",
+    "kbn:watch": "yarn build --watch"
+  },
+  "dependencies": {},
+  "devDependencies": {
+    "@kbn/dev-utils": "link:../kbn-dev-utils"
+  }
+}
diff --git a/...erver/utils/crypto/__fixtures__/README.md → ...ges/kbn-crypto/src/__fixtures__/README.md b/...erver/utils/crypto/__fixtures__/README.md → ...ges/kbn-crypto/src/__fixtures__/README.md
diff --git a/...server/utils/crypto/__fixtures__/index.ts → ...ages/kbn-crypto/src/__fixtures__/index.ts b/...server/utils/crypto/__fixtures__/index.ts → ...ages/kbn-crypto/src/__fixtures__/index.ts
diff --git a/...erver/utils/crypto/__fixtures__/no_ca.p12 → ...ges/kbn-crypto/src/__fixtures__/no_ca.p12 b/...erver/utils/crypto/__fixtures__/no_ca.p12 → ...ges/kbn-crypto/src/__fixtures__/no_ca.p12
diff --git a/...ver/utils/crypto/__fixtures__/no_cert.p12 → ...s/kbn-crypto/src/__fixtures__/no_cert.p12 b/...ver/utils/crypto/__fixtures__/no_cert.p12 → ...s/kbn-crypto/src/__fixtures__/no_cert.p12
diff --git a/...rver/utils/crypto/__fixtures__/no_key.p12 → ...es/kbn-crypto/src/__fixtures__/no_key.p12 b/...rver/utils/crypto/__fixtures__/no_key.p12 → ...es/kbn-crypto/src/__fixtures__/no_key.p12
diff --git a/...ver/utils/crypto/__fixtures__/two_cas.p12 → ...s/kbn-crypto/src/__fixtures__/two_cas.p12 b/...ver/utils/crypto/__fixtures__/two_cas.p12 → ...s/kbn-crypto/src/__fixtures__/two_cas.p12
diff --git a/...er/utils/crypto/__fixtures__/two_keys.p12 → .../kbn-crypto/src/__fixtures__/two_keys.p12 b/...er/utils/crypto/__fixtures__/two_keys.p12 → .../kbn-crypto/src/__fixtures__/two_keys.p12
diff --git a/src/core/server/utils/crypto/index.ts → packages/kbn-crypto/src/index.ts b/src/core/server/utils/crypto/index.ts → packages/kbn-crypto/src/index.ts
diff --git a/src/core/server/utils/crypto/pkcs12.test.ts → packages/kbn-crypto/src/pkcs12.test.ts b/src/core/server/utils/crypto/pkcs12.test.ts → packages/kbn-crypto/src/pkcs12.test.ts
@@ -18,7 +18,7 @@ import {
 import { NO_CA_PATH, NO_CERT_PATH, NO_KEY_PATH, TWO_CAS_PATH, TWO_KEYS_PATH } from './__fixtures__';
 import { readFileSync } from 'fs';
 
-import { readPkcs12Keystore, Pkcs12ReadResult, readPkcs12Truststore } from './index';
+import { readPkcs12Keystore, Pkcs12ReadResult, readPkcs12Truststore } from './pkcs12';
 
 const reformatPem = (pem: string) => {
   // ensure consistency in line endings when comparing two PEM files

diff --git a/src/core/server/utils/crypto/pkcs12.ts → packages/kbn-crypto/src/pkcs12.ts b/src/core/server/utils/crypto/pkcs12.ts → packages/kbn-crypto/src/pkcs12.ts
diff --git a/src/core/server/utils/crypto/sha256.test.ts → packages/kbn-crypto/src/sha256.test.ts b/src/core/server/utils/crypto/sha256.test.ts → packages/kbn-crypto/src/sha256.test.ts
diff --git a/src/core/server/utils/crypto/sha256.ts → packages/kbn-crypto/src/sha256.ts b/src/core/server/utils/crypto/sha256.ts → packages/kbn-crypto/src/sha256.ts
diff --git a/packages/kbn-crypto/tsconfig.json b/packages/kbn-crypto/tsconfig.json
@@ -0,0 +1,12 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "target",
+    "target": "ES2019",
+    "declaration": true,
+    "declarationMap": true
+  },
+  "include": [
+    "src/**/*"
+  ]
+}
diff --git a/src/core/server/elasticsearch/elasticsearch_config.ts b/src/core/server/elasticsearch/elasticsearch_config.ts
@@ -7,10 +7,10 @@
  */
 
 import { schema, TypeOf } from '@kbn/config-schema';
+import { readPkcs12Keystore, readPkcs12Truststore } from '@kbn/crypto';
 import { Duration } from 'moment';
 import { readFileSync } from 'fs';
 import { ConfigDeprecationProvider } from 'src/core/server';
-import { readPkcs12Keystore, readPkcs12Truststore } from '../utils';
 import { ServiceConfigDescriptor } from '../internal_types';
 import { getReservedHeaders } from './default_headers';
 

diff --git a/src/core/server/http/ssl_config.ts b/src/core/server/http/ssl_config.ts
@@ -7,9 +7,9 @@
  */
 
 import { schema, TypeOf } from '@kbn/config-schema';
+import { readPkcs12Keystore, readPkcs12Truststore } from '@kbn/crypto';
 import { constants as cryptoConstants } from 'crypto';
 import { readFileSync } from 'fs';
-import { readPkcs12Keystore, readPkcs12Truststore } from '../utils';
 
 const protocolMap = new Map<string, number>([
   ['TLSv1', cryptoConstants.SSL_OP_NO_TLSv1],

diff --git a/src/core/server/utils/index.ts b/src/core/server/utils/index.ts
@@ -6,6 +6,5 @@
  * Side Public License, v 1.
  */
 
-export * from './crypto';
 export * from './from_root';
 export * from './package_json';
diff --git a/yarn.lock b/yarn.lock
@@ -2625,6 +2625,10 @@
   version "0.0.0"
   uid ""
 
+"@kbn/crypto@link:packages/kbn-crypto":
+  version "0.0.0"
+  uid ""
+
 "@kbn/dev-utils@link:packages/kbn-dev-utils":
   version "0.0.0"
   uid ""