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 
						 
				 
			
				
					
						
							
							
								Jared Frees 
							
						 
					 
					
						
						
							
						
						f24a6a8b9d 
					 
					
						
						
							
							GUACAMOLE-524: Added attributes in ModeledAuthenticatedUser  
						
						
						
						
					 
					
						2018-06-15 10:53:48 -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 
							
						 
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
							
							
								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 
							
						 
					 
					
						
						
							
						
						862ab91432 
					 
					
						
						
							
							GUACAMOLE-524: Implemented getAttributes and setAttributes to satisfy  
						
						... 
						
						
						
						Attributes interface addition 
						
						
					 
					
						2018-06-12 11:33:14 -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 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						1438a5117b 
					 
					
						
						
							
							GUACAMOLE-38: Methods being tested need to be public.  
						
						
						
						
					 
					
						2018-06-01 13:40:53 -04:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						97d2d3a2c9 
					 
					
						
						
							
							GUACAMOLE-38: Clean up comments and make a couple of methods private.  
						
						
						
						
					 
					
						2018-06-01 13:40:53 -04:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						6d0b6d6494 
					 
					
						
						
							
							GUACAMOLE-38: Update comments to match recent changes in return type of REST create method.  
						
						
						
						
					 
					
						2018-06-01 13:40:53 -04:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						b283adc73a 
					 
					
						
						
							
							GUACAMOLE-38: REST service should return proper JSON.  
						
						
						
						
					 
					
						2018-06-01 13:40:53 -04:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						730201358e 
					 
					
						
						
							
							GUACAMOLE-38: Implement QuickConnectException for providing exceptions to the user.  
						
						
						
						
					 
					
						2018-06-01 13:40:53 -04:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						8c130215f4 
					 
					
						
						
							
							GUACAMOLE-38: Remove default protocol and port, throw errors if not specified.  
						
						
						
						
					 
					
						2018-06-01 13:40:53 -04:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						84e71a029c 
					 
					
						
						
							
							GUACAMOLE-38: Put userInfo directly into configuration.  
						
						
						
						
					 
					
						2018-06-01 13:40:53 -04:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						aaada49dfe 
					 
					
						
						
							
							GUACAMOLE-38: Clean up minor code issues.  
						
						
						
						
					 
					
						2018-06-01 13:40:53 -04:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						27f4ad01f5 
					 
					
						
						
							
							GUACAMOLE-38: Add unit tests for the userInfo parser and the getConfiguration method.  
						
						
						
						
					 
					
						2018-06-01 13:40:53 -04:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						aafc4359c8 
					 
					
						
						
							
							GUACAMOLE-38: Break userInfo parsing into its own function, and properly decode username and password.  
						
						
						
						
					 
					
						2018-06-01 13:40:52 -04:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						6dad254c14 
					 
					
						
						
							
							GUACAMOLE-38: Fix use of superclass methods.  
						
						
						
						
					 
					
						2018-06-01 13:40:52 -04:00