Michael Jumper
							
						 
					 | 
					
						
						
							
						
						a967ffa41c
					 | 
					
						
						
							
							GUACAMOLE-670: Merge changes correcting conflicting versions of SLF4J.
						
						
						
						
						
						
					 | 
					
						2018-12-03 07:30:23 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nick Couchman
							
						 
					 | 
					
						
						
							
						
						95dfb5e765
					 | 
					
						
						
							
							GUACAMOLE-670: Use exclusion to block loading of duplicate slf4j.
						
						
						
						
						
						
					 | 
					
						2018-12-03 07:35:22 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nick Couchman
							
						 
					 | 
					
						
						
							
						
						73744d22f9
					 | 
					
						
						
							
							GUACAMOLE-670: Add slf4j logging to modules to avoid pulling in conflicting versions.
						
						
						
						
						
						
					 | 
					
						2018-12-02 15:43:12 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nick Couchman
							
						 
					 | 
					
						
						
							
						
						823bbeace1
					 | 
					
						
						
							
							Merge 1.0.0 changes back to master.
						
						
						
						
						
						
					 | 
					
						2018-11-09 20:26:05 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nick Couchman
							
						 
					 | 
					
						
						
							
						
						001ece14e2
					 | 
					
						
						
							
							GUACAMOLE-220: Merge correct translation strings for user group "disabled" attribute.
						
						
						
						
						
						
					 | 
					
						2018-11-09 20:24:24 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Muehlner
							
						 
					 | 
					
						
						
							
						
						d4f58f2c0d
					 | 
					
						
						
							
							Merge changes from 1.0.0 back to master.
						
						
						
						
						
						
					 | 
					
						2018-11-08 22:18:28 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Muehlner
							
						 
					 | 
					
						
						
							
						
						4d858451c9
					 | 
					
						
						
							
							GUACAMOLE-656: Merge maven-surefire-plugin build fix.
						
						
						
						
						
						
					 | 
					
						2018-11-08 22:16:58 -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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Muehlner
							
						 
					 | 
					
						
						
							
						
						c0008aed62
					 | 
					
						
						
							
							GUACAMOLE-220: Merge LDAP user group support.
						
						
						
						
						
						
					 | 
					
						2018-11-08 20:42:51 -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
							
						 
					 | 
					
						
						
							
						
						3c5594db2e
					 | 
					
						
						
							
							GUACAMOLE-220: Group attribute "disabled" controls whether the group has any effect, not whether login is allowed.
						
						
						
						
						
						
					 | 
					
						2018-11-03 17:24:06 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						2d6ba84a3d
					 | 
					
						
						
							
							GUACAMOLE-220: Refactor default behavior of SimpleUser and SimpleUserGroup into AbstractUser and AbstractUserGroup.
						
						
						
						
						
						
					 | 
					
						2018-11-03 14:52:24 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						90a6d8e371
					 | 
					
						
						
							
							GUACAMOLE-220: Clarify usage of SimpleUser and SimpleUserGroup.
						
						
						
						
						
						
					 | 
					
						2018-11-03 14:14:04 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						d533de118f
					 | 
					
						
						
							
							GUACAMOLE-220: Add EMPTY_SET convenience constant to all core set interfaces.
						
						
						
						
						
						
					 | 
					
						2018-11-03 14:08:46 -07: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
							
						 
					 | 
					
						
						
							
						
						929c7de2c9
					 | 
					
						
						
							
							GUACAMOLE-220: Add user group permissions to SimpleUser.
						
						
						
						
						
						
					 | 
					
						2018-11-03 12:41:54 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						5362bc6708
					 | 
					
						
						
							
							GUACAMOLE-220: Add SimpleUserGroup (read-only UserGroup implementation with no members).
						
						
						
						
						
						
					 | 
					
						2018-11-03 12:41:54 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nick Couchman
							
						 
					 | 
					
						
						
							
						
						ecca7bc509
					 | 
					
						
						
							
							GUACAMOLE-524: Merge correct handling of parameter tokens within SimpleConnection
						
						
						
						
						
						
					 | 
					
						2018-10-17 13:20:44 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						143c10b6ef
					 | 
					
						
						
							
							GUACAMOLE-524: Correct handling of tokens within SimpleConnection. The copy of the configuration should be filtered, not the original, and token values need to actually be set.
						
						
						
						
						
						
					 | 
					
						2018-10-16 14:53:10 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						333a8c411f
					 | 
					
						
						
							
							GUACAMOLE-524: Provide convenience constructor for TokenFilter which initializes the filter with provided tokens.
						
						
						
						
						
						
					 | 
					
						2018-10-16 14:53:10 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nick Couchman
							
						 
					 | 
					
						
						
							
						
						f3cbdf5a3b
					 | 
					
						
						
							
							Merge 1.0.0 changes back to master.
						
						
						
						
						
						
					 | 
					
						2018-10-11 06:40:52 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nick Couchman
							
						 
					 | 
					
						
						
							
						
						fd1928e0bb
					 | 
					
						
						
							
							GUACAMOLE-96: Merge do not require TOTP for users that cannot enroll.
						
						
						
						
						
						
					 | 
					
						2018-10-11 06:39:00 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						d79988d59e
					 | 
					
						
						
							
							GUACAMOLE-96: Do not require TOTP for users that cannot enroll due to lack of permission to update their account.
						
						
						
						
						
						
					 | 
					
						2018-10-11 01:35:51 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nick Couchman
							
						 
					 | 
					
						
						
							
						
						dfd4332761
					 | 
					
						
						
							
							GUACAMOLE-524: Merge use decoration API to inject tokens from LDAP attributes.
						
						
						
						
						
						
					 | 
					
						2018-10-06 08:09:29 -04: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
							
						 
					 | 
					
						
						
							
						
						0d7cff5f2d
					 | 
					
						
						
							
							GUACAMOLE-524: Add convenience classes for injecting custom parameter tokens through decoration.
						
						
						
						
						
						
					 | 
					
						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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nick Couchman
							
						 
					 | 
					
						
						
							
						
						3089e71e60
					 | 
					
						
						
							
							Merge 1.0.0 changes back to master.
						
						
						
						
						
						
					 | 
					
						2018-10-05 15:31:01 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nick Couchman
							
						 
					 | 
					
						
						
							
						
						1f55349d27
					 | 
					
						
						
							
							GUACAMOLE-220: Merge ignore missing user or group when retrieving permissions/memberships.
						
						
						
						
						
						
					 | 
					
						2018-10-05 15:29:38 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nick Couchman
							
						 
					 | 
					
						
						
							
						
						01709fb26b
					 | 
					
						
						
							
							Merge 1.0.0 changes back to master.
						
						
						
						
						
						
					 | 
					
						2018-10-05 15:13:36 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						adb9aaa5e2
					 | 
					
						
						
							
							GUACAMOLE-220: Ignore missing user or group when retrieving permissions/memberships.
						
						
						
						
						
						
					 | 
					
						2018-10-05 11:56:42 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nick Couchman
							
						 
					 | 
					
						
						
							
						
						25071673db
					 | 
					
						
						
							
							GUACAMOLE-96: Merge add protected convenience method for retrieving delegate object.
						
						
						
						
						
						
					 | 
					
						2018-10-05 14:40:22 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						11c1d8c97e
					 | 
					
						
						
							
							GUACAMOLE-96: Add protected convenience method for retrieving delegate object.
						
						
						
						
						
						
					 | 
					
						2018-10-05 10:36:47 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nick Couchman
							
						 
					 | 
					
						
						
							
						
						9d485ffcf7
					 | 
					
						
						
							
							Merge 1.0.0 changes back to master.
						
						
						
						
						
						
					 | 
					
						2018-10-04 04:05:34 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nick Couchman
							
						 
					 | 
					
						
						
							
						
						7fcb506711
					 | 
					
						
						
							
							GUACAMOLE-232: Merge mark key as implicitly pressed only when pressed due to another, identifiable key event.
						
						
						
						
						
						
					 | 
					
						2018-10-04 04:03:48 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						e3c1b6ac98
					 | 
					
						
						
							
							GUACAMOLE-232: Mark key as implicitly pressed only when pressed due to another, identifiable key event.
						
						
						
						
						
						
					 | 
					
						2018-10-03 21:30:26 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nick Couchman
							
						 
					 | 
					
						
						
							
						
						e32f3abd76
					 | 
					
						
						
							
							Merge 1.0.0 changes back to master.
						
						
						
						
						
						
					 | 
					
						2018-10-03 14:53:46 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nick Couchman
							
						 
					 | 
					
						
						
							
						
						f46f52dbac
					 | 
					
						
						
							
							GUACAMOLE-232: Merge correct inverted explicit/implicit logic.
						
						
						
						
						
						
					 | 
					
						2018-10-03 14:52:27 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Jumper
							
						 
					 | 
					
						
						
							
						
						9d8027c5cd
					 | 
					
						
						
							
							GUACAMOLE-232: Correct inverted explicit/implicit logic.
						
						
						
						
						
						
					 | 
					
						2018-10-03 11:47:07 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nick Couchman
							
						 
					 | 
					
						
						
							
						
						31c8dfe28b
					 | 
					
						
						
							
							Merge 1.0.0 changes back to master.
						
						
						
						
						
						
					 | 
					
						2018-10-03 14:26:40 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nick Couchman
							
						 
					 | 
					
						
						
							
						
						c04a71edad
					 | 
					
						
						
							
							GUACAMOLE-232: Merge address regressions in handling of keyboard modifiers.
						
						
						
						
						
						
					 | 
					
						2018-10-03 14:24:18 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |