Nick Couchman 
							
						 
					 
					
						
						
							
						
						d2b40e4904 
					 
					
						
						
							
							GUACAMOLE-360: Fix comment typo.  
						
						
						
						
					 
					
						2018-06-16 20:22:30 -04:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						0b77782391 
					 
					
						
						
							
							GUACAMOLE-540: Fix spaces that get added by IDE  
						
						
						
						
					 
					
						2018-06-16 08:07:33 -04:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						fb1efec056 
					 
					
						
						
							
							GUACAMOLE-540: Restore removed setter methods in Credentials.  
						
						
						
						
					 
					
						2018-06-16 08:06:13 -04:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						a0d0e07658 
					 
					
						
						
							
							GUACAMOLE-540: Clean up style and comments in Credentials class  
						
						
						
						
					 
					
						2018-06-16 08:06:07 -04:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						52a3f454e6 
					 
					
						
						
							
							GUACAMOLE-540: Clean up Credentials with new constructor.  
						
						
						
						
					 
					
						2018-06-16 08:06:07 -04:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						c725da00a0 
					 
					
						
						
							
							GUACAMOLE-540: Update comments; remove unnecessary setter methods.  
						
						
						
						
					 
					
						2018-06-16 07:13:17 -04:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						cbd77b52ae 
					 
					
						
						
							
							GUACAMOLE-540: Move remote address processing to Credentials class for consistency.  
						
						
						
						
					 
					
						2018-06-16 07:13:17 -04:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						77da5f5ac5 
					 
					
						
						
							
							GUACAMOLE-360: Clean up style issues.  
						
						
						
						
					 
					
						2018-06-15 21:06:07 -04:00 
						 
				 
			
				
					
						
							
							
								Jared Frees 
							
						 
					 
					
						
						
							
						
						cb4f284760 
					 
					
						
						
							
							GUACAMOLE-524: Changed this to super and removed debugging stuff  
						
						
						
						
					 
					
						2018-06-15 12:20:02 -04:00 
						 
				 
			
				
					
						
							
							
								Jared Frees 
							
						 
					 
					
						
						
							
						
						f24a6a8b9d 
					 
					
						
						
							
							GUACAMOLE-524: Added attributes in ModeledAuthenticatedUser  
						
						
						
						
					 
					
						2018-06-15 10:53:48 -04:00 
						 
				 
			
				
					
						
							
							
								Jared Frees 
							
						 
					 
					
						
						
							
						
						0964c46f4f 
					 
					
						
						
							
							GUACAMOLE-524: Fixed RegEx for attribute tokens by removing ':'  
						
						
						
						
					 
					
						2018-06-15 10:53:18 -04:00 
						 
				 
			
				
					
						
							
							
								Jared Frees 
							
						 
					 
					
						
						
							
						
						653b4e0134 
					 
					
						
						
							
							Updated JavaDoc for addStandardTokens  
						
						
						
						
					 
					
						2018-06-14 11:15:57 -04:00 
						 
				 
			
				
					
						
							
							
								Jared Frees 
							
						 
					 
					
						
						
							
						
						49c3f11854 
					 
					
						
						
							
							GUACAMOLE-524: Changed addStandardTokens so user.getAttributes is called  
						
						
						
						
					 
					
						2018-06-14 11:08:50 -04:00 
						 
				 
			
				
					
						
							
							
								Jared Frees 
							
						 
					 
					
						
						
							
						
						3d4f465c10 
					 
					
						
						
							
							GUACAMOLE-524: Fixed Order of imports  
						
						
						
						
					 
					
						2018-06-13 14:12:50 -04:00 
						 
				 
			
				
					
						
							
							
								Jared Frees 
							
						 
					 
					
						
						
							
						
						590f7311db 
					 
					
						
						
							
							GUACAMOLE-524: Updated comments and imports  
						
						
						
						
					 
					
						2018-06-13 11:31:03 -04:00 
						 
				 
			
				
					
						
							
							
								Jared Frees 
							
						 
					 
					
						
						
							
						
						58c8f3e111 
					 
					
						
						
							
							GUACAMOLE-524: Fixed Javadoc and removed unnecessary methods  
						
						
						
						
					 
					
						2018-06-13 10:34:41 -04:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						bd2d051a19 
					 
					
						
						
							
							GUACAMOLE-360: Make webapp use permission sets for active connection management.  
						
						
						
						
					 
					
						2018-06-13 06:17:52 -04:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						5e16518569 
					 
					
						
						
							
							GUACAMOLE-360: Change ActiveConnection elements to use the ObjectPermissionSet mechanism.  
						
						
						
						
					 
					
						2018-06-13 06:17:52 -04:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						85c7b511e1 
					 
					
						
						
							
							GUACAMOLE-360: Allow user to kill their own active sessions.  
						
						
						
						
					 
					
						2018-06-13 06:17:52 -04:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						3eda313519 
					 
					
						
						
							
							GUACAMOLE-360: Allow all users access to the session management page.  
						
						
						
						
					 
					
						2018-06-13 06:17:52 -04:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						984ab48ce8 
					 
					
						
						
							
							Merge 1.0.0 changes back to master.  
						
						
						
						
					 
					
						2018-06-13 06:15:10 -04:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						bc1dc41a7c 
					 
					
						
						
							
							GUACAMOLE-470: Merge provide predefined values for "color-scheme" parameter.  
						
						
						
						
					 
					
						2018-06-13 06:13:28 -04:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						e5a8442a2a 
					 
					
						
						
							
							GUACAMOLE-470: Use NPM webjar for datalist-polyfill, as Webjars' "bowergithub" version is broken (missing version number in path causes sanity checks in WebjarsServlet to refuse to serve the file).  
						
						
						
						
					 
					
						2018-06-12 16:30:11 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						74230f005f 
					 
					
						
						
							
							GUACAMOLE-470: Define "color-scheme" parameter as TEXT field with some pre-defined options.  
						
						
						
						
					 
					
						2018-06-12 14:07:51 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						73c3107e91 
					 
					
						
						
							
							GUACAMOLE-470: Restore translations for "color-scheme" enum values.  
						
						... 
						
						
						
						This reverts commit 06f98afcf5 
						
						
					 
					
						2018-06-12 14:07:51 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						2bc71866a8 
					 
					
						
						
							
							GUACAMOLE-470: Restore ENUM "color-scheme" parameter for SSH and Telnet.  
						
						... 
						
						
						
						This reverts commit 4e610f2d1b 
						
						
					 
					
						2018-06-12 14:07:51 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						3ae152fa35 
					 
					
						
						
							
							GUACAMOLE-470: Add polyfill for <datalist> element (not supported by Safari).  
						
						
						
						
					 
					
						2018-06-12 14:07:47 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						426a7919b3 
					 
					
						
						
							
							GUACAMOLE-470: Allow TEXT fields to be associated with predefined sets of known-good values.  
						
						
						
						
					 
					
						2018-06-12 13:58:04 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						a8bb6fe966 
					 
					
						
						
							
							GUACAMOLE-470: Make getFieldOption() available to all field types.  
						
						
						
						
					 
					
						2018-06-12 13:58:04 -07:00 
						 
				 
			
				
					
						
							
							
								Jared Frees 
							
						 
					 
					
						
						
							
						
						4791adaa46 
					 
					
						
						
							
							GUACAMOLE-524: Fixed up code style and comments  
						
						... 
						
						
						
						Also added Override tag in AbstractAuthenticatedUser on getAttributes
