Skip to content
This repository has been archived by the owner on Feb 8, 2024. It is now read-only.

Commit

Permalink
Resolve shell env
Browse files Browse the repository at this point in the history
  • Loading branch information
gzdunek committed Apr 7, 2022
1 parent f3a6165 commit 8feb1ea
Show file tree
Hide file tree
Showing 7 changed files with 188 additions and 16 deletions.
4 changes: 2 additions & 2 deletions packages/teleterm/src/services/pty/fixtures/mocks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export class MockPtyProcess implements PtyProcess {
}

export class MockPtyServiceClient implements PtyServiceClient {
createPtyProcess(): PtyProcess {
return new MockPtyProcess();
createPtyProcess(): Promise<PtyProcess> {
return Promise.resolve(new MockPtyProcess());
}
}
9 changes: 4 additions & 5 deletions packages/teleterm/src/services/pty/ptyProcess.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,10 @@ class PtyProcess extends EventEmitter {
cols,
rows,
name: 'xterm-color',
cwd: this.options.cwd || process.cwd(),
env: {
...process.env,
...this.options.env,
},
// HOME should be always defined. But just in case it isn't let's use the cwd from process.
// https://unix.stackexchange.com/questions/123858
cwd: this.options.cwd || this.options.env['HOME'] || process.cwd(),
env: this.options.env,
});

this._setStatus('open');
Expand Down
12 changes: 9 additions & 3 deletions packages/teleterm/src/services/pty/ptyService.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
import { RuntimeSettings } from 'teleterm/types';
import PtyProcess, { TermEventEnum } from './ptyProcess';
import { PtyCommand, PtyOptions, PtyServiceClient } from './types';
import { resolveShellEnvCached } from './resolveShellEnv';

