dub-mirrors/mirage-config
1
0
Fork 0
mirror of https://github.com/mbierlee/mirage-config.git synced 2024-11-15 04:44:01 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add escaping and hardening

Browse source
This commit is contained in:
Mike Bierlee 2022-09-29 02:04:58 +03:00
parent 01a555be55
commit bad8f0ec6d
1 changed files with 55 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
source/mirage/config.d
View file

@ -431,10 +431,15 @@ class ConfigDictionary {
auto result = "";
auto isParsingEnvVar = false;
auto isParsingDefault = false;
auto escapeNextCharacter = false;
auto varName = "";
auto defaultVarValue = "";
void addVarValueToResult() {
if (varName.length == 0) {
return;
}
string[] exceptionMessageParts;
if (substituteEnvironmentVariables) {
@ -466,6 +471,17 @@ class ConfigDictionary {
}
foreach (size_t i, char c; value) {
if (escapeNextCharacter) {
result ~= c;
escapeNextCharacter = false;
continue;
}
if (c == '\\' && value.length.to!int - 1 > i && value[i + 1] == '$') {
escapeNextCharacter = true;
continue;
}
if (c == '$') {
isParsingEnvVar = true;
continue;
@ -502,8 +518,12 @@ class ConfigDictionary {
result ~= c;
}
if (varName.length > 0) {
addVarValueToResult();
if (isParsingEnvVar) {
if (varName.length > 0) {
addVarValueToResult();
} else {
result ~= '$';
}
}
return result;
@ -939,5 +959,38 @@ version (unittest) {
assert(config.get("two") == "punch");
}
@("Escaping avoids variable substitution")
unittest {
auto config = new ConfigDictionary(new ObjectNode([
"only dollar": "\\$ESCAPE_WITH_MY_LIFE",
"with brackets": "\\${YOU WON'T GET ME}",
])
);
assert(config.get("only dollar") == "$ESCAPE_WITH_MY_LIFE");
assert(config.get("with brackets") == "${YOU WON'T GET ME}");
}
@("Wonky values")
unittest {
auto config = new ConfigDictionary(new ObjectNode([
"just a dollar": "$",
"final escape": "\\",
"escape with money": "\\$",
"brackets": "{}",
"empty bracket money": "${}",
"smackers": "$$$$$",
"weird bash escape thingy": "$$",
"escape room": "\\\\"
]));
assert(config.get("just a dollar") == "$");
assert(config.get("final escape") == "\\");
assert(config.get("escape with money") == "$");
assert(config.get("brackets") == "{}");
assert(config.get("empty bracket money") == "");
assert(config.get("smackers") == "$");
assert(config.get("escape room") == "\\\\");
}
//TODO: Test null nodes should gracefully fail
}