Commit Graph

712 Commits

Author SHA1 Message Date
Michael Jumper
0bddff8bad GUACAMOLE-942: Correct race condition in retrieval of readable connection identifiers.
As activeTunnels is a live map which may change while
getActiveConnections() is running, it is possible for an initial call
to activeTunnels.isEmpty() to pass yet for the set of connection
identifiers produced to be empty.
2020-08-20 19:17:45 -07:00
Virtually Nick
d4fb1b0549 GUACAMOLE-1135: Merge return MySQL StoreUrls in URI format 2020-08-05 16:17:27 -04:00
Richard Grime
d32ebd656a GUACAMOLE-1135: Return StoreUrls in URI format 2020-08-05 08:52:54 +00:00
Virtually Nick
9863aec9f6 GUACAMOLE-919: Merge implement PostgreSQL defaultStatementTimeout and socketTimeout 2020-07-29 08:17:02 -04:00
Douglas Heriot
20b1dbf00f GUACAMOLE-919: More updates to style and comments. 2020-07-27 13:36:52 +10:00
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
Richard Grime
fea3fd3b77 GUACAMOLE-1136: Return correct MYSQL_SSL_CLIENT_
MySQL Environment incorrectly returned MYSQL_SSL_TRUST_
parameters for the file and password, instead of the
expected MYSQL_SSL_CLIENT_ values.
2020-07-14 18:20:26 +00:00
Michael Jumper
475d9419cc Merge 1.2.0 changes back to master. 2020-06-25 19:25:53 -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
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
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
Virtually Nick
788395ad9d GUACAMOLE-728: Change default JDBC SSL mode to prefer(red). 2020-06-25 18:48:07 -04:00
Michael Jumper
bfde9562fc Merge 1.2.0 changes back to master. 2020-06-21 19:29:55 -07:00
Virtually Nick
32d85d835e GUACAMOLE-708: Minor style corrections and code clean-up. 2020-06-21 07:06:08 -04:00
Michael Jumper
577eca819f Merge 1.2.0 changes back to master. 2020-06-20 19:59:39 -07:00
Virtually Nick
2bf29a0d97 GUACAMOLE-708: Implement isSkeleton method for ModeledUser. 2020-06-20 21:15:47 -04:00
Virtually Nick
486ab9aefa GUACAMOLE-708: Remove unnecessary null check 2020-06-20 16:41:09 -04:00
Virtually Nick
55fccff7a7 GUACAMOLE-708: Spelling correction in JavaDoc comments. 2020-06-20 16:24:35 -04:00
Virtually Nick
76f7379f46 GUACAMOLE-708: Add and update JavaDoc comments. 2020-06-20 09:43:18 -04:00
Virtually Nick
2888d6a340 GUACAMOLE-708: Handle implicit permissions where no entity exists. 2020-06-20 09:43:18 -04:00
Virtually Nick
e0aedefd6f GUACAMOLE-708: Add calls for auto-creating DB users when so configured. 2020-06-19 21:25:19 -04:00
Virtually Nick
0ad00dda3e GUACAMOLE-708: Add properties for automatic account creation. 2020-06-19 12:22:26 -04:00
Virtually Nick
33fa0033d2 Merge staging/1.2.0 changes back to master. 2020-06-18 11:38:34 -04:00
Michael Jumper
c7ba1e65d3 GUACAMOLE-708: Update comments to reflect generalization of privileged access beyond administrators. 2020-06-17 21:44:02 -07:00
Michael Jumper
0b2269f1ea GUACAMOLE-708: Add support for getPrivileged() to JDBC UserContext. 2020-06-17 21:44:02 -07:00
Michael Jumper
6f37e5d07d GUACAMOLE-708: Replace isAdministrator() checks with more generic isPrivileged(). 2020-06-16 20:44:12 -07:00
Michael Jumper
d33864bdc1 Merge 1.2.0 changes back to master. 2020-06-16 12:59:57 -07:00
Mike Jumper
b295e2082e GUACAMOLE-728: Merge SSL support for MySQL and PostgreSQL. 2020-06-16 12:58:48 -07:00
Virtually Nick
f06056b4e4 GUACAMOLE-728: Use correct sslMode options for passing to JDBC driver. 2020-06-16 14:50:44 -04:00
Michael Jumper
b02727e441 Merge 1.2.0 changes back to master. 2020-06-16 11:43:02 -07:00
Virtually Nick
986d5a1225 GUACAMOLE-728: Properly expose JDBC driver values from enums. 2020-06-16 11:44:07 -04:00
Virtually Nick
05f49b17cb GUACAMOLE-583: Correct SQLServer instance name property configuration. 2020-06-16 09:57:49 -04:00
Michael Jumper
8b9538937e Merge 1.2.0 changes back to master. 2020-06-16 01:31:53 -07:00
Mike Jumper
6134dd3c88 GUACAMOLE-583: Merge support for SQL Server instance names. 2020-06-16 01:14:09 -07:00
Virtually Nick
31288fc4d0 GUACAMOLE-728: Refactor with EnumGuacamoleProperty and fix up comments. 2020-06-13 22:34:01 -04:00
Virtually Nick
8c2df77f2d GUACAMOLE-728: Set legacy SSL options for MySQL 2020-06-13 21:57:53 -04:00
Virtually Nick
d5a3f8116e GUACAMOLE-728: Add PostgreSQL SSL mode configuration. 2020-06-13 21:57:33 -04:00
Virtually Nick
721010cc14 GUACAMOLE-728: Implement MySQL driver SSL configuration. 2020-06-13 21:57:27 -04:00
Virtually Nick
2bbd039d5c Merge staging/1.2.0 changes back to master. 2020-06-13 21:49:06 -04:00
Michael Jumper
7c44ee2a67 GUACAMOLE-728: Migrate existing enum-based GuacamoleProperty implementations to EnumGuacamoleProperty. 2020-06-10 21:41:31 -07:00
darksimpson
49c3f59ddb GUACAMOLE-1054: Fixed formatting (lined up translation strings in groups) 2020-05-06 13:03:32 +03:00
darksimpson
c7cc62803b GUACAMOLE-1054: Fixed some minor translation issues like removal of empty and not-really-translated strings. 2020-05-06 13:03:31 +03:00
darksimpson
4a6327e118 GUACAMOLE-1054: Improve Russian translation 2020-04-28 14:32:22 +03:00
Michael Jumper
0d1f42f6f4 GUACAMOLE-1007: Use Translatable versions of GuacamoleException subclasses where translation keys are in use. 2020-04-13 00:46:28 -07:00