Commit Graph
4189 Commits
Author SHA1 Message Date
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 12daab2c34 GUACAMOLE-363: Fix issues with schema initialization scripts. 2017-10-24 10:04:12 -04:00
Michael Jumper d955fbea1a GUACAMOLE-416: Merge correction for typo in translation key for data source. 2017-10-23 14:05:41 -07:00
Nick Couchman 7fa0aaeeb3 GUACAMOLE-416: Fix typo in translation file. 2017-10-23 08:48:40 -04:00
James Muehlner 528977422c GUACAMOLE-416: Merge addition of missing translation strings for SQL Server auth. 2017-10-22 19:43:30 -07:00
Nick Couchman cc8ea75426 GUACAMOLE-416: Add translation entries for SQL Server module. 2017-10-13 13:13:12 -04:00
Michael Jumper b8abcd6755 GUACAMOLE-408: Merge support for Docker multi-stage builds. 2017-10-07 23:13:58 -07:00
Carl Harris e42a875f08 GUACAMOLE-408: don't exclude .gitignore in .dockerignore
Because the .gitignore files are needed for configuring implicit
excludes for rat, .dockerignore must not exclude these files when
copying files into the image build context.
2017-10-07 20:35:20 -04:00
Carl Harris 65c16ce90e GUACAMOLE-408: revert changes to rat excludes
The excludes for rat should include everything in .gitignore, so
these explicit excludes are not needed.
2017-10-07 20:31:24 -04:00
Carl Harris 70db9a4c42 GUACAMOLE-408: exclude generated HTML files from rat validation
When building inside of the Docker container, some files with
generated HTML are being validated by RAT and failing due to the
lack of a license header. When building outside of Docker, this
problem does not occur. Not sure why these paths don't fail when
building outside of the container, and I don't know enough about
the plugin that generates these files to understand why it behaves
differently inside of the container. Nonetheless, I think these
excludes seem reasonable.
2017-10-07 10:12:49 -04:00
Carl Harris ac50375ad5 GUACAMOLE-408: don't try to clean up the local Maven repository
There's no need to clean up the local Maven repository after the
build, since only the artifacts we want are copied to the runtime
image. For reasons not investigated, attempting to remove the
local repository directory fails because the directory is in use
after the build.
2017-10-07 10:09:18 -04:00