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 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						dec7b3c340 
					 
					
						
						
							
							GUACAMOLE-220: Dynamically detect whether the MariaDB / MySQL server supports recursive CTEs.  
						
						
						
						
					 
					
						2018-09-19 23:56:53 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						204b6a4b24 
					 
					
						
						
							
							GUACAMOLE-220: Update MySQL mapping with respect to user group support.  
						
						
						
						
					 
					
						2018-09-19 23:56:52 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						1d0fcc1732 
					 
					
						
						
							
							GUACAMOLE-220: Add MySQL and SQL Server versions of user group schema.  
						
						
						
						
					 
					
						2018-09-19 23:56:52 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						78d5e3b9d7 
					 
					
						
						
							
							GUACAMOLE-220: Manually recurse through the group membership graph if the database engine does not support recursive queries.  
						
						
						
						
					 
					
						2018-09-19 23:56:52 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						48948fc245 
					 
					
						
						
							
							GUACAMOLE-220: Add missing JDBC-specific USER_GROUP_ATTRIBUTES translation strings.  
						
						
						
						
					 
					
						2018-09-19 23:56:52 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						2999c56098 
					 
					
						
						
							
							GUACAMOLE-220: Map and allow manipulation of the user group parents of users.  
						
						
						
						
					 
					
						2018-09-19 23:56:52 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						856ab44373 
					 
					
						
						
							
							GUACAMOLE-220: Map and allow manipulation of the user group parents of user groups.  
						
						
						
						
					 
					
						2018-09-19 23:56:52 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						63be247db6 
					 
					
						
						
							
							GUACAMOLE-220: Map and allow manipulation of the user group members of user groups.  
						
						
						
						
					 
					
						2018-09-19 23:56:52 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						ccd7920b22 
					 
					
						
						
							
							GUACAMOLE-220: Map and allow manipulation of the user members of user groups.  
						
						
						
						
					 
					
						2018-09-19 23:56:52 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						8f06b7a3f9 
					 
					
						
						
							
							GUACAMOLE-220: Define base interfaces for mapping RelatedObjectSets to the database.  
						
						
						
						
					 
					
						2018-09-19 23:56:52 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						a39d863797 
					 
					
						
						
							
							GUACAMOLE-220: Take group "disabled" flag into account when determining effective groups. Do not inherit from nor apply disabled groups.  
						
						
						
						
					 
					
						2018-09-19 23:56:52 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						c5c2984151 
					 
					
						
						
							
							GUACAMOLE-220: Map and query user group tables.  
						
						
						
						
					 
					
						2018-09-19 23:56:52 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						69f58c8ca3 
					 
					
						
						
							
							GUACAMOLE-220: Refactor handling of JDBC permissions to abstract away users vs. user groups.  
						
						
						
						
					 
					
						2018-09-19 23:56:51 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						14d10fb42a 
					 
					
						
						
							
							GUACAMOLE-220: Inherit from groups even if not determined by database.  
						
						
						
						
					 
					
						2018-09-19 23:56:51 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						6e71f330b8 
					 
					
						
						
							
							GUACAMOLE-220: Move JDBC handling of effective groups to RemoteAuthenticatedUser level. Stub out retrieval of effective groups.  
						
						
						
						
					 
					
						2018-09-19 23:56:51 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						a155397947 
					 
					
						
						
							
							GUACAMOLE-220: Implement permission inheritance within SQL queries.  
						
						
						
						
					 
					
						2018-09-19 23:56:51 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						199f518cdb 
					 
					
						
						
							
							GUACAMOLE-220: Use effective permissions when deciding whether a user has permission to perform an action.  
						
						
						
						
					 
					
						2018-09-19 23:56:51 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						0a69630cbb 
					 
					
						
						
							
							GUACAMOLE-220: Implement base API changes within database auth allowing for permission inheritance.  
						
						
						
						
					 
					
						2018-09-19 23:56:51 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						72bac09f43 
					 
					
						
						
							
							GUACAMOLE-220: Add explicit mapper for entities (the basis for users and groups).  
						
						
						
						
					 
					
						2018-09-19 23:56:51 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						b499092d06 
					 
					
						
						
							
							GUACAMOLE-220: Update SQL queries to use guacamole_entity table where applicable.  
						
						
						
						
					 
					
						2018-09-19 23:56:51 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						d95e059612 
					 
					
						
						
							
							GUACAMOLE-220: Refactor user-related model objects and services to leverage the base "entity" model.  
						
						
						
						
					 
					
						2018-09-19 23:56:51 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						e72f88febf 
					 
					
						
						
							
							GUACAMOLE-220: Define base schema for user groups.  
						
						
						
						
					 
					
						2018-09-19 23:56:51 -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 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						d53b43ce29 
					 
					
						
						
							
							Merge 1.0.0 changes back to master.  
						
						
						
						
					 
					
						2018-07-01 23:18:04 -07: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 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						a9637494ac 
					 
					
						
						
							
							GUACAMOLE-524: Merge allow user attributes to be used as tokens.  
						
						
						
						
					 
					
						2018-06-21 11:14:06 -04:00 
						 
				 
			
				
					
						
							
							
								Jared Frees 
							
						 
					 
					
						
						
							
						
						927c04b9d4 
					 
					
						
						
							
							GUACAMOLE-524: Removed unused imports, fixed comments, and condensed  
						
						... 
						
						
						
						code 
						
						
					 
					
						2018-06-21 11:02:18 -04:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						6a1b55a327 
					 
					
						
						
							
							GUACAMOLE-360: deleteObject method should follow documented behavior.  
						
						
						
						
					 
					
						2018-06-18 19:15:20 -04:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						d2b40e4904 
					 
					
						
						
							
							GUACAMOLE-360: Fix comment typo.  
						
						
						
						
					 
					
						2018-06-16 20:22:30 -04:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						52a3f454e6 
					 
					
						
						
							
							GUACAMOLE-540: Clean up Credentials with new constructor.  
						
						
						
						
					 
					
						2018-06-16 08:06:07 -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