Mike Jumper 
							
						 
					 
					
						
						
							
						
						df7404f4cb 
					 
					
						
						
							
							GUACAMOLE-693: Merge update to NOTICE copyright year (2018 -> 2019).  
						
						
						
						
					 
					
						2019-01-24 16:43:48 -08:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						ba198398e0 
					 
					
						
						
							
							GUACAMOLE-697: Add DISTINCT to selectOne permissions queries.  
						
						
						
						
					 
					
						2019-01-24 07:53:22 -05:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						af2ef32fc3 
					 
					
						
						
							
							GUACAMOLE-693: Update copyright year to 2019.  
						
						
						
						
					 
					
						2019-01-23 17:12:45 -05:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						6be722ed9d 
					 
					
						
						
							
							GUACAMOLE-524: Require usages of SimpleConnection to explicitly request automatic interpretation of parameter tokens. Do not enable by default.  
						
						... 
						
						
						
						Previous implementations of SimpleConnection did not interpret parameter
tokens automatically. Adding that behavior now could have security
implications for downstream users of the class if parameter values may
unexpectedly contain substrings which would be interpreted as tokens,
particularly if parameter values are built from untrusted input. 
						
						
					 
					
						2019-01-21 19:55:33 -08:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						caf07a92a9 
					 
					
						
						
							
							Merge 1.0.0 changes back to master.  
						
						
						
						
					 
					
						2018-12-05 14:40:34 -08:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						29982e3a85 
					 
					
						
						
							
							GUACAMOLE-526: Clean up unused code and minor errors.  
						
						
						
						
					 
					
						2018-12-04 19:28:18 -05:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						df8c07c187 
					 
					
						
						
							
							GUACAMOLE-526: Fix loading of CAS ticket field and redirection.  
						
						
						
						
					 
					
						2018-12-04 19:28:14 -05:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						fc457c080d 
					 
					
						
						
							
							Merge 1.0.0 changes back to master.  
						
						
						
						
					 
					
						2018-12-03 07:32:21 -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 
						 
				 
			
				
					
						
							
							
								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 
							
						 
					 
					
						
						
							
						
						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 
							
						 
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						f3cbdf5a3b 
					 
					
						
						
							
							Merge 1.0.0 changes back to master.  
						
						
						
						
					 
					
						2018-10-11 06:40:52 -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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						01709fb26b 
					 
					
						
						
							
							Merge 1.0.0 changes back to master.  
						
						
						
						
					 
					
						2018-10-05 15:13:36 -04:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						11c1d8c97e 
					 
					
						
						
							
							GUACAMOLE-96: Add protected convenience method for retrieving delegate object.  
						
						
						
						
					 
					
						2018-10-05 10:36:47 -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 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						ea142d15ce 
					 
					
						
						
							
							GUACAMOLE-360: Add convenience function for testing user identity.  
						
						
						
						
					 
					
						2018-10-01 11:46:34 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						ad937defa6 
					 
					
						
						
							
							GUACAMOLE-360: Update active connection permission check to support user groups.  
						
						
						
						
					 
					
						2018-10-01 11:35:32 -07:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						658ce78846 
					 
					
						
						
							
							Merge 1.0.0 changes back to master.  
						
						... 
						
						
						
						Conflicts:
	extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/RemoteAuthenticatedUser.java 
						
						
					 
					
						2018-10-01 13:51:56 -04:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						828313541b 
					 
					
						
						
							
							GUACAMOLE-220: Merge add database support for user groups.  
						
						
						
						
					 
					
						2018-10-01 13:38:55 -04:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						4d5196207b 
					 
					
						
						
							
							GUACAMOLE-220: Correct typo - "that status of" should be "the status of".  
						
						
						
						
					 
					
						2018-09-30 23:12:49 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						f4ccf8ef62 
					 
					
						
						
							
							GUACAMOLE-220: Remove effectively-redundant admin permission check.  
						
						
						
						
					 
					
						2018-09-30 23:11:20 -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 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						bb6e8bc1c7 
					 
					
						
						
							
							GUACAMOLE-220: Correct documentation of update script.  
						
						... 
						
						
						
						The UNIQUE constraint is being added once the column is expected to be
unique, not necessarily because it should safely point to entries of a
particular table. 
						
						
					 
					
						2018-09-27 20:15:23 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						7521cdc0ae 
					 
					
						
						
							
							GUACAMOLE-220: Rows are deleted to modify the one-to-many relationship, not to establish it.  
						
						
						
						
					 
					
						2018-09-27 20:10:32 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						5fdd0bb148 
					 
					
						
						
							
							GUACAMOLE-220: Remove unnecessary use of multi-result select (use selectOne() instead).  
						
						
						
						
					 
					
						2018-09-27 20:07:24 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						a552d88c54 
					 
					
						
						
							
							GUACAMOLE-220: Clarify group rename validation logic.  
						
						
						
						
					 
					
						2018-09-27 20:06:18 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						fedccebb93 
					 
					
						
						
							
							GUACAMOLE-220: Remove unnecessary ModeledUserGroup constructor (equivalent to default constructor).  
						
						
						
						
					 
					
						2018-09-27 20:03:35 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						4a5f271702 
					 
					
						
						
							
							GUACAMOLE-220: Correct user vs. entity wording in documentation.  
						
						
						
						
					 
					
						2018-09-27 19:45:30 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						8399b252cd 
					 
					
						
						
							
							GUACAMOLE-220: Detect cycles within recursive query. SQL Server cannot deal with cycles on its own.  
						
						
						
						
					 
					
						2018-09-19 23:56:53 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						ee35620194 
					 
					
						
						
							
							GUACAMOLE-220: Update SQL Server mapping with respect to user group support.  
						
						
						
						
					 
					
						2018-09-19 23:56:53 -07:00