Michael Jumper
bf3d27611d
GUACAMOLE-146: Merge changes allowing webapp context path to be overridden.
2018-06-11 14:19:45 -07:00
Jared Frees
3abc996658
GUACAMOLE-524: Add custom attribute tokens with tokenFilter
2018-06-11 15:15:31 -04:00
Jared Frees
f5f9f62786
GUACAMOLE-524: Changed to use AuthenticatedUser instead of Credentials
...
Fixed up some code style and add attributes in AuthenticatedUser object.
2018-06-11 15:14:18 -04:00
Jared Frees
64e29b952b
GUACAMOLE-524: Add arbitrary attributes on AuthenticatedUser
...
Add attribute map to AuthenticatedUser along with methods for
retrieving and setting map. Also, make AuthenticatedUser
implement Attributes.
2018-06-11 15:05:20 -04:00
Jared Frees
165d3d0d0d
GUACAMOLE-524: Add Custom Attributes to Tokens
...
Added method to add custom map of tokens to StandardTokens.
2018-06-11 14:59:12 -04:00
Nick Couchman
65b03df3bd
GUACAMOLE-146: Allow webapp context to be specified in Docker with environment variable.
2018-06-11 13:07:43 -04:00
Jared Frees
4c1281d8c2
GUACAMOLE-524: Removed changes to Credentials
2018-06-11 11:17:06 -04:00
Nick Couchman
164e6086a8
GUACAMOLE-569: Merge add Simplified Chinese translation.
2018-06-10 20:41:04 -04:00
Freddie Wu
8f038edd45
GUACAMOLE-569: remove zh-cn-qwerty layout as it's the same as en-us-qwerty
2018-06-10 11:06:31 +08:00
Jared Frees
ad6be80131
GUACAMOLE-524: Add LDAP attribute tokens to StandardTokens.
...
In method addStandardTokens(TokenFilter, Credentials),
adds each LDAP attribute from credentials.getLDAPAttributes().
Name of token is "USER_ATTR:" + name of attribute and value
is the value of the attribute.
2018-06-08 15:06:00 -04:00
Jared Frees
5ca32a221a
GUACAMOLE-524: Add LDAP attributes to credentials.
...
AuthenticationProviderService gets LDAP attributes
from confService and queries the LDAP server to
find values on user for specified attributes.
Added a Map<String, String> to Credentials named ldapAttrs
and a getLDAPAttributes() and setLDAPAttributes() to
manipulate ldapAttrs on credentials. Once
AuthenticationProviderService gets the values for the
LDAP attributes it sets ldapAttrs on the credentials object.
2018-06-08 15:05:59 -04:00
Jared Frees
38eb97b422
GUACAMOLE-524: Added reading of LDAP attributes in guacamole.properties named 'ldap-user-attributes'.
...
Added method getAttributes() in ConfigurationService to read environment property
LDAPGuacamoleProperties.LDAP_USER_ATTRIBUTES. These
attributes are arbitrary LDAP attributes that will
be mapped to the user in credentials and
tokens.
2018-06-08 15:04:11 -04:00
Michael Jumper
7e6df7c139
GUACAMOLE-571: Merge correction to "rootConnectionGroups" typo in home controller.
2018-06-08 00:03:57 -07:00
Nick Couchman
3a0b9e1550
GUACAMOLE-571: Fix rootConnectionGroup typo in homeController.
2018-06-07 16:58:45 -04:00
Nick Couchman
b0dffbc05e
Merge 1.0.0 changes back to master.
2018-06-07 16:40:46 -04:00
Nick Couchman
0163cfc30c
GUACAMOLE-470: Merge remove translations for color-scheme enum values.
2018-06-07 16:39:29 -04:00
Nick Couchman
0e856d7a21
Merge 1.0.0 changes back to master.
2018-06-07 04:29:44 -04:00
Nick Couchman
6545c55008
GUACAMOLE-570: Merge bump version to 1.0.0.
2018-06-07 04:27:27 -04:00
Nick Couchman
19971107aa
Merge 1.0.0 changes back to master.
2018-06-06 10:17:46 -04:00
Nick Couchman
c63e3ffa51
GUACAMOLE-565: Merge add en translations for terminal-type parameter.
2018-06-06 10:15:19 -04:00
Jim Chen
edecaa46b2
GUACAMOLE-565: Add en translations for terminal-type parameter.
...
Add en translations for the terminal-type parameter and its enum values.
Also add an empty value to the terminal-type enum lists.
2018-06-06 10:00:04 -04:00
Michael Jumper
45513592a7
GUACAMOLE-570: Bump version numbers to 1.0.0.
2018-06-05 21:34:26 -07:00
Jim Chen
06f98afcf5
GUACAMOLE-470: Remove translations for "color-scheme" enum values.
...
Remove translations for the "color-scheme" enum values, because the
field type is now "TEXT" and not "ENUM" anymore. Changing the field type
to "TEXT" does have the disadvantage of losing localized enum choices.
Maybe it would be better to keep "color-scheme" an ENUM, and add a
"custom-color-scheme" TEXT field for customized color schemes?
2018-06-05 22:42:16 -04:00
Freddie Wu
fa6a256f00
GUACAMOLE-569: add Simplified Chinese translation
2018-06-06 10:01:12 +08:00
Freddie Wu
9cd97eaf66
GUACAMOLE-569: fix minor typo error
2018-06-06 10:00:46 +08:00
Michael Jumper
2daf38b32c
Merge 1.0.0 changes back to master.
2018-06-03 12:05:55 -07:00
Michael Jumper
72bc8c01a3
GUACAMOLE-38: Merge support for dynamically defining connections using URLs.
2018-06-03 12:04:00 -07:00
Nick Couchman
1438a5117b
GUACAMOLE-38: Methods being tested need to be public.
2018-06-01 13:40:53 -04:00
Nick Couchman
97d2d3a2c9
GUACAMOLE-38: Clean up comments and make a couple of methods private.
2018-06-01 13:40:53 -04:00
Nick Couchman
6d0b6d6494
GUACAMOLE-38: Update comments to match recent changes in return type of REST create method.
2018-06-01 13:40:53 -04:00
Nick Couchman
b283adc73a
GUACAMOLE-38: REST service should return proper JSON.
2018-06-01 13:40:53 -04:00
Nick Couchman
730201358e
GUACAMOLE-38: Implement QuickConnectException for providing exceptions to the user.
2018-06-01 13:40:53 -04:00
Nick Couchman
8c130215f4
GUACAMOLE-38: Remove default protocol and port, throw errors if not specified.
2018-06-01 13:40:53 -04:00
Nick Couchman
84e71a029c
GUACAMOLE-38: Put userInfo directly into configuration.
2018-06-01 13:40:53 -04:00
Nick Couchman
aaada49dfe
GUACAMOLE-38: Clean up minor code issues.
2018-06-01 13:40:53 -04:00
Nick Couchman
27f4ad01f5
GUACAMOLE-38: Add unit tests for the userInfo parser and the getConfiguration method.
2018-06-01 13:40:53 -04:00
Nick Couchman
aafc4359c8
GUACAMOLE-38: Break userInfo parsing into its own function, and properly decode username and password.
2018-06-01 13:40:52 -04:00
Nick Couchman
6dad254c14
GUACAMOLE-38: Fix use of superclass methods.
2018-06-01 13:40:52 -04:00
Nick Couchman
f563925aa7
GUACAMOLE-38: Relocate the toolbar and restyle it.
2018-06-01 13:40:52 -04:00
Nick Couchman
56cc11e1b9
GUACAMOLE-38: Tweak style and translation issues.
2018-06-01 13:40:52 -04:00
Nick Couchman
2a9c7fe0b7
GUACAMOLE-38: Rearrange logic in QCParser class.
2018-06-01 13:40:52 -04:00
Nick Couchman
7df88cdfbd
GUACAMOLE-38: Fix issues with root identifier and directory.
2018-06-01 13:40:52 -04:00
Nick Couchman
555b26ae1f
GUACAMOLE-38: Use ConcurrentHashMap for threadsafety.
2018-06-01 13:40:52 -04:00
Nick Couchman
201fbcd5a5
GUACAMOLE-38: Updated AngularJS components for compatibility with 1.6.x.
2018-06-01 13:40:52 -04:00
Nick Couchman
6629451892
GUACAMOLE-38: Remove bundled aopalliance license.
2018-06-01 13:40:52 -04:00
Nick Couchman
cfd1673791
GUACAMOLE-38: Code cleanup; style, and grammar tweaks.
2018-06-01 13:40:52 -04:00
Nick Couchman
aabc871d7d
GUACAMOLE-38: Add unit test for query string parser.
2018-06-01 13:40:52 -04:00
Nick Couchman
1011845032
GUACAMOLE-38: Break query string parsing into its own method.
2018-06-01 13:40:52 -04:00
Nick Couchman
d9751f20d0
GUACAMOLE-38: REST class only needs directory, not entire userContext object.
2018-06-01 13:40:52 -04:00
Nick Couchman
963593ea27
GUACAMOLE-38: Handle encoded query parameters.
2018-06-01 13:40:52 -04:00