mirror of
https://github.com/lensapp/lens.git
synced 2025-05-20 05:10:56 +00:00
Enable TLS on lens-k8s-proxy (#4941)
* wip: enable tls on lens-k8s-proxy Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com> * cleanup Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com> * type -> interface Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com> * more dependencies Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com> * refactor Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com> * run di.runSetups() after app is ready Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com> * tls fixes & refactor Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com> * cleanup Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com> * cleanup Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com> * refactor Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com> * refactor Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
This commit is contained in:
1 parent
2186b26d12
commit
0fa89ecbfa
25 files changed
+443
-195
No files matched your search
@@ -0,0 +1,26 @@
|
||||
/**
|
||||
* Copyright (c) OpenLens Authors. All rights reserved.
|
||||
* Licensed under MIT License. See LICENSE in root directory for more information.
|
||||
*/
|
||||
import { getInjectable } from "@ogre-tools/injectable";
|
||||
import * as selfsigned from "selfsigned";
|
||||
import { createKubeAuthProxyCertFiles } from "./create-kube-auth-proxy-cert-files";
|
||||
import writeFileInjectable from "../../common/fs/write-file.injectable";
|
||||
import directoryForUserDataInjectable from "../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
|
||||
import path from "path";
|
||||
|
||||
const createKubeAuthProxyCertFilesInjectable = getInjectable({
|
||||
id: "create-kube-auth-proxy-cert-files",
|
||||
|
||||
instantiate: async (di) => {
|
||||
const userData = di.inject(directoryForUserDataInjectable);
|
||||
const certPath = path.join(userData, "kube-auth-proxy");
|
||||
|
||||
return createKubeAuthProxyCertFiles(certPath, {
|
||||
generate: selfsigned.generate,
|
||||
writeFile: di.inject(writeFileInjectable),
|
||||
});
|
||||
},
|
||||
});
|
||||
|
||||
export default createKubeAuthProxyCertFilesInjectable;
|
||||
@@ -0,0 +1,43 @@
|
||||
/**
|
||||
* Copyright (c) OpenLens Authors. All rights reserved.
|
||||
* Licensed under MIT License. See LICENSE in root directory for more information.
|
||||
*/
|
||||
|
||||
import path from "path";
|
||||
import type * as selfsigned from "selfsigned";
|
||||
|
||||
type SelfSignedGenerate = typeof selfsigned.generate;
|
||||
|
||||
interface CreateKubeAuthProxyCertificateFilesDependencies {
|
||||
generate: SelfSignedGenerate;
|
||||
writeFile: (path: string, content: string | Buffer) => Promise<void>;
|
||||
}
|
||||
|
||||
function getKubeAuthProxyCertificate(generate: SelfSignedGenerate): selfsigned.SelfSignedCert {
|
||||
const opts = [
|
||||
{ name: "commonName", value: "Lens Certificate Authority" },
|
||||
{ name: "organizationName", value: "Lens" },
|
||||
];
|
||||
|
||||
return generate(opts, {
|
||||
keySize: 2048,
|
||||
algorithm: "sha256",
|
||||
days: 365,
|
||||
extensions: [
|
||||
{ name: "basicConstraints", cA: true },
|
||||
{ name: "subjectAltName", altNames: [
|
||||
{ type: 2, value: "localhost" },
|
||||
{ type: 7, ip: "127.0.0.1" },
|
||||
] },
|
||||
],
|
||||
});
|
||||
}
|
||||
|
||||
export async function createKubeAuthProxyCertFiles(dir: string, dependencies: CreateKubeAuthProxyCertificateFilesDependencies): Promise<string> {
|
||||
const cert = getKubeAuthProxyCertificate(dependencies.generate);
|
||||
|
||||
await dependencies.writeFile(path.join(dir, "proxy.key"), cert.private);
|
||||
await dependencies.writeFile(path.join(dir, "proxy.crt"), cert.cert);
|
||||
|
||||
return dir;
|
||||
}
|
||||
@@ -8,14 +8,20 @@ import type { Cluster } from "../../common/cluster/cluster";
|
||||
import path from "path";
|
||||
import { getBinaryName } from "../../common/vars";
|
||||
import directoryForBundledBinariesInjectable from "../../common/app-paths/directory-for-bundled-binaries/directory-for-bundled-binaries.injectable";
|
||||
import spawnInjectable from "../child-process/spawn.injectable";
|
||||
import createKubeAuthProxyCertFilesInjectable from "./create-kube-auth-proxy-cert-files.injectable";
|
||||
|
||||
export type CreateKubeAuthProxy = (cluster: Cluster, environmentVariables: NodeJS.ProcessEnv) => KubeAuthProxy;
|
||||
|
||||
const createKubeAuthProxyInjectable = getInjectable({
|
||||
id: "create-kube-auth-proxy",
|
||||
|
||||
instantiate: (di) => {
|
||||
instantiate: (di): CreateKubeAuthProxy => {
|
||||
const binaryName = getBinaryName("lens-k8s-proxy");
|
||||
const dependencies: KubeAuthProxyDependencies = {
|
||||
proxyBinPath: path.join(di.inject(directoryForBundledBinariesInjectable), binaryName),
|
||||
proxyCertPath: di.inject(createKubeAuthProxyCertFilesInjectable),
|
||||
spawn: di.inject(spawnInjectable),
|
||||
};
|
||||
|
||||
return (cluster: Cluster, environmentVariables: NodeJS.ProcessEnv) => (
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
/**
|
||||
* Copyright (c) OpenLens Authors. All rights reserved.
|
||||
* Licensed under MIT License. See LICENSE in root directory for more information.
|
||||
*/
|
||||
import { getInjectable } from "@ogre-tools/injectable";
|
||||
import path from "path";
|
||||
import readFileInjectable from "../../common/fs/read-file.injectable";
|
||||
import createKubeAuthProxyCertFilesInjectable from "./create-kube-auth-proxy-cert-files.injectable";
|
||||
|
||||
const kubeAuthProxyCaInjectable = getInjectable({
|
||||
id: "kube-auth-proxy-ca",
|
||||
|
||||
instantiate: async (di) => {
|
||||
const certPath = await di.inject(createKubeAuthProxyCertFilesInjectable);
|
||||
|
||||
const readFile = di.inject(readFileInjectable);
|
||||
|
||||
return readFile(path.join(certPath, "proxy.crt"));
|
||||
},
|
||||
});
|
||||
|
||||
export default kubeAuthProxyCaInjectable;
|
||||
@@ -3,7 +3,7 @@
|
||||
* Licensed under MIT License. See LICENSE in root directory for more information.
|
||||
*/
|
||||
|
||||
import { ChildProcess, spawn } from "child_process";
|
||||
import type { ChildProcess, spawn } from "child_process";
|
||||
import { waitUntilUsed } from "tcp-port-used";
|
||||
import { randomBytes } from "crypto";
|
||||
import type { Cluster } from "../../common/cluster/cluster";
|
||||
@@ -15,6 +15,8 @@ const startingServeRegex = /starting to serve on (?<address>.+)/i;
|
||||
|
||||
export interface KubeAuthProxyDependencies {
|
||||
proxyBinPath: string;
|
||||
proxyCertPath: Promise<string>;
|
||||
spawn: typeof spawn;
|
||||
}
|
||||
|
||||
export class KubeAuthProxy {
|
||||
@@ -42,13 +44,15 @@ export class KubeAuthProxy {
|
||||
}
|
||||
|
||||
const proxyBin = this.dependencies.proxyBinPath;
|
||||
const certPath = await this.dependencies.proxyCertPath;
|
||||
|
||||
this.proxyProcess = spawn(proxyBin, [], {
|
||||
this.proxyProcess = this.dependencies.spawn(proxyBin, [], {
|
||||
env: {
|
||||
...this.env,
|
||||
KUBECONFIG: this.cluster.kubeConfigPath,
|
||||
KUBECONFIG_CONTEXT: this.cluster.contextName,
|
||||
API_PREFIX: this.apiPrefix,
|
||||
CERT_PATH: certPath,
|
||||
},
|
||||
});
|
||||
this.proxyProcess.on("error", (error) => {
|
||||
@@ -66,11 +70,15 @@ export class KubeAuthProxy {
|
||||
this.exit();
|
||||
});
|
||||
|
||||
this.proxyProcess.stderr.on("data", (data) => {
|
||||
this.proxyProcess.stderr.on("data", (data: Buffer) => {
|
||||
if (data.includes("http: TLS handshake error")) {
|
||||
return;
|
||||
}
|
||||
|
||||
this.cluster.broadcastConnectUpdate(data.toString(), true);
|
||||
});
|
||||
|
||||
this.proxyProcess.stdout.on("data", (data: any) => {
|
||||
this.proxyProcess.stdout.on("data", (data: Buffer) => {
|
||||
if (typeof this._port === "number") {
|
||||
this.cluster.broadcastConnectUpdate(data.toString());
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user