Douglas Heriot 
							
						 
					 
					
						
						
							
						
						6cf9787f7b 
					 
					
						
						
							
							GUACAMOLE-919: Fix style issues, improve comments.  
						
						
						
						
					 
					
						2020-07-27 13:36:48 +10:00 
						 
				 
			
				
					
						
							
							
								Douglas Heriot 
							
						 
					 
					
						
						
							
						
						0528ca0564 
					 
					
						
						
							
							GUACAMOLE-919: make defaultStatementTimeout an int  
						
						... 
						
						
						
						More consistent with how socketTimeout.
MyBatis documentation says only positive integers are valid,
and property should not be set otherwise.
So in the case of 0 the property will not be set. 
						
						
					 
					
						2020-07-27 13:36:40 +10:00 
						 
				 
			
				
					
						
							
							
								Douglas Heriot 
							
						 
					 
					
						
						
							
						
						306e1ad3ab 
					 
					
						
						
							
							GUACAMOLE-919: pass postgres driver socketTimout  
						
						
						
						
					 
					
						2020-07-27 13:36:36 +10:00 
						 
				 
			
				
					
						
							
							
								Douglas Heriot 
							
						 
					 
					
						
						
							
						
						34130f54c9 
					 
					
						
						
							
							GUACAMOLE-919: pass through defaultStatementTimeout  
						
						... 
						
						
						
						Testing a workaround for handling dropped TCP connections to the Postgres database. 
						
						
					 
					
						2020-07-27 13:36:26 +10:00 
						 
				 
			
				
					
						
							
							
								Virtually Nick 
							
						 
					 
					
						
						
							
						
						699e262501 
					 
					
						
						
							
							GUACAMOLE-857:  Merge add guacamole-auth-header to Docker image  
						
						
						
						
					 
					
						2020-07-07 12:25:11 -04:00 
						 
				 
			
				
					
						
							
							
								Jeremy Frasier 
							
						 
					 
					
						
						
							
						
						8be628a549 
					 
					
						
						
							
							GUACAMOLE-857: Configure and use header auth extension if specified  
						
						
						
						
					 
					
						2020-07-07 12:05:54 -04:00 
						 
				 
			
				
					
						
							
							
								Jeremy Frasier 
							
						 
					 
					
						
						
							
						
						ba089c0135 
					 
					
						
						
							
							GUACAMOLE-857: Copy the header auth extension if it is built  
						
						
						
						
					 
					
						2020-07-07 11:16:21 -04:00 
						 
				 
			
				
					
						
							
							
								Virtually Nick 
							
						 
					 
					
						
						
							
						
						0d32579557 
					 
					
						
						
							
							GUACAMOLE-1123: Merge extract common base REST resources for representing ActivityRecordSets.  
						
						
						
						
					 
					
						2020-07-07 00:10:54 -04:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						426d867865 
					 
					
						
						
							
							GUACAMOLE-1123: Extract common base REST resources for representing ActivityRecordSets.  
						
						
						
						
					 
					
						2020-07-06 18:13:36 -07:00 
						 
				 
			
				
					
						
							
							
								Virtually Nick 
							
						 
					 
					
						
						
							
						
						5fe031c931 
					 
					
						
						
							
							GUACAMOLE-1125: Merge fix substituteKeysPressed handler on guacKeyup events  
						
						
						
						
					 
					
						2020-07-06 11:58:01 -04:00 
						 
				 
			
				
					
						
							
							
								Edgardo Rodriguez 
							
						 
					 
					
						
						
							
						
						253b987cbb 
					 
					
						
						
							
							GUACAMOLE-1125: Fix substituteKeysPressed handler on guacKeyup events  
						
						
						
						
					 
					
						2020-07-06 12:44:28 -03:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						475d9419cc 
					 
					
						
						
							
							Merge 1.2.0 changes back to master.  
						
						
						
						
					 
					
						2020-06-25 19:25:53 -07:00 
						 
				 
			
				
					
						
							
							
								Mike Jumper 
							
						 
					 
					
						
						
							
						
						21ec5640a5 
					 
					
						
						
							
							GUACAMOLE-728: Merge changes leveraging PostgreSQL's legacy "ssl" parameter only for disabling SSL.  
						
						
						
						
					 
					
						2020-06-25 19:25:22 -07:00 
						 
				 
			
				
					
						
							
							
								Virtually Nick 
							
						 
					 
					
						
						
							
						
						82168e1d77 
					 
					
						
						
							
							GUACAMOLE-728: Only set legacy flag when SSL is disabled.  
						
						
						
						
					 
					
						2020-06-25 22:21:04 -04:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						038e87a1c6 
					 
					
						
						
							
							Merge 1.2.0 changes back to master.  
						
						
						
						
					 
					
						2020-06-25 19:04:43 -07:00 
						 
				 
			
				
					
						
							
							
								Mike Jumper 
							
						 
					 
					
						
						
							
						
						e3e62f5860 
					 
					
						
						
							
							GUACAMOLE-728: Merge workaround for older PostgreSQL drivers lacking support for sslmode "prefer".  
						
						
						
						
					 
					
						2020-06-25 19:03:53 -07:00 
						 
				 
			
				
					
						
							
							
								Virtually Nick 
							
						 
					 
					
						
						
							
						
						d5d4f16782 
					 
					
						
						
							
							GUACAMOLE-728: Handle lack of support for Postgres prefer SSL mode.  
						
						
						
						
					 
					
						2020-06-25 22:01:02 -04:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						f94e7046ff 
					 
					
						
						
							
							Merge 1.2.0 changes back to master.  
						
						
						
						
					 
					
						2020-06-25 17:55:48 -07:00 
						 
				 
			
				
					
						
							
							
								Mike Jumper 
							
						 
					 
					
						
						
							
						
						c71107e395 
					 
					
						
						
							
							GUACAMOLE-728: Merge workaround for legacy Connector/J SSL behavior.  
						
						... 
						
						
						
						Older versions of the MySQL / MariaDB driver do not support the same level of granular SSL/TLS control, and the legacy "useSSL" parameter cannot be specified without breaking the behavior of "sslMode". 
						
						
					 
					
						2020-06-25 17:54:36 -07:00 
						 
				 
			
				
					
						
							
							
								Virtually Nick 
							
						 
					 
					
						
						
							
						
						6fc09f4ee8 
					 
					
						
						
							
							GUACAMOLE-728: Only set MySQL JDBC useSSL when sslmode is disabled.  
						
						
						
						
					 
					
						2020-06-25 20:22:20 -04:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						f37e5e8214 
					 
					
						
						
							
							Merge 1.2.0 changes back to master.  
						
						
						
						
					 
					
						2020-06-25 15:54:42 -07:00 
						 
				 
			
				
					
						
							
							
								Mike Jumper 
							
						 
					 
					
						
						
							
						
						079b009325 
					 
					
						
						
							
							GUACAMOLE-728: Merge update of default JDBC SSL mode to prefer / preferred.  
						
						
						
						
					 
					
						2020-06-25 15:52:57 -07:00 
						 
				 
			
				
					
						
							
							
								Virtually Nick 
							
						 
					 
					
						
						
							
						
						788395ad9d 
					 
					
						
						
							
							GUACAMOLE-728: Change default JDBC SSL mode to prefer(red).  
						
						
						
						
					 
					
						2020-06-25 18:48:07 -04:00 
						 
				 
			
				
					
						
							
							
								Virtually Nick 
							
						 
					 
					
						
						
							
						
						5aebe980b8 
					 
					
						
						
							
							Merge staging/1.2.0 changes back to master.  
						
						
						
						
					 
					
						2020-06-25 16:23:16 -04:00 
						 
				 
			
				
					
						
							
							
								Virtually Nick 
							
						 
					 
					
						
						
							
						
						2522b37997 
					 
					
						
						
							
							GUACAMOLE-823: Update item structure of Guacamole menu connection browser to match home screen.  
						
						
						
						
					 
					
						2020-06-25 16:22:30 -04:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						b5eca6831d 
					 
					
						
						
							
							GUACAMOLE-823: Update item structure of Guacamole menu connection browser to match home screen.  
						
						
						
						
					 
					
						2020-06-25 13:17:46 -07:00 
						 
				 
			
				
					
						
							
							
								Virtually Nick 
							
						 
					 
					
						
						
							
						
						2d233e090f 
					 
					
						
						
							
							Merge staging/1.2.0 changes back to master.  
						
						
						
						
					 
					
						2020-06-25 06:52:23 -04:00 
						 
				 
			
				
					
						
							
							
								Virtually Nick 
							
						 
					 
					
						
						
							
						
						57378fd38f 
					 
					
						
						
							
							GUACAMOLE-103: Merge transform username only if present.  
						
						
						
						
					 
					
						2020-06-25 06:51:39 -04:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						9d415469f8 
					 
					
						
						
							
							GUACAMOLE-103: Transform username only if present.  
						
						
						
						
					 
					
						2020-06-24 20:34:52 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						471f4c9aec 
					 
					
						
						
							
							Merge 1.2.0 changes back to master.  
						
						
						
						
					 
					
						2020-06-24 18:03:16 -07:00 
						 
				 
			
				
					
						
							
							
								Mike Jumper 
							
						 
					 
					
						
						
							
						
						a2c8f461be 
					 
					
						
						
							
							GUACAMOLE-103: Re-merge usability improvements to handling of SAML entity ID property.  
						
						... 
						
						
						
						The improvements from commit ed7e7bbb84 
						
						
					 
					
						2020-06-24 18:01:41 -07:00 
						 
				 
			
				
					
						
							
							
								Mike Jumper 
							
						 
					 
					
						
						
							
						
						ed7e7bbb84 
					 
					
						
						
							
							GUACAMOLE-103: Merge usability improvements to handling of SAML entity ID property.  
						
						
						
						
					 
					
						2020-06-24 17:46:54 -07:00 
						 
				 
			
				
					
						
							
							
								Mike Jumper 
							
						 
					 
					
						
						
							
						
						745a1a4de3 
					 
					
						
						
							
							GUACAMOLE-678: Merge correction to URIGuacamoleProperty handling of null values.  
						
						
						
						
					 
					
						2020-06-24 17:46:02 -07:00 
						 
				 
			
				
					
						
							
							
								Virtually Nick 
							
						 
					 
					
						
						
							
						
						349fac9d1a 
					 
					
						
						
							
							GUACAMOLE-678: Return null for null property values.  
						
						
						
						
					 
					
						2020-06-24 20:38:48 -04:00 
						 
				 
			
				
					
						
							
							
								Virtually Nick 
							
						 
					 
					
						
						
							
						
						54cd540973 
					 
					
						
						
							
							GUACAMOLE-103: Adjust checks for entity ID and ACS URL properties.  
						
						
						
						
					 
					
						2020-06-24 20:04:25 -04:00 
						 
				 
			
				
					
						
							
							
								Virtually Nick 
							
						 
					 
					
						
						
							
						
						c061d78d54 
					 
					
						
						
							
							Merge staging/1.2.0 changes back to master.  
						
						
						
						
					 
					
						2020-06-24 19:42:04 -04:00 
						 
				 
			
				
					
						
							
							
								Virtually Nick 
							
						 
					 
					
						
						
							
						
						eb56eb652f 
					 
					
						
						
							
							GUACAMOLE-103: Merge correct SAML extension construction of URLs.  
						
						
						
						
					 
					
						2020-06-24 19:40:44 -04:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						feba7c6da0 
					 
					
						
						
							
							GUACAMOLE-103: Read entity ID and callback URL from properties only if needed.  
						
						
						
						
					 
					
						2020-06-24 16:00:07 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						d1090b00b0 
					 
					
						
						
							
							GUACAMOLE-103: Use UriBuilder for syntax-aware URL construction, rather than simple String concatenation.  
						
						
						
						
					 
					
						2020-06-24 15:41:24 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						e652d29978 
					 
					
						
						
							
							Merge 1.2.0 changes back to master.  
						
						
						
						
					 
					
						2020-06-24 14:10:24 -07:00 
						 
				 
			
				
					
						
							
							
								Mike Jumper 
							
						 
					 
					
						
						
							
						
						181350160b 
					 
					
						
						
							
							GUACAMOLE-103: Merge support for SAML.  
						
						
						
						
					 
					
						2020-06-24 14:09:53 -07:00 
						 
				 
			
				
					
						
							
							
								Virtually Nick 
							
						 
					 
					
						
						
							
						
						8acb3cbb24 
					 
					
						
						
							
							GUACAMOLE-103: Change IdP metadata file to a URI.  
						
						
						
						
					 
					
						2020-06-24 16:24:32 -04:00 
						 
				 
			
				
					
						
							
							
								Virtually Nick 
							
						 
					 
					
						
						
							
						
						1f0174afea 
					 
					
						
						
							
							GUACAMOLE-103: Redirect for login if response hash is not present.  
						
						
						
						
					 
					
						2020-06-24 15:19:10 -04:00 
						 
				 
			
				
					
						
							
							
								Virtually Nick 
							
						 
					 
					
						
						
							
						
						27603dc2ac 
					 
					
						
						
							
							GUACAMOLE-103: Exception handling, token, and SAMLResponseMap updates.  
						
						... 
						
						
						
						Exception handling within the SAML extension has been updated such that