and setAttributes. 
						
						
					 
					
						2018-06-12 16:21:52 -04:00 
						 
				 
			
				
					
						
							
							
								Jared Frees 
							
						 
					 
					
						
						
							
						
						36bbdce7b1 
					 
					
						
						
							
							GUACAMOLE-524: Fix order of imports.  
						
						
						
						
					 
					
						2018-06-12 11:46:21 -04:00 
						 
				 
			
				
					
						
							
							
								Jared Frees 
							
						 
					 
					
						
						
							
						
						cde13be0cf 
					 
					
						
						
							
							GUACAMOLE-524: Add implements Attributes  
						
						
						
						
					 
					
						2018-06-12 11:45:06 -04:00 
						 
				 
			
				
					
						
							
							
								Jared Frees 
							
						 
					 
					
						
						
							
						
						fa33c98ddc 
					 
					
						
						
							
							GUACAMOLE-524: Implements Attributes and provides getAttributes and setAttributes default methods  
						
						
						
						
					 
					
						2018-06-12 11:44:10 -04:00 
						 
				 
			
				
					
						
							
							
								Jared Frees 
							
						 
					 
					
						
						
							
						
						00b33daea7 
					 
					
						
						
							
							GUACAMOLE-524: Fixed try block, exceptions, and import order  
						
						
						
						
					 
					
						2018-06-12 11:42:30 -04:00 
						 
				 
			
				
					
						
							
							
								Jared Frees 
							
						 
					 
					
						
						
							
						
						d27f8f9b3e 
					 
					
						
						
							
							GUACAMOLE-524: Removed weird casting  
						
						
						
						
					 
					
						2018-06-12 11:40:50 -04:00 
						 
				 
			
				
					
						
							
							
								Jared Frees 
							
						 
					 
					
						
						
							
						
						3548f8c655 
					 
					
						
						
							
							GUACAMOLE-524: Removed implements Attributes and fixed up code  
						
						
						
						
					 
					
						2018-06-12 11:37:31 -04:00 
						 
				 
			
				
					
						
							
							
								Jared Frees 
							
						 
					 
					
						
						
							
						
						862ab91432 
					 
					
						
						
							
							GUACAMOLE-524: Implemented getAttributes and setAttributes to satisfy  
						
						... 
						
						
						
						Attributes interface addition 
						
						
					 
					
						2018-06-12 11:33:14 -04:00 
						 
				 
			
				
					
						
							
							
								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