mirror of
https://github.com/lensapp/lens.git
synced 2025-05-20 05:10:56 +00:00
Change renderer attempting to load CAs to go through main (#7003)
* Move files to features/ to simplify structure Signed-off-by: Sebastian Malton <sebastian@malton.name> * Request string CAs from main on renderer Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix override Signed-off-by: Sebastian Malton <sebastian@malton.name> Signed-off-by: Sebastian Malton <sebastian@malton.name>
This commit is contained in:
parent
5f416921e9
commit
0066ca4ea2
8
src/features/certificate-authorities/common/channel.ts
Normal file
8
src/features/certificate-authorities/common/channel.ts
Normal file
@ -0,0 +1,8 @@
|
||||
/**
|
||||
* Copyright (c) OpenLens Authors. All rights reserved.
|
||||
* Licensed under MIT License. See LICENSE in root directory for more information.
|
||||
*/
|
||||
|
||||
import { getRequestChannel } from "../../../common/utils/channel/get-request-channel";
|
||||
|
||||
export const casChannel = getRequestChannel<void, string[]>("certificate-authorities");
|
||||
@ -0,0 +1,13 @@
|
||||
/**
|
||||
* Copyright (c) OpenLens Authors. All rights reserved.
|
||||
* Licensed under MIT License. See LICENSE in root directory for more information.
|
||||
*/
|
||||
|
||||
import { getGlobalOverride } from "../../../common/test-utils/get-global-override";
|
||||
import { casChannel } from "../common/channel";
|
||||
import certificateAuthoritiesChannelListenerInjectable from "./channel-handler.injectable";
|
||||
|
||||
export default getGlobalOverride(certificateAuthoritiesChannelListenerInjectable, () => ({
|
||||
channel: casChannel,
|
||||
handler: () => [],
|
||||
}));
|
||||
@ -0,0 +1,25 @@
|
||||
/**
|
||||
* Copyright (c) OpenLens Authors. All rights reserved.
|
||||
* Licensed under MIT License. See LICENSE in root directory for more information.
|
||||
*/
|
||||
import { getRequestChannelListenerInjectable } from "../../../main/utils/channel/channel-listeners/listener-tokens";
|
||||
import { casChannel } from "../common/channel";
|
||||
import { globalAgent } from "https";
|
||||
import { isString } from "../../../common/utils";
|
||||
|
||||
const certificateAuthoritiesChannelListenerInjectable = getRequestChannelListenerInjectable({
|
||||
channel: casChannel,
|
||||
handler: () => () => {
|
||||
if (Array.isArray(globalAgent.options.ca)) {
|
||||
return globalAgent.options.ca.filter(isString);
|
||||
}
|
||||
|
||||
if (typeof globalAgent.options.ca === "string") {
|
||||
return [globalAgent.options.ca];
|
||||
}
|
||||
|
||||
return [];
|
||||
},
|
||||
});
|
||||
|
||||
export default certificateAuthoritiesChannelListenerInjectable;
|
||||
@ -3,10 +3,10 @@
|
||||
* Licensed under MIT License. See LICENSE in root directory for more information.
|
||||
*/
|
||||
import { getInjectable } from "@ogre-tools/injectable";
|
||||
import execFileInjectable from "../fs/exec-file.injectable";
|
||||
import loggerInjectable from "../logger.injectable";
|
||||
import type { AsyncResult } from "../utils/async-result";
|
||||
import { requestSystemCAsInjectionToken } from "./request-system-cas-token";
|
||||
import execFileInjectable from "../../../common/fs/exec-file.injectable";
|
||||
import loggerInjectable from "../../../common/logger.injectable";
|
||||
import type { AsyncResult } from "../../../common/utils/async-result";
|
||||
import { requestSystemCAsInjectionToken } from "../common/request-system-cas-token";
|
||||
|
||||
// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions/Cheatsheet#other_assertions
|
||||
const certSplitPattern = /(?=-----BEGIN\sCERTIFICATE-----)/g;
|
||||
@ -3,7 +3,7 @@
|
||||
* Licensed under MIT License. See LICENSE in root directory for more information.
|
||||
*/
|
||||
import { getInjectable } from "@ogre-tools/injectable";
|
||||
import { requestSystemCAsInjectionToken } from "./request-system-cas-token";
|
||||
import { requestSystemCAsInjectionToken } from "../common/request-system-cas-token";
|
||||
|
||||
const requestSystemCAsInjectable = getInjectable({
|
||||
id: "request-system-cas",
|
||||
@ -3,7 +3,7 @@
|
||||
* Licensed under MIT License. See LICENSE in root directory for more information.
|
||||
*/
|
||||
import { getInjectable } from "@ogre-tools/injectable";
|
||||
import { requestSystemCAsInjectionToken } from "./request-system-cas-token";
|
||||
import { requestSystemCAsInjectionToken } from "../common/request-system-cas-token";
|
||||
|
||||
const requestSystemCAsInjectable = getInjectable({
|
||||
id: "request-system-cas",
|
||||
@ -3,9 +3,9 @@
|
||||
* Licensed under MIT License. See LICENSE in root directory for more information.
|
||||
*/
|
||||
import { getInjectable } from "@ogre-tools/injectable";
|
||||
import execFileInjectable from "../fs/exec-file.injectable";
|
||||
import loggerInjectable from "../logger.injectable";
|
||||
import { requestSystemCAsInjectionToken } from "./request-system-cas-token";
|
||||
import execFileInjectable from "../../../common/fs/exec-file.injectable";
|
||||
import loggerInjectable from "../../../common/logger.injectable";
|
||||
import { requestSystemCAsInjectionToken } from "../common/request-system-cas-token";
|
||||
|
||||
const pemEncoding = (hexEncodedCert: String) => {
|
||||
const certData = Buffer.from(hexEncodedCert, "hex").toString("base64");
|
||||
@ -0,0 +1,20 @@
|
||||
/**
|
||||
* 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 { requestFromChannelInjectionToken } from "../../../common/utils/channel/request-from-channel-injection-token";
|
||||
import { casChannel } from "../common/channel";
|
||||
import { requestSystemCAsInjectionToken } from "../common/request-system-cas-token";
|
||||
|
||||
const requestSystemCAsInjectable = getInjectable({
|
||||
id: "request-system-cas",
|
||||
instantiate: (di) => {
|
||||
const requestFromChannel = di.inject(requestFromChannelInjectionToken);
|
||||
|
||||
return () => requestFromChannel(casChannel);
|
||||
},
|
||||
injectionToken: requestSystemCAsInjectionToken,
|
||||
});
|
||||
|
||||
export default requestSystemCAsInjectable;
|
||||
@ -4,7 +4,7 @@
|
||||
*/
|
||||
import { getInjectable } from "@ogre-tools/injectable";
|
||||
import { beforeApplicationIsLoadingInjectionToken } from "../runnable-tokens/before-application-is-loading-injection-token";
|
||||
import injectSystemCAsInjectable from "../../../common/certificate-authorities/inject-system-cas.injectable";
|
||||
import injectSystemCAsInjectable from "../../../features/certificate-authorities/common/inject-system-cas.injectable";
|
||||
|
||||
const setupSystemCaInjectable = getInjectable({
|
||||
id: "setup-system-ca",
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
*/
|
||||
import { getInjectable } from "@ogre-tools/injectable";
|
||||
import { beforeFrameStartsSecondInjectionToken } from "../../before-frame-starts/tokens";
|
||||
import injectSystemCAsInjectable from "../../../common/certificate-authorities/inject-system-cas.injectable";
|
||||
import injectSystemCAsInjectable from "../../../features/certificate-authorities/common/inject-system-cas.injectable";
|
||||
|
||||
const setupSystemCaInjectable = getInjectable({
|
||||
id: "setup-system-ca",
|
||||
|
||||
Loading…
Reference in New Issue
Block a user