Mirrors/nushell
2
0
Fork 0
mirror of https://github.com/nushell/nushell synced 2024-12-27 21:43:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix capturing environment variables with " or ' (#537)

Browse source 
* Fix path expand error span

* Fix capturing env vars containing ' or "; Rustfmt
This commit is contained in:
Jakub Žádník 2021-12-20 23:19:43 +02:00 committed by GitHub
parent 0571a6ee34
commit 1609101e62
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 46 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
crates/nu-command/src/path/expand.rs
View file

@ -111,11 +111,12 @@ fn expand(path: &Path, span: Span, args: &Arguments) -> Value {
Value::string(p.to_string_lossy(), span)
} else if args.strict {
Value::Error {
error: ShellError::LabeledError(
error: ShellError::SpannedLabeledError(
"Could not expand path".into(),
"could not be expanded (path might not exist, non-final \
component is not a directory, or other cause)"
.into(),
span,
),
}
} else {

2
crates/nu-protocol/src/shell_error.rs
View file

@ -251,7 +251,7 @@ pub enum ShellError {
SpannedLabeledErrorHelp(String, String, #[label("{1}")] Span, String),
#[error("{0}")]
#[diagnostic()]
#[diagnostic(help("{1}"))]
LabeledError(String, String),
}

47
src/main.rs
View file

@ -434,11 +434,30 @@ fn main() -> Result<()> {
fn gather_parent_env_vars(engine_state: &mut EngineState, stack: &mut Stack) {
let mut fake_env_file = String::new();
for (name, val) in std::env::vars() {
let c = if val.contains('"') {
if val.contains('\'') {
// environment variable containing both ' and " is ignored
let working_set = StateWorkingSet::new(engine_state);
report_error(
&working_set,
&ShellError::LabeledError(
format!("Environment variable was not captured: {}={}", name, val),
"Value should not contain both ' and \" at the same time.".into(),
),
);
continue;
} else {
'\''
}
} else {
'"'
};
fake_env_file.push_str(&name);
fake_env_file.push('=');
fake_env_file.push('"');
fake_env_file.push(c);
fake_env_file.push_str(&val);
fake_env_file.push('"');
fake_env_file.push(c);
fake_env_file.push('\n');
}
@ -474,14 +493,34 @@ fn gather_parent_env_vars(engine_state: &mut EngineState, stack: &mut Stack) {
}) = parts.get(2)
{
let bytes = engine_state.get_span_contents(span);
let bytes = bytes.strip_prefix(&[b'"']).unwrap_or(bytes);
let bytes = bytes.strip_suffix(&[b'"']).unwrap_or(bytes);
if bytes.len() < 2 {
let working_set = StateWorkingSet::new(engine_state);
report_error(
&working_set,
&ShellError::NushellFailed(format!(
"Error capturing environment variable {}",
name
)),
);
}
let bytes = &bytes[1..bytes.len() - 1];
Value::String {
val: String::from_utf8_lossy(bytes).to_string(),
span: *span,
}
} else {
let working_set = StateWorkingSet::new(engine_state);
report_error(
&working_set,
&ShellError::NushellFailed(format!(
"Error capturing environment variable {}",
name
)),
);
Value::String {
val: "".to_string(),
span: Span::new(full_span.end, full_span.end),