Commit Graph

4204 Commits

Author SHA1 Message Date
Ignasi Barrera
227e41fbd9 GUACAMOLE-437: Fix extraHeaders scope 2017-11-20 18:41:43 +01:00
Michael Jumper
ff2bd3d4f8 GUACAMOLE-437: Merge support for including custom headers within HTTP tunnel requests. 2017-11-19 14:25:17 -08:00
Ignasi Barrera
948b4e804c GUACAMOLE-437: Custom headers for Guacamole tunnel 2017-11-19 03:45:39 +01:00
Michael Jumper
e2c8594b3a Merge 0.9.14-incubating changes back to master. 2017-11-12 18:30:39 -08:00
Michael Jumper
442fd3daa4 GUACAMOLE-243: Merge support for LDAP referrals. 2017-11-12 18:20:51 -08:00
Nick Couchman
5a6c47a9b2 GUACAMOLE-431: Merge Fix tunnel handling of CLOSED state. 2017-11-08 13:50:51 -05:00
Or Cohen
63f603ec9d GUACAMOLE-431: Fix tunnel stuck in CLOSED state
When the tunnel is closed and another `connect()` call is made, it stops
notifying about state changes (`onstatechanges`) if the connection continues
to fail.

This patch sets the state to `CONNECTING` when calling `connect()`.
2017-11-07 12:41:51 +02:00
Or Cohen
d778ad7035 GUACAMOLE-431: Move setState to base Tunnel class
Move `setState()` to Tunnel class to avoid repetition.
2017-11-07 12:41:40 +02:00
Nick Couchman
124cf92358 GUACAMOLE-243: Clean up JavaDoc comments, fix error messages and exceptions. 2017-11-06 22:15:47 -05:00
Michael Jumper
0611fe8fff Merge 0.9.14-incubating changes back to master. 2017-10-28 22:22:50 -07:00
Michael Jumper
393c70f236 GUACAMOLE-362: Merge changes addressing InputStream leak when reading CAS ClearPass private key. 2017-10-28 22:20:53 -07:00
Nick Couchman
32ccde08d2 GUACAMOLE-362: Avoid NullPointerException when closing input stream. 2017-10-28 14:19:37 -04:00
Nick Couchman
91e5702768 GUACAMOLE-362: Move close to finally block. 2017-10-28 14:04:13 -04:00
Nick Couchman
5c0c823913 GUACAMOLE-362: Fix resource leak in FileInputStream when reading private key. 2017-10-28 09:15:58 -04:00
Nick Couchman
698456960c Merge 0.9.14-incubating changes back to master. 2017-10-27 20:00:30 -04:00
Nick Couchman
1a7f85ae51 GUACAMOLE-412: Merge refactor UserEvent to provide AuthenticatedUser instead of UserContext 2017-10-27 19:54:22 -04:00
Michael Jumper
223102c38c GUACAMOLE-412: Refactor user events with respect to extension API changes since the decoupling of auth from storage, providing AuthenticatedUser instead of UserContext to represent the user involved. 2017-10-27 13:03:17 -07:00
Michael Jumper
80896ca5b4 Merge 0.9.14-incubating changes back to master. 2017-10-27 12:22:00 -07:00
Michael Jumper
51ccbed130 GUACAMOLE-355: Merge catch-all error handling for unchecked exceptions thrown by underlying CAS library. 2017-10-27 12:20:07 -07:00
Nick Couchman
9c57e20a17 GUACAMOLE-355: Switch to Invalid credentials and rely on error being logged. 2017-10-27 15:16:49 -04:00
Nick Couchman
a45a44fea5 GUACAMOLE-355: Make error displayed to user more generic. 2017-10-27 15:16:49 -04:00
Nick Couchman
5ff7fbf971 GUACAMOLE-355: Catch CAS errors and throw them to Guacamole, and display error message in login dialog. 2017-10-27 15:16:41 -04:00
Michael Jumper
83b8577095 Merge 0.9.14-incubating changes back to master. 2017-10-27 10:56:08 -07:00
Michael Jumper
bfb6b13ba7 GUACAMOLE-363: Merge correction to SQL Server syntax. 2017-10-27 10:55:13 -07:00
Michael Jumper
e5c5422623 Merge 0.9.14-incubating changes back to master. 2017-10-27 10:51:05 -07:00
Michael Jumper
0d74dc5821 GUACAMOLE-362: Merge support for CAS ClearPass. 2017-10-27 10:50:08 -07:00
Nick Couchman
ad8820cf05 GUACAMOLE-362: Remove unnecessary IOException catch. 2017-10-27 13:45:25 -04:00
Nick Couchman
b968e073c2 GUACAMOLE-362: Move PrivateKeyGuacamoleProperty into CAS extension and use ByteArrayOutputStream for reading thefile. 2017-10-27 13:06:07 -04:00
Nick Couchman
c92d2e3598 GUACAMOLE-362: Loop through reading bytes from key file. 2017-10-27 13:05:13 -04:00
Nick Couchman
61f70c57be GUACAMOLE-362: Fix error message typo. 2017-10-27 13:05:13 -04:00
Nick Couchman
a196134f2d GUACAMOLE-362: Change warn to debug for missing private key. 2017-10-27 13:05:13 -04:00
Nick Couchman
17599d9153 GUACAMOLE-362: Set encoding of ticket validator to UTF-8. 2017-10-27 13:05:13 -04:00
Nick Couchman
3d091411f3 GUACAMOLE-362: Deal correctly with return value when reading the key. 2017-10-27 13:05:13 -04:00
Nick Couchman
ab41f44100 GUACAMOLE-362: Fix style and error messages. 2017-10-27 13:05:13 -04:00
Nick Couchman
bd57938dff GUACAMOLE-362: Add missing parameter documentation for credentials object. 2017-10-27 13:05:13 -04:00
Nick Couchman
b410b99d49 GUACAMOLE-362: Refactor ticket validation handling of credentials. 2017-10-27 13:05:13 -04:00
Nick Couchman
62fafcb379 GUACAMOLE-362: Move password decryption logic into TicketValidationService class. 2017-10-27 13:05:13 -04:00
Nick Couchman
63134322b0 GUACAMOLE-362: Remove debug line. 2017-10-27 13:05:13 -04:00
Nick Couchman
453a879876 GUACAMOLE-362: Catch exceptions individually and display useful error messages. 2017-10-27 13:05:13 -04:00
Nick Couchman
3ce0980efc GUACAMOLE-362: More useful error messages for exceptions in PrivateKey property. 2017-10-27 13:05:13 -04:00
Nick Couchman
6f04573b84 GUACAMOLE-362: Update documentation to reflect code. 2017-10-27 13:05:12 -04:00
Nick Couchman
1592cf563a GUACAMOLE-362: Removed unnecesary addition of username to credentials. 2017-10-27 13:05:12 -04:00
Nick Couchman
badbf4cc7d GUACAMOLE-362: Change new property to a PrivateKey and refactor code accordingly. 2017-10-27 13:05:12 -04:00
Nick Couchman
ed4c025a2e GUACAMOLE-362: Deal gracefully with situations where password cannot be decrypted. 2017-10-27 13:05:12 -04:00
Nick Couchman
36489ff403 GUACAMOLE-362: Implement new CipherGuacamoleProperty and move cipher functionality to it. 2017-10-27 13:05:12 -04:00
Nick Couchman
c3aaf0aa03 GUACAMOLE-362: Debug should throw full exception, not just getMessage() output. 2017-10-27 13:05:12 -04:00
Nick Couchman
87fba0ed7b GUACAMOLE-362: Fix style issue; remove unnecessary LocalEnvironment initilization. 2017-10-27 13:05:12 -04:00
Nick Couchman
1c333106c0 GUACAMOLE-362: Fix case where credential object is null. 2017-10-27 13:05:12 -04:00
Nick Couchman
1c4831dd51 GUACAMOLE-362: Add support for CAS ClearPass, parsing and decrypting the password and assigning it a token. 2017-10-27 13:05:12 -04:00
Nick Couchman
37bfa9e00f GUACAMOLE-243: Remove more unnecessary continue statements. 2017-10-24 15:01:58 -04:00