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 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						f563925aa7 
					 
					
						
						
							
							GUACAMOLE-38: Relocate the toolbar and restyle it.  
						
						
						
						
					 
					
						2018-06-01 13:40:52 -04:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						56cc11e1b9 
					 
					
						
						
							
							GUACAMOLE-38: Tweak style and translation issues.  
						
						
						
						
					 
					
						2018-06-01 13:40:52 -04:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						2a9c7fe0b7 
					 
					
						
						
							
							GUACAMOLE-38: Rearrange logic in QCParser class.  
						
						
						
						
					 
					
						2018-06-01 13:40:52 -04:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						7df88cdfbd 
					 
					
						
						
							
							GUACAMOLE-38: Fix issues with root identifier and directory.  
						
						
						
						
					 
					
						2018-06-01 13:40:52 -04:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						555b26ae1f 
					 
					
						
						
							
							GUACAMOLE-38: Use ConcurrentHashMap for threadsafety.  
						
						
						
						
					 
					
						2018-06-01 13:40:52 -04:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						201fbcd5a5 
					 
					
						
						
							
							GUACAMOLE-38: Updated AngularJS components for compatibility with 1.6.x.  
						
						
						
						
					 
					
						2018-06-01 13:40:52 -04:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						6629451892 
					 
					
						
						
							
							GUACAMOLE-38: Remove bundled aopalliance license.  
						
						
						
						
					 
					
						2018-06-01 13:40:52 -04:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						cfd1673791 
					 
					
						
						
							
							GUACAMOLE-38: Code cleanup; style, and grammar tweaks.  
						
						
						
						
					 
					
						2018-06-01 13:40:52 -04:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						aabc871d7d 
					 
					
						
						
							
							GUACAMOLE-38: Add unit test for query string parser.  
						
						
						
						
					 
					
						2018-06-01 13:40:52 -04:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						1011845032 
					 
					
						
						
							
							GUACAMOLE-38: Break query string parsing into its own method.  
						
						
						
						
					 
					
						2018-06-01 13:40:52 -04:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						d9751f20d0 
					 
					
						
						
							
							GUACAMOLE-38: REST class only needs directory, not entire userContext object.  
						
						
						
						
					 
					
						2018-06-01 13:40:52 -04:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						963593ea27 
					 
					
						
						
							
							GUACAMOLE-38: Handle encoded query parameters.  
						
						
						
						
					 
					
						2018-06-01 13:40:52 -04:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						d4b7e2b8b6 
					 
					
						
						
							
							GUACAMOLE-38: Use StringBuilder to gather up name.  
						
						
						
						
					 
					
						2018-06-01 13:40:52 -04:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						cf241f041e 
					 
					
						
						
							
							GUACAMOLE-38: Fix up string checks in QCParser class.  
						
						
						
						
					 
					
						2018-06-01 13:40:51 -04:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						0cbf90a55d 
					 
					
						
						
							
							GUACAMOLE-38: Clean up lots of unnecessary code.  
						
						
						
						
					 
					
						2018-06-01 13:40:51 -04:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						c994c5a9b4 
					 
					
						
						
							
							GUACAMOLE-38: Remove unnecessary GUICE/Inject stuff.  
						
						
						
						
					 
					
						2018-06-01 13:40:51 -04:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						b31b09a2f5 
					 
					
						
						
							
							GUACAMOLE-38: Get rid of unnecessary userContext initialization.  
						
						
						
						
					 
					
						2018-06-01 13:40:51 -04:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						6a922a7811 
					 
					
						
						
							
							GUACAMOLE-38: Minor documentation tweaks.  
						
						
						
						
					 
					
						2018-06-01 13:40:51 -04:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						12d92d210f 
					 
					
						
						
							
							GUACAMOLE-38: Fix parameter name in QuickConnection constructor.  
						
						
						
						
					 
					
						2018-06-01 13:40:51 -04:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						bb127c55d2 
					 
					
						
						
							
							GUACAMOLE-38: Quick fix-up for userContext object in AuthenticationProvider  
						
						
						
						
					 
					
						2018-06-01 13:40:51 -04:00 
						 
				 
			
				
					
						
							
							
								Nick Couchman 
							
						 
					 
					
						
						
							
						
						d608643bb6 
					 
					
						
						
							
							GUACAMOLE-38: Remove lots of extra imports.  
						
						
						
						
					 
					
						2018-06-01 13:40:51 -04:00