exceptions generate a Guacamole Error rather than a username/password
login.  Tokens now are canonicalized with a standard prefix.  Now using
an Iterator to handle SAMLResponseMap cleanup. 
						
						
					 
					
						2020-06-24 13:36:24 -04:00 
						 
				 
			
				
					
						
							
							
								Virtually Nick 
							
						 
					 
					
						
						
							
						
						806ec964ff 
					 
					
						
						
							
							GUACAMOLE-103: License cleanup, fix comments, and minor code tweaks.  
						
						... 
						
						
						
						Includes implementation of executor shutdown, and correctly removing
items from the shared response map. 
						
						
					 
					
						2020-06-23 23:48:08 -04:00 
						 
				 
			
				
					
						
							
							
								Michael Jumper 
							
						 
					 
					
						
						
							
						
						3912439472 
					 
					
						
						
							
							Merge 1.2.0 changes back to master.  
						
						
						
						
					 
					
						2020-06-23 11:47:02 -07:00 
						 
				 
			
				
					
						
							
							
								Mike Jumper 
							
						 
					 
					
						
						
							
						
						5adba87fbb 
					 
					
						
						
							
							GUACAMOLE-728: Merge Docker support configuring SSL database connections.  
						
						
						
						
					 
					
						2020-06-23 11:46:21 -07:00 
						 
				 
			
				
					
						
							
							
								Virtually Nick 
							
						 
					 
					
						
						
							
						
						52318a99a8 
					 
					
						
						
							
							GUACAMOLE-103: Handle group parsing in safe way  
						
						
						
						
					 
					
						2020-06-23 12:43:14 -04:00 
						 
				 
			
				
					
						
							
							
								Virtually Nick 
							
						 
					 
					
						
						
							
						
						09429492e0 
					 
					
						
						
							
							GUACAMOLE-103: Periodically clean SAMLResponseMap for expired responses.  
						
						
						
						
					 
					
						2020-06-23 12:43:14 -04:00 
						 
				 
			
				
					
						
							
							
								Virtually Nick 
							
						 
					 
					
						
						
							
						
						1c9efb2a44 
					 
					
						
						
							
							GUACAMOLE-103: Process SAML exceptions individually.  
						
						
						
						
					 
					
						2020-06-23 12:43:14 -04:00