export default function createPtyService(
settings: RuntimeSettings
): PtyServiceClient {
return {
createPtyProcess(cmd: PtyCommand) {
const options = buildOptions(settings, cmd);
async createPtyProcess(cmd: PtyCommand) {
const options = await buildOptions(settings, cmd);
const _ptyProcess = new PtyProcess(options);

return {
Expand Down Expand Up @@ -55,8 +56,13 @@ export default function createPtyService(
};
}

function buildOptions(settings: RuntimeSettings, cmd: PtyCommand): PtyOptions {
async function buildOptions(
settings: RuntimeSettings,
cmd: PtyCommand
): Promise<PtyOptions> {
const env = {
...process.env,
...(await resolveShellEnvCached(settings.defaultShell)),
TELEPORT_HOME: settings.tshd.homeDir,
};

Expand Down
159 changes: 159 additions & 0 deletions packages/teleterm/src/services/pty/resolveShellEnv.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,159 @@
/**
Copyright 2022 Gravitational, Inc.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

/**
MIT License
Copyright (c) 2015 - present Microsoft Corporation
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
*/

// Based on https://github.com/microsoft/vscode/blob/1.66.0/src/vs/platform/shell/node/shellEnv.ts

import { Logger } from 'shared/libs/logger';
import { unique } from 'teleterm/ui/utils/uid';
import { spawn } from 'child_process';
import { memoize } from 'lodash';

const logger = new Logger('resolveShellEnv()');
const resolveShellMaxTime = 8000; // 8s

export const resolveShellEnvCached = memoize(resolveShellEnv);

async function resolveShellEnv(shell: string): Promise<typeof process.env> {
if (process.platform === 'win32') {
logger.trace('skipped Windows platform');
return;
}
// TODO(grzegorz) skip if already running from CLI

const timeoutController = new AbortController();
const timeout = setTimeout(() => {
timeoutController.abort();
}, resolveShellMaxTime);

try {
return await resolveUnixShellEnv(shell, timeoutController.signal);
} finally {
clearTimeout(timeout);
}
}

async function resolveUnixShellEnv(
shell: string,
abortSignal: AbortSignal
): Promise<typeof process.env> {
const runAsNode = process.env['ELECTRON_RUN_AS_NODE'];
const noAttach = process.env['ELECTRON_NO_ATTACH_CONSOLE'];

const mark = unique().replace(/-/g, '').substring(0, 12);
const regex = new RegExp(mark + '(.*)' + mark);

const env = {
...process.env,
ELECTRON_RUN_AS_NODE: '1',
ELECTRON_NO_ATTACH_CONSOLE: '1',
};

return new Promise<typeof process.env>((resolve, reject) => {
const command = `'${process.execPath}' -p '"${mark}" + JSON.stringify(process.env) + "${mark}"'`;
// When bash is run with -c, it is considered a non-interactive shell, and it does not read ~/.bashrc, unless is -i specified.
// https://unix.stackexchange.com/questions/277312/is-the-shell-created-by-bash-i-c-command-interactive
const shellArgs = shell === '/bin/tcsh' ? ['-ic'] : ['-ilc'];

logger.trace(`Reading shell ${shell} ${shellArgs} ${command}`);

const child = spawn(shell, [...shellArgs, command], {
detached: true,
stdio: ['ignore', 'pipe', 'pipe'],
env,
});

abortSignal.onabort = () => {
child.kill();
logger.warn('Reading shell env timed out');
reject(
new Error(
'Unable to resolve shell environment. Please review shell configuration.'
)
);
};

child.on('error', err => {
reject(err);
});

const buffers: Buffer[] = [];
child.stdout.on('data', b => buffers.push(b));

const stderr: Buffer[] = [];
child.stderr.on('data', b => stderr.push(b));

child.on('close', (code, signal) => {
const raw = Buffer.concat(buffers).toString('utf8');
const stderrStr = Buffer.concat(stderr).toString('utf8');

if (code || signal) {
logger.warn(
`Unexpected exit code from spawned shell (code ${code}, signal ${signal})`,
stderrStr
);
return reject(new Error(stderrStr));
}

const match = regex.exec(raw);
const rawStripped = match ? match[1] : '{}';

try {
const env = JSON.parse(rawStripped);

if (runAsNode) {
env['ELECTRON_RUN_AS_NODE'] = runAsNode;
} else {
delete env['ELECTRON_RUN_AS_NODE'];
}

if (noAttach) {
env['ELECTRON_NO_ATTACH_CONSOLE'] = noAttach;
} else {
delete env['ELECTRON_NO_ATTACH_CONSOLE'];
}

resolve(env);
} catch (error) {
logger.warn('Failed to parse stdout', error);
reject(error);
}
});
});
}
2 changes: 1 addition & 1 deletion packages/teleterm/src/services/pty/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export type PtyProcess = {
};

export type PtyServiceClient = {
createPtyProcess: (cmd: PtyCommand) => PtyProcess;
createPtyProcess: (cmd: PtyCommand) => Promise<PtyProcess>;
};

export type ShellCommand = {
Expand Down
16 changes: 11 additions & 5 deletions packages/teleterm/src/ui/DocumentTerminal/useDocumentTerminal.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@ import { useEffect } from 'react';
import { useAppContext } from 'teleterm/ui/appContextProvider';
import { IAppContext } from 'teleterm/ui/types';
import * as types from 'teleterm/ui/services/workspacesService';
import { PtyCommand } from 'teleterm/services/pty/types';
import useAsync from 'teleterm/ui/useAsync';
import { DocumentsService } from 'teleterm/ui/services/workspacesService';
import { PtyCommand, PtyProcess } from 'teleterm/services/pty/types';
import useAsync from 'teleterm/ui/useAsync';
import { useWorkspaceDocumentsService } from 'teleterm/ui/Documents';

export default function useDocumentTerminal(doc: Doc) {
const ctx = useAppContext();
const workspaceDocumentsService = useWorkspaceDocumentsService();
const [state, init] = useAsync(async () =>
initState(ctx, workspaceDocumentsService, doc)
initState(ctx, workspaceDocumentsService, doc),
);

useEffect(() => {
Expand All @@ -43,10 +43,16 @@ export default function useDocumentTerminal(doc: Doc) {
async function initState(
ctx: IAppContext,
docsService: DocumentsService,
doc: Doc
doc: Doc,
) {
const cmd = createCmd(doc);
const ptyProcess = ctx.terminalsService.createPtyProcess(cmd);
let ptyProcess: PtyProcess;
try {
ptyProcess = await ctx.terminalsService.createPtyProcess(cmd);
} catch (e) {
ctx.notificationsService.notifyError(e.message);
return;
}
const openContextMenu = () => ctx.mainProcessClient.openTerminalContextMenu();

const refreshTitle = async () => {
Expand Down
2 changes: 2 additions & 0 deletions packages/teleterm/src/ui/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import { QuickInputService } from 'teleterm/ui/services/quickInput';
import { CommandLauncher } from 'teleterm/ui/commandLauncher';
import { KeyboardShortcutsService } from 'teleterm/ui/services/keyboardShortcuts';
import { WorkspacesService } from 'teleterm/ui/services/workspacesService';
import { NotificationsService } from 'teleterm/ui/services/notifications';

export interface IAppContext {
clustersService: ClustersService;
Expand All @@ -30,6 +31,7 @@ export interface IAppContext {
keyboardShortcutsService: KeyboardShortcutsService;
quickInputService: QuickInputService;
mainProcessClient: MainProcessClient;
notificationsService: NotificationsService;
commandLauncher: CommandLauncher;
workspacesService: WorkspacesService;
}

0 comments on commit 8feb1ea

Please # to comment.