safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-07 21:51:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-524: Switch to "LDAP_" prefix for LDAP user attribute tokens.

Browse Source
This commit is contained in:
Michael Jumper
2018-10-05 12:54:00 -07:00
parent cb30b148b9
commit 13e2b06666
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/TokenName.java
View File

@@ -31,7 +31,7 @@ public class TokenName {
* The prefix string to add to each parameter token generated from an LDAP * The prefix string to add to each parameter token generated from an LDAP
* attribute name. * attribute name.
*/ */
private static final String LDAP_ATTRIBUTE_TOKEN_PREFIX = "LDAP_ATTR_"; private static final String LDAP_ATTRIBUTE_TOKEN_PREFIX = "LDAP_";
/** /**
* Pattern which matches logical groupings of words within an LDAP * Pattern which matches logical groupings of words within an LDAP
@@ -71,7 +71,7 @@ public class TokenName {
* will automatically be transformed from "CamelCase", "headlessCamelCase", * will automatically be transformed from "CamelCase", "headlessCamelCase",
* "lowercase_with_underscores", and "mixes_ofBoth_Styles" to consistent * "lowercase_with_underscores", and "mixes_ofBoth_Styles" to consistent
* "UPPERCASE_WITH_UNDERSCORES". Each returned attribute will be prefixed * "UPPERCASE_WITH_UNDERSCORES". Each returned attribute will be prefixed
* with "LDAP_ATTR_". * with "LDAP_".
* *
* @param name * @param name
* The name of the LDAP attribute to use to generate the token name. * The name of the LDAP attribute to use to generate the token name.

28
extensions/guacamole-auth-ldap/src/test/java/org/apache/guacamole/auth/ldap/TokenNameTest.java
View File

@@ -34,20 +34,20 @@ public class TokenNameTest {
*/ */
@Test @Test
public void testFromAttribute() { public void testFromAttribute() {
assertEquals("LDAP_ATTR_A", TokenName.fromAttribute("a")); assertEquals("LDAP_A", TokenName.fromAttribute("a"));
assertEquals("LDAP_ATTR_B", TokenName.fromAttribute("b")); assertEquals("LDAP_B", TokenName.fromAttribute("b"));
assertEquals("LDAP_ATTR_1", TokenName.fromAttribute("1")); assertEquals("LDAP_1", TokenName.fromAttribute("1"));
assertEquals("LDAP_ATTR_SOME_URL", TokenName.fromAttribute("someURL")); assertEquals("LDAP_SOME_URL", TokenName.fromAttribute("someURL"));
assertEquals("LDAP_ATTR_LOWERCASE_WITH_DASHES", TokenName.fromAttribute("lowercase-with-dashes")); assertEquals("LDAP_LOWERCASE_WITH_DASHES", TokenName.fromAttribute("lowercase-with-dashes"));
assertEquals("LDAP_ATTR_HEADLESS_CAMEL_CASE", TokenName.fromAttribute("headlessCamelCase")); assertEquals("LDAP_HEADLESS_CAMEL_CASE", TokenName.fromAttribute("headlessCamelCase"));
assertEquals("LDAP_ATTR_CAMEL_CASE", TokenName.fromAttribute("CamelCase")); assertEquals("LDAP_CAMEL_CASE", TokenName.fromAttribute("CamelCase"));
assertEquals("LDAP_ATTR_CAMEL_CASE", TokenName.fromAttribute("CamelCase")); assertEquals("LDAP_CAMEL_CASE", TokenName.fromAttribute("CamelCase"));
assertEquals("LDAP_ATTR_LOWERCASE_WITH_UNDERSCORES", TokenName.fromAttribute("lowercase_with_underscores")); assertEquals("LDAP_LOWERCASE_WITH_UNDERSCORES", TokenName.fromAttribute("lowercase_with_underscores"));
assertEquals("LDAP_ATTR_UPPERCASE_WITH_UNDERSCORES", TokenName.fromAttribute("UPPERCASE_WITH_UNDERSCORES")); assertEquals("LDAP_UPPERCASE_WITH_UNDERSCORES", TokenName.fromAttribute("UPPERCASE_WITH_UNDERSCORES"));
assertEquals("LDAP_ATTR_A_VERY_INCONSISTENT_MIX_OF_ALL_STYLES", TokenName.fromAttribute("aVery-INCONSISTENTMix_ofAllStyles")); assertEquals("LDAP_A_VERY_INCONSISTENT_MIX_OF_ALL_STYLES", TokenName.fromAttribute("aVery-INCONSISTENTMix_ofAllStyles"));
assertEquals("LDAP_ATTR_ABC_123_DEF_456", TokenName.fromAttribute("abc123def456")); assertEquals("LDAP_ABC_123_DEF_456", TokenName.fromAttribute("abc123def456"));
assertEquals("LDAP_ATTR_ABC_123_DEF_456", TokenName.fromAttribute("ABC123DEF456")); assertEquals("LDAP_ABC_123_DEF_456", TokenName.fromAttribute("ABC123DEF456"));
assertEquals("LDAP_ATTR_WORD_A_WORD_AB_WORD_ABC_WORD", TokenName.fromAttribute("WordAWordABWordABCWord")); assertEquals("LDAP_WORD_A_WORD_AB_WORD_ABC_WORD", TokenName.fromAttribute("WordAWordABWordABCWord"));
} }
} }