Virtually Nick 
							
						 
					 
					
						
						
							
						
						9c26a7613c 
					 
					
						
						
							
							GUACAMOLE-579: Remove unnecessary JUnit dependencies.  
						
						
						
						
					 
					
						2019-06-22 20:02:46 -04:00 
						 
				 
			
				
					
						
							
							
								Virtually Nick 
							
						 
					 
					
						
						
							
						
						a6601a2bfd 
					 
					
						
						
							
							GUACAMOLE-579: Change fromAttribute to canonicalize  
						
						
						
						
					 
					
						2019-06-21 12:54:42 -04:00 
						 
				 
			
				
					
						
							
							
								Virtually Nick 
							
						 
					 
					
						
						
							
						
						d8db630dbd 
					 
					
						
						
							
							GUACAMOLE-579: Clean up comments, implement convenience method for tokens without a prefix, and remove unneeded classes.  
						
						
						
						
					 
					
						2019-06-20 20:41:41 -04:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						55c4144fbf 
					 
					
						
						
							
							GUACAMOLE-579: Parse tokens from attributes provided by the CAS server.  
						
						
						
						
					 
					
						2019-06-20 19:52:06 -04:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						1c1fac700c 
					 
					
						
						
							
							GUACAMOLE-807: Correct handling of parameter tokens within LDAP.  
						
						... 
						
						
						
						Parameter tokens are intended to be interpreted by the connections
