development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-12 06:17:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

cli: avoid interactions when running integrated (#167780)

Browse source 
Fixes https://github.com/microsoft/vscode/issues/167760

The VS Code CLI gets run from a bash/shell script. This prevents interactions--in the former case, it doesn't look like a tty, and in the latter case batch scripts don't seem to support having interactive subprocesses.

This PR avoids interactions if stdin is not a tty, prompting the user to use the flag instead. Use of the flag is also persisted like an interactive agreement prompt.
This commit is contained in:
Connor Peet 2022-11-30 15:15:08 -08:00 committed by GitHub
parent 968026a46d
commit c87fa19f79
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cli/src/constants.rs
View file

@ -61,6 +61,8 @@ pub const QUALITYLESS_SERVER_NAME: &str = concatcp!(QUALITYLESS_PRODUCT_NAME, "
/// Web URL the editor is hosted at. For VS Code, this is vscode.dev.
pub const EDITOR_WEB_URL: Option<&'static str> = option_env!("VSCODE_CLI_EDITOR_WEB_URL");
const NONINTERACTIVE_VAR: &str = "VSCODE_CLI_NONINTERACTIVE";
pub fn get_default_user_agent() -> String {
format!(
"vscode-server-launcher/{}",
@ -94,4 +96,7 @@ lazy_static! {
/// Map of qualities to the server name
pub static ref SERVER_NAME_MAP: Option<HashMap<Quality, String>> =
option_env!("VSCODE_CLI_SERVER_NAME_MAP").and_then(|s| serde_json::from_str(s).unwrap());
/// Whether i/o interactions are allowed in the current CLI.
pub static ref IS_INTERACTIVE_CLI: bool = atty::is(atty::Stream::Stdin) && std::env::var(NONINTERACTIVE_VAR).is_err();
}

4
cli/src/tunnels/dev_tunnels.rs
View file

@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/
use crate::auth;
use crate::constants::{
CONTROL_PORT, PROTOCOL_VERSION_TAG, PROTOCOL_VERSION_TAG_PREFIX, TUNNEL_SERVICE_USER_AGENT,
CONTROL_PORT, PROTOCOL_VERSION_TAG, PROTOCOL_VERSION_TAG_PREFIX, TUNNEL_SERVICE_USER_AGENT, IS_INTERACTIVE_CLI,
};
use crate::state::{LauncherPaths, PersistedState};
use crate::util::errors::{
@ -659,7 +659,7 @@ impl DevTunnels {
}
let mut placeholder_name = name_generator::generate_name(MAX_TUNNEL_NAME_LENGTH);
if use_random_name {
if use_random_name || !*IS_INTERACTIVE_CLI {
while !is_name_free(&placeholder_name) {
placeholder_name = name_generator::generate_name(MAX_TUNNEL_NAME_LENGTH);
}

23
cli/src/tunnels/legal.rs
View file

@ -2,7 +2,7 @@
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
use crate::constants::PRODUCT_NAME_LONG;
use crate::constants::{IS_INTERACTIVE_CLI, PRODUCT_NAME_LONG};
use crate::state::{LauncherPaths, PersistedState};
use crate::util::errors::{AnyError, MissingLegalConsent};
use crate::util::input::prompt_yn;
@ -25,10 +25,6 @@ pub fn require_consent(
None => return Ok(()),
}
if accept_server_license_terms {
return Ok(());
}
let prompt = match LICENSE_PROMPT {
Some(p) => p,
None => return Ok(()),
@ -37,13 +33,19 @@ pub fn require_consent(
let license: PersistedState<PersistedConsent> =
PersistedState::new(paths.root().join("license_consent.json"));
let mut save = false;
let mut load = license.load();
if let Some(true) = load.consented {
return Ok(());
}
if !load.consented.unwrap_or(false) {
if accept_server_license_terms {
load.consented = Some(true);
} else if !*IS_INTERACTIVE_CLI {
return Err(MissingLegalConsent("Run this command again with --accept-server-license-terms to indicate your agreement.".to_string())
.into());
} else {
match prompt_yn(prompt) {
Ok(true) => {
save = true;
load.consented = Some(true);
}
Ok(false) => {
@ -56,9 +58,6 @@ pub fn require_consent(
}
}
if save {
license.save(load)?;
}
license.save(load)?;
Ok(())
}

13
src/vs/code/node/cli.ts
View file

@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { ChildProcess, spawn, SpawnOptions } from 'child_process';
import { ChildProcess, ChildProcessWithoutNullStreams, spawn, SpawnOptions } from 'child_process';
import { chmodSync, existsSync, readFileSync, statSync, truncateSync, unlinkSync } from 'fs';
import { homedir, release, tmpdir } from 'os';
import type { ProfilingSession, Target } from 'v8-inspect-profiler';
@ -55,7 +55,7 @@ export async function main(argv: string[]): Promise<any> {
return;
}
return new Promise((resolve, reject) => {
let tunnelProcess;
let tunnelProcess: ChildProcessWithoutNullStreams;
if (process.env['VSCODE_DEV']) {
tunnelProcess = spawn('cargo', ['run', '--', 'tunnel', ...argv.slice(5)], { cwd: join(getAppRoot(), 'cli') });
} else {
@ -67,12 +67,9 @@ export async function main(argv: string[]): Promise<any> {
const tunnelArgs = argv.slice(3);
tunnelProcess = spawn(tunnelCommand, ['tunnel', ...tunnelArgs]);
}
tunnelProcess.stdout.on('data', data => {
console.log(data.toString());
});
tunnelProcess.stderr.on('data', data => {
console.error(data.toString());
});
tunnelProcess.stdout.pipe(process.stdout);
tunnelProcess.stderr.pipe(process.stderr);
tunnelProcess.on('exit', resolve);
tunnelProcess.on('error', reject);
});