@theia/mini-browser 1.45.1 → 1.46.0-next.72

package/src/electron-main/mini-browser-electron-main-contribution.ts

@@ -1,42 +1,42 @@
-// *****************************************************************************
-// Copyright (C) 2020 Ericsson and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { ElectronMainApplication, ElectronMainApplicationContribution } from '@theia/core/lib/electron-main/electron-main-application';
-import { ElectronSecurityTokenService } from '@theia/core/lib/electron-main/electron-security-token-service';
-import { inject, injectable } from '@theia/core/shared/inversify';
-import { MiniBrowserEndpoint } from '../common/mini-browser-endpoint';
-
-/**
- * Since the mini-browser might serve content from a new origin,
- * we need to attach the ElectronSecurityToken for the Electron
- * backend to accept HTTP requests.
- */
-@injectable()
-export class MiniBrowserElectronMainContribution implements ElectronMainApplicationContribution {
-
-    @inject(ElectronSecurityTokenService)
-    protected readonly electronSecurityTokenService: ElectronSecurityTokenService;
-
-    async onStart(app: ElectronMainApplication): Promise<void> {
-        const url = this.getMiniBrowserEndpoint(await app.backendPort);
-        await this.electronSecurityTokenService.setElectronSecurityTokenCookie(url);
-    }
-
-    protected getMiniBrowserEndpoint(port: number): string {
-        const pattern = process.env[MiniBrowserEndpoint.HOST_PATTERN_ENV] ?? MiniBrowserEndpoint.HOST_PATTERN_DEFAULT;
-        return 'http://' + pattern.replace('{{hostname}}', `localhost:${port}`);
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2020 Ericsson and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { ElectronMainApplication, ElectronMainApplicationContribution } from '@theia/core/lib/electron-main/electron-main-application';
+import { ElectronSecurityTokenService } from '@theia/core/lib/electron-main/electron-security-token-service';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import { MiniBrowserEndpoint } from '../common/mini-browser-endpoint';
+
+/**
+ * Since the mini-browser might serve content from a new origin,
+ * we need to attach the ElectronSecurityToken for the Electron
+ * backend to accept HTTP requests.
+ */
+@injectable()
+export class MiniBrowserElectronMainContribution implements ElectronMainApplicationContribution {
+
+    @inject(ElectronSecurityTokenService)
+    protected readonly electronSecurityTokenService: ElectronSecurityTokenService;
+
+    async onStart(app: ElectronMainApplication): Promise<void> {
+        const url = this.getMiniBrowserEndpoint(await app.backendPort);
+        await this.electronSecurityTokenService.setElectronSecurityTokenCookie(url);
+    }
+
+    protected getMiniBrowserEndpoint(port: number): string {
+        const pattern = process.env[MiniBrowserEndpoint.HOST_PATTERN_ENV] ?? MiniBrowserEndpoint.HOST_PATTERN_DEFAULT;
+        return 'http://' + pattern.replace('{{hostname}}', `localhost:${port}`);
+    }
+}

package/src/node/mini-browser-backend-module.ts

@@ -1,41 +1,41 @@
-// *****************************************************************************
-// Copyright (C) 2018 TypeFox and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { ContainerModule } from '@theia/core/shared/inversify';
-import { bindContributionProvider } from '@theia/core/lib/common/contribution-provider';
-import { BackendApplicationContribution } from '@theia/core/lib/node/backend-application';
-import { ConnectionHandler, RpcConnectionHandler } from '@theia/core/lib/common';
-import { MiniBrowserService, MiniBrowserServicePath } from '../common/mini-browser-service';
-import { MiniBrowserEndpoint, MiniBrowserEndpointHandler, HtmlHandler, ImageHandler, PdfHandler, SvgHandler } from './mini-browser-endpoint';
-import { WsRequestValidatorContribution } from '@theia/core/lib/node/ws-request-validators';
-import { MiniBrowserWsRequestValidator } from './mini-browser-ws-validator';
-import { MiniBrowserBackendSecurityWarnings } from './mini-browser-backend-security-warnings';
-
-export default new ContainerModule(bind => {
-    bind(MiniBrowserEndpoint).toSelf().inSingletonScope();
-    bind(BackendApplicationContribution).toService(MiniBrowserEndpoint);
-    bind(MiniBrowserWsRequestValidator).toSelf().inSingletonScope();
-    bind(WsRequestValidatorContribution).toService(MiniBrowserWsRequestValidator);
-    bind(MiniBrowserService).toService(MiniBrowserEndpoint);
-    bind(ConnectionHandler).toDynamicValue(context => new RpcConnectionHandler(MiniBrowserServicePath, () => context.container.get(MiniBrowserService))).inSingletonScope();
-    bindContributionProvider(bind, MiniBrowserEndpointHandler);
-    bind(MiniBrowserEndpointHandler).to(HtmlHandler).inSingletonScope();
-    bind(MiniBrowserEndpointHandler).to(ImageHandler).inSingletonScope();
-    bind(MiniBrowserEndpointHandler).to(PdfHandler).inSingletonScope();
-    bind(MiniBrowserEndpointHandler).to(SvgHandler).inSingletonScope();
-    bind(MiniBrowserBackendSecurityWarnings).toSelf().inSingletonScope();
-    bind(BackendApplicationContribution).toService(MiniBrowserBackendSecurityWarnings);
-});
+// *****************************************************************************
+// Copyright (C) 2018 TypeFox and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { ContainerModule } from '@theia/core/shared/inversify';
+import { bindContributionProvider } from '@theia/core/lib/common/contribution-provider';
+import { BackendApplicationContribution } from '@theia/core/lib/node/backend-application';
+import { ConnectionHandler, RpcConnectionHandler } from '@theia/core/lib/common';
+import { MiniBrowserService, MiniBrowserServicePath } from '../common/mini-browser-service';
+import { MiniBrowserEndpoint, MiniBrowserEndpointHandler, HtmlHandler, ImageHandler, PdfHandler, SvgHandler } from './mini-browser-endpoint';
+import { WsRequestValidatorContribution } from '@theia/core/lib/node/ws-request-validators';
+import { MiniBrowserWsRequestValidator } from './mini-browser-ws-validator';
+import { MiniBrowserBackendSecurityWarnings } from './mini-browser-backend-security-warnings';
+
+export default new ContainerModule(bind => {
+    bind(MiniBrowserEndpoint).toSelf().inSingletonScope();
+    bind(BackendApplicationContribution).toService(MiniBrowserEndpoint);
+    bind(MiniBrowserWsRequestValidator).toSelf().inSingletonScope();
+    bind(WsRequestValidatorContribution).toService(MiniBrowserWsRequestValidator);
+    bind(MiniBrowserService).toService(MiniBrowserEndpoint);
+    bind(ConnectionHandler).toDynamicValue(context => new RpcConnectionHandler(MiniBrowserServicePath, () => context.container.get(MiniBrowserService))).inSingletonScope();
+    bindContributionProvider(bind, MiniBrowserEndpointHandler);
+    bind(MiniBrowserEndpointHandler).to(HtmlHandler).inSingletonScope();
+    bind(MiniBrowserEndpointHandler).to(ImageHandler).inSingletonScope();
+    bind(MiniBrowserEndpointHandler).to(PdfHandler).inSingletonScope();
+    bind(MiniBrowserEndpointHandler).to(SvgHandler).inSingletonScope();
+    bind(MiniBrowserBackendSecurityWarnings).toSelf().inSingletonScope();
+    bind(BackendApplicationContribution).toService(MiniBrowserBackendSecurityWarnings);
+});

package/src/node/mini-browser-backend-security-warnings.ts

@@ -1,45 +1,45 @@
-// *****************************************************************************
-// Copyright (C) 2021 Ericsson and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { BackendApplicationContribution } from '@theia/core/lib/node';
-import { BackendApplicationConfigProvider } from '@theia/core/lib/node/backend-application-config-provider';
-import { injectable } from '@theia/core/shared/inversify';
-import { MiniBrowserEndpoint } from '../common/mini-browser-endpoint';
-
-@injectable()
-export class MiniBrowserBackendSecurityWarnings implements BackendApplicationContribution {
-
-    initialize(): void {
-        this.checkHostPattern();
-    }
-
-    protected async checkHostPattern(): Promise<void> {
-        if (BackendApplicationConfigProvider.get()['warnOnPotentiallyInsecureHostPattern'] === false) {
-            return;
-        }
-        const envHostPattern = process.env[MiniBrowserEndpoint.HOST_PATTERN_ENV];
-        if (envHostPattern && envHostPattern !== MiniBrowserEndpoint.HOST_PATTERN_DEFAULT) {
-            console.warn(`\
-MINI BROWSER SECURITY WARNING
-
-    Changing the @theia/mini-browser host pattern can lead to security vulnerabilities.
-        Current pattern: "${envHostPattern}"
-    Please read @theia/mini-browser/README.md for more information.
-`
-            );
-        }
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2021 Ericsson and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { BackendApplicationContribution } from '@theia/core/lib/node';
+import { BackendApplicationConfigProvider } from '@theia/core/lib/node/backend-application-config-provider';
+import { injectable } from '@theia/core/shared/inversify';
+import { MiniBrowserEndpoint } from '../common/mini-browser-endpoint';
+
+@injectable()
+export class MiniBrowserBackendSecurityWarnings implements BackendApplicationContribution {
+
+    initialize(): void {
+        this.checkHostPattern();
+    }
+
+    protected async checkHostPattern(): Promise<void> {
+        if (BackendApplicationConfigProvider.get()['warnOnPotentiallyInsecureHostPattern'] === false) {
+            return;
+        }
+        const envHostPattern = process.env[MiniBrowserEndpoint.HOST_PATTERN_ENV];
+        if (envHostPattern && envHostPattern !== MiniBrowserEndpoint.HOST_PATTERN_DEFAULT) {
+            console.warn(`\
+MINI BROWSER SECURITY WARNING
+
+    Changing the @theia/mini-browser host pattern can lead to security vulnerabilities.
+        Current pattern: "${envHostPattern}"
+    Please read @theia/mini-browser/README.md for more information.
+`
+            );
+        }
+    }
+}