stored within LDAP. This was previously done through explicitly using a
TokenFilter and the StandardTokens class, however usage of
StandardTokens is now deprecated and the values of tokens to be applied
are now expected to be received through connect(). Usage of
StandardTokens was removed from LDAP with commit 1210d56 
						
						
					 
					
						2019-06-07 08:39:30 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						c3fbf44f70 
					 
					
						
						
							
							GUACAMOLE-729: Bump version numbers to 1.1.0.  
						
						
						
						
					 
					
						2019-02-09 11:08:28 -08:00 
						 
				 
			
				
					
						
							
							
								Joel Best 
							
						 
					 
					
						
						
							
						
						93d80418ba 
					 
					
						
						
							
							GUACAMOLE-717: Handle LDAPException gracefully when processing LDAP search results  
						
						
						
						
					 
					
						2019-01-25 20:36:43 -05:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						af2ef32fc3 
					 
					
						
						
							
							GUACAMOLE-693: Update copyright year to 2019.  
						
						
						
						
					 
					
						2019-01-23 17:12:45 -05:00 
						 
				 
			
				
					
						
							
							
								James Muehlner 
							
						 
					 
					
						
						
							
						
						d4f58f2c0d 
					 
					
						
						
							
							Merge changes from 1.0.0 back to master.  
						
						
						
						
					 
					
						2018-11-08 22:18:28 -08:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						95b5fdccdc 
					 
					
						
						
							
							GUACAMOLE-656: Explicitly depend on maven-surefire-plugin 3.0.0-M1 due to SUREFIRE-1588.  
						
						
						
						
					 
					
						2018-11-08 22:09:35 -08:00 
						 
				 
			
				
					
						
							
							
								James Muehlner 
							
						 
					 
					
						
						
							
						
						756ec2fcc4 
					 
					
						
						
							
							Merge 1.0.0 changes back to master.  
						
						
						
						
					 
					
						2018-11-08 21:26:43 -08:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						b355106c77 
					 
					
						
						
							
							GUACAMOLE-220: Remove unnecessary explicit type parameters.  
						
						
						
						
					 
					
						2018-11-08 20:11:17 -08:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						a4d6f62df0 
					 
					
						
						
							
							GUACAMOLE-220: Reword description of getGroupSearchFilter() to be less brain-meltingly difficult to read.  
						
						
						
						
					 
					
						2018-11-08 19:55:49 -08:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						83033cad65 
					 
					
						
						
							
							GUACAMOLE-220: Use JavaDoc "{@link Map}" to point to Map interface.  
						
						
						
						
					 
					
						2018-11-08 19:45:25 -08:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						d10256e151 
					 
					
						
						
							
							GUACAMOLE-220: Deprecate built-in support for storage of permissions in SimpleUser. Add convenience constructors for SimpleObjectPermissionSet.  
						
						
						
						
					 
					
						2018-11-03 13:58:50 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						aa0c654231 
					 
					
						
						
							
							GUACAMOLE-220: Retrieve user groups from LDAP. Take immediate group membership into account.  
						
						
						
						
					 
					
						2018-11-03 12:41:54 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						bdc792603d 
					 
					
						
						
							
							GUACAMOLE-220: Add configuration property for setting the attributes which uniquely identify user groups within LDAP.  
						
						
						
						
					 
					
						2018-11-03 12:41:54 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						7c57b448bb 
					 
					
						
						
							
							GUACAMOLE-220: Define generic service for executing LDAP queries. Refactor existing services to remove common code.  
						
						
						
						
					 
					
						2018-11-03 12:41:54 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						13e2b06666 
					 
					
						
						
							
							GUACAMOLE-524: Switch to "LDAP_" prefix for LDAP user attribute tokens.  
						
						
						
						
					 
					
						2018-10-05 12:54:00 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						cb30b148b9 
					 
					
						
						
							
							GUACAMOLE-524: Consistently generate token names from LDAP attributes with arbitrary naming conventions.  
						
						
						
						
					 
					
						2018-10-05 12:47:26 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						98bd3ead21 
					 
					
						
						
							
							GUACAMOLE-524: Remove Attributes interface from AuthenticatedUser. Rely instead on tokens injected via decoration of connections.  
						
						
						
						
					 
					
						2018-10-05 12:47:26 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						7a3f51be71 
					 
					
						
						
							
							GUACAMOLE-524: Rename LDAP-specific AuthenticatedUser / UserContext to not conflict with guacamole-ext classes.  
						
						
						
						
					 
					
						2018-10-05 12:47:26 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						1210d5624c 
					 
					
						
						
							
							GUACAMOLE-524: Deprecate and replace StandardTokens with arbitrary tokens provided to Connectable.connect().  
						
						
						
						
					 
					
						2018-10-05 12:47:26 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						aae17f3a9f 
					 
					
						
						
							
							GUACAMOLE-524: Accept only supported attributes via setAttributes(). Do not replace existing attributes.  
						
						
						
						
					 
					
						2018-10-02 20:32:24 -07:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						d1a6c297b8 
					 
					
						
						
							
							Merge 1.0.0 changes back to master.  
						
						
						
						
					 
					
						2018-09-29 16:50:32 -04:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						1fef6a05e1 
					 
					
						
						
							
							GUACAMOLE-635: Require Java 1.8 for all Java components except guacamole-common.  
						
						
						
						
					 
					
						2018-09-29 12:56:17 -07:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						735b22bcf0 
					 
					
						
						
							
							GUACAMOLE-593: Add documentation to new methods, properly escape attribute.  
						
						
						
						
					 
					
						2018-07-31 07:57:54 -04:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						343b21aba5 
					 
					
						
						
							
							GUACAMOLE-593: Allow group membership attribute to be configured.  
						
						
						
						
					 
					
						2018-07-30 16:45:51 -04:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						2da0405798 
					 
					
						
						
							
							GUACAMOLE-580: Return an empty map instead of null when nothing is specified or found.  
						
						
						
						
					 
					
						2018-06-22 20:21:43 -04:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						50baf1c947 
					 
					
						
						
							
							GUACAMOLE-580: Avert potential NullPointerException when looking for user attributes.  
						
						
						
						
					 
					
						2018-06-22 06:43:56 -04:00 
						 
				 
			
				
					
						
							
							
								Jared Frees 
							
						 
					 
					
						
						
							
						
						927c04b9d4 
					 
					
						
						
							
							GUACAMOLE-524: Removed unused imports, fixed comments, and condensed  
						
						... 
						
						
						
						code 
						
						
					 
					
						2018-06-21 11:02:18 -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 
						 
				 
			
				
					
						
							
							
								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 
							
						 
					 
					
						
						
							
						
						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 
							
						 
					 
					
						
						
							
						
						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 
							
						 
					 
					
						
						
							
						
						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 
							
						 
					 
					
						
						
							
						
						45513592a7 
					 
					
						
						
							
							GUACAMOLE-570: Bump version numbers to 1.0.0.  
						
						
						
						
					 
					
						2018-06-05 21:34:26 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						9b7ef0dfcf 
					 
					
						
						
							
							GUACAMOLE-542: Migrate to simpler AbstractAuthenticationProvider / AbstractUserContext base classes.  
						
						
						
						
					 
					
						2018-04-11 21:29:15 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						c5c2f028a1 
					 
					
						
						
							
							GUACAMOLE-471: Update copyright year in NOTICE files to 2018.  
						
						
						
						
					 
					
						2018-02-07 21:03:05 -08:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						7357e51b58 
					 
					
						
						
							
							GUACAMOLE-96: Add redecorate() function with semantics analogous to updateUserContext().  
						
						
						
						
					 
					
						2018-01-13 17:23:11 -08:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						ffad1898b6 
					 
					
						
						
							
							GUACAMOLE-96: Add API support for augmenting functionality of other extensions.  
						
						
						
						
					 
					
						2018-01-13 17:22:48 -08:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						ce4cd11993 
					 
					
						
						
							
							GUACAMOLE-423: Bump version numbers for all modified components to 0.9.14.  
						
						
						
						
					 
					
						2017-12-06 00:12:43 -08:00