Merge branch 'fix-843' into 'master'

  Check non-alphanumeric variable names and first char for digits

Closes #843

See merge request redox-os/ion!940

src/lib/parser/mod.rs

@@ -3,7 +3,7 @@ mod loops;
 pub(crate) mod pipelines;
 mod quotes;
 pub(crate) mod shell_expand;
-mod statement;
+pub(crate) mod statement;
 
 pub use self::quotes::Terminator;
 pub(crate) use self::{

src/lib/parser/statement/mod.rs

 mod case;
 mod functions;
 #[cfg(not(fuzzing))]
-mod parse;
+pub mod parse;
 #[cfg(fuzzing)]
 pub mod parse;
 mod splitter;

src/lib/parser/statement/parse.rs

@@ -26,7 +26,13 @@ where
     }
 }
 
-fn is_valid_name(name: &str) -> bool { !name.chars().any(|c| !(c.is_alphanumeric() || c == '_')) }
+pub fn is_valid_name(name: &str) -> bool {
+    if !(name.as_bytes()[0] as char).is_numeric() {
+        !name.chars().any(|c| !(c.is_alphanumeric() || c == '_'))
+    } else {
+        false
+    }
+}
 
 pub(crate) fn parse(code: &str) -> Statement {
     let cmd = code.trim();

src/lib/shell/assignments.rs

@@ -5,7 +5,7 @@ use super::{
 };
 use crate::{
     lexers::assignments::{Key, Operator, Primitive},
-    parser::assignments::*,
+    parser::{assignments::*, statement::parse::is_valid_name},
     shell::{history::ShellHistory, variables::Value},
     types,
 };
@@ -124,6 +124,10 @@ impl VariableStore for Shell {
                     // sanitize variable names
                     if ["HOME", "HOST", "PWD", "MWD", "SWD", "?"].contains(&key.name) {
                         Err(format!("not allowed to set `{}`", key.name))
+                    } else if !is_valid_name(key.name) {
+                        Err("invalid variable name\nVariable names may only have A-Z, a-z, 0-9 \
+                             and _\nThe first character cannot be a digit"
+                            .into())
                     } else {
                         Ok((key, operator, expression))
                     }