safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 13:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-1081: Merge support for parameter token modifiers.

Browse Source
This commit is contained in:
Mike Jumper
2020-05-25 18:15:32 -07:00
committed by GitHub
parent e4aa6bd451 e216f83c49
commit 4fec4638fc
2 changed files with 53 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
guacamole-ext/src/main/java/org/apache/guacamole/token/TokenFilter.java
View File

@@ -39,7 +39,7 @@ public class TokenFilter {
* escape character preceding the token, the name of the token, and the
* entire token itself.
*/
private final Pattern tokenPattern = Pattern.compile("(.*?)(^|.)(\\$\\{([A-Za-z0-9_]*)\\})");
private final Pattern tokenPattern = Pattern.compile("(.*?)(^|.)(\\$\\{([A-Za-z0-9_]*)(\\:(.*))?\\})");
/**
* The index of the capturing group within tokenPattern which matches
@@ -66,6 +66,12 @@ public class TokenFilter {
*/
private static final int TOKEN_NAME_GROUP = 4;
/**
* The index of the capturing group within tokenPattern which matches the
* string of the actual modifier for the token.
*/
private static final int TOKEN_MODIFIER = 6;
/**
* The values of all known tokens.
*/
@@ -182,6 +188,7 @@ public class TokenFilter {
// Pull possible leading text and first char before possible token
String literal = tokenMatcher.group(LEADING_TEXT_GROUP);
String escape = tokenMatcher.group(ESCAPE_CHAR_GROUP);
String modifier = tokenMatcher.group(TOKEN_MODIFIER);
// Append leading non-token text
output.append(literal);
@@ -208,12 +215,36 @@ public class TokenFilter {
output.append(notToken);
}
// Otherwise, substitute value
// Otherwise, check for modifiers and substitute value appropriately
else {
// If a modifier is present, try to use it.
if (modifier != null && !modifier.isEmpty()) {
switch (modifier) {
// Switch token to upper-case
case "upper":
output.append(tokenValue.toUpperCase());
break;
// Switch token to lower case
case "lower":
output.append(tokenValue.toLowerCase());
break;
// Just append the token value
default:
output.append(tokenValue);
}
}
// No modifier present, so just append token value.
else
output.append(tokenValue);
}
}
// Update last regex match
endOfLastMatch = tokenMatcher.end();

20
guacamole-ext/src/test/java/org/apache/guacamole/token/TokenFilterTest.java
View File

@@ -39,6 +39,7 @@ public class TokenFilterTest {
TokenFilter tokenFilter = new TokenFilter();
tokenFilter.setToken("TOKEN_A", "value-of-a");
tokenFilter.setToken("TOKEN_B", "value-of-b");
tokenFilter.setToken("TOKEN_C", "Value-of-C");
// Test basic substitution and escaping
assertEquals(
@@ -48,8 +49,23 @@ public class TokenFilterTest {
// Unknown tokens must be interpreted as literals
assertEquals(
"${NOPE}hellovalue-of-aworld${TOKEN_C}",
tokenFilter.filter("${NOPE}hello${TOKEN_A}world${TOKEN_C}")
"${NOPE}hellovalue-of-aworld${TOKEN_D}",
tokenFilter.filter("${NOPE}hello${TOKEN_A}world${TOKEN_D}")
);
assertEquals(
"Value-of-C",
tokenFilter.filter("${TOKEN_C}")
);
assertEquals(
"value-of-c",
tokenFilter.filter("${TOKEN_C:lower}")
);
assertEquals(
"VALUE-OF-C",
tokenFilter.filter("${TOKEN_C:upper}")
);
}