maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2,858 Commits 27 Branches 31 Tags 8.7 MiB
986f7f5d64
Commit Graph

2858 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Jumper
b37e73488f GUACAMOLE-313: Provide reference to in-progress screen recording. 2018-01-26 16:21:24 -08:00
Michael Jumper
dc5245025e GUACAMOLE-489: Lock both wrapped sockets when performing operations through a tee socket. 2018-01-26 16:17:45 -08:00
Michael Jumper
dcaf7b2c21 GUACAMOLE-490: Take channel mask into account when rendering image streams to buffers. 2018-01-26 16:08:51 -08:00
Michael Jumper
db85163e20 GUACAMOLE-384: Merge fix for potential segfault if SSH connection is closed while output is still being written to the terminal. 2018-01-23 14:44:47 -08:00
Nick Couchman
8c844e6eab GUACAMOLE-484: Merge ensure disconnect reason code is checked for orderly RDP disconnect. 2018-01-22 15:29:26 -05:00
Michael Jumper
822a6c6b9d GUACAMOLE-484: Do not flush frame if connection closed mid-frame. 2018-01-22 12:24:07 -08:00
Michael Jumper
61c16a89d2 GUACAMOLE-484: Always clean up after orderly disconnect. 2018-01-22 12:23:39 -08:00
Michael Jumper
d562cb7648 GUACAMOLE-484: Ensure disconnect reason code is checked for orderly RDP disconnect. 2018-01-22 12:16:09 -08:00
Michael Jumper
0f78b01e81 GUACAMOLE-456: Merge multi-stage Docker build changes. 2018-01-19 13:37:01 -08:00
Michael Jumper
11605ff5ed GUACAMOLE-481: Merge Turkish keymap for RDP. 2018-01-09 19:12:05 -08:00
csenel
93b3eebc5d
GUACAMOLE-481: Add Turkish Q keymap for RDP 2018-01-09 10:53:05 +03:00
Nick Couchman
66ffda24f0 GUACAMOLE-448: Add support for configuring bitmap caching. 2018-01-02 18:26:29 -05:00
Nick Couchman
5295886f68 Merge 0.9.14 changes back to master. 2018-01-01 16:27:03 -05:00
Nick Couchman
7c191d7be0 GUACAMOLE-423: Merge bump version number to 0.9.14. 2018-01-01 16:23:37 -05:00
Nick Couchman
f72de10328 GUACAMOLE-307: Merge the size instruction can also apply to buffers. 2017-12-09 12:55:19 -05:00
Michael Jumper
ff6c4b04f4 GUACAMOLE-307: The "size" instruction can also apply to buffers, not just layers. 2017-12-08 14:54:15 -08:00
Michael Jumper
1b81549c97 GUACAMOLE-423: Update libtool version info for libguac (interfaces added, none changed/removed). 2017-12-07 19:10:45 -08:00
Michael Jumper
37236207a0 GUACAMOLE-423: Bump version number to 0.9.14. 2017-12-07 19:10:45 -08:00
Michael Jumper
76a6e41031 GUACAMOLE-423: Automatically populate package version within manpages. 2017-12-07 19:10:45 -08:00
Nick Couchman
e3d8c3fa12 Merge 0.9.14 changes back to master. 2017-12-06 10:04:34 -05:00
Nick Couchman
6322874d3a GUACAMOLE-436: Merge remove incubator prefixes and DISCLAIMER. 2017-12-06 10:02:44 -05:00
Carl Harris
e4f4761c87 GUACAMOLE-456: use Docker multi-stage build 2017-12-06 07:57:12 -05:00
Michael Jumper
798ba1e5be GUACAMOLE-423: Automatically populate package version within Doxyfile. 2017-12-06 01:13:39 -08:00
Michael Jumper
89912dc657 GUACAMOLE-436: Remove old references to pre-Incubator project. 2017-12-06 00:54:21 -08:00
Michael Jumper
a514f03fd4 GUACAMOLE-436: Remove incubator prefix from repositories and URLs. 2017-12-06 00:54:21 -08:00
Michael Jumper
d201344443 GUACAMOLE-436: Remove Incubator DISCLAIMER file. 2017-12-06 00:54:21 -08:00
Michael Jumper
2c12c12850 GUACAMOLE-424: Merge changes addressing potential NULL-pointer dereference in VNC user leave handler. 2017-11-15 07:05:21 -08:00
itsankoff
aa6d81d6f9 GUACAMOLE-424: Update doc comments 2017-11-15 15:02:08 +02:00
Michael Jumper
a75bca1e95 GUACAMOLE-273: Merge RDP support for Portuguese Brazilian keyboard. 2017-11-14 17:17:34 -08:00
Frode Langelo
fc599d2aec GUACAMOLE-273: Remove Mac remapping of €. 2017-11-14 20:04:49 +00:00
Michael Jumper
493fa4df16 GUACAMOLE-233: Merge RDP support for Spanish keyboards. 2017-11-14 10:56:28 -08:00
Michael Jumper
c4c32264bf GUACAMOLE-434: Merge RDP support for UK English keyboards. 2017-11-14 10:55:53 -08:00
Frode Langelo
fc15850288 GUACAMOLE-233: Add Spanish keymap for RDP. 2017-11-13 22:57:21 +00:00
Frode Langelo
a8174eeac9 GUACAMOLE-273: Fix comment for remapping of €. 2017-11-13 22:52:39 +00:00
Frode Langelo
ed8a32f98b GUACAMOLE-273: Add Brazillian ABNT2 keymap for RDP. 2017-11-13 22:43:42 +00:00
Frode Langelo
625eee0caa GUACAMOLE-434: Add UK English keymap for RDP. 2017-11-13 22:26:29 +00:00
itsankoff
e139b20d12 GUACAMOLE-424: Remove check against NULL for display cursor 2017-11-13 14:51:31 +02:00
itsankoff
f7990af6d0 GUACAMOLE-424: Return NULL if guac_common_display allocation fails 2017-11-13 14:50:44 +02:00
itsankoff
da0fc1a6d8 GUACAMOLE-424: Add doc comment for guac_common_cursor_alloc 2017-11-13 14:49:44 +02:00
Michael Jumper
025fc0525f Merge 0.9.14-incubating changes back to master. 2017-11-06 11:29:37 -08:00
Michael Jumper
233f5e27e2 GUACAMOLE-296: Merge changes reverting explicit linking of libwinpr-utils. 2017-11-06 11:24:39 -08:00
Nick Couchman
b9f8e13d80 GUACAMOLE-296: Revert manual addition of winpr-utils library. 2017-11-06 12:20:56 -05:00
itsankoff
bbafa00df0 GUACAMOLE-424: Prevent null pointer dereference for vnc client display and cursor 2017-11-02 19:53:17 +02:00
sanhex
d33bd8deff GUACAMOLE-384: fixing segfault during ssh disconnect 
Root Cause:
See the core dump and Valgrind report posted on Jira. guacd was reading a ssh terminal which had been freed. When a ssh connection is terminated, guac_ssh_client_free_handler() will be called from guacd_exec_proc() -> guac_client_free() with pointer client->free_handler. In guac_ssh_client_free_handler(), when ssh_client->term is freed, ssh_client->client_thread may still be using the ssh_client->term. It causes the crash reported in this bug.

The stack trace exposing the problem can be found by running guacd under Valgrind with a ssh test script. The test script repeats doing ssh login and logout for 5000 times.

Solution:
In guac_ssh_client_free_handler(), before calling guac_terminal_free(ssh_client->term), close the stdin pipe of the terminal to stop reading the pipe with guac_terminal_read_stdin() in ssh_input_thread(). So that ssh_input_thread() can be terminated in this case. Call pthread_join() to wait for ssh_client_thread() terminating before freeing the terminal.

Add a new function guac_terminal_stop() to close the pipe and set the fds to invalid (-1). Call it in guac_ssh_client_free_handler() and guac_terminal_free().

Checking the client running state in ssh_input_thread() and ssh_client_thread() to make sure they can be terminated when the client is stopped in guacd_exec_proc() by another thread.

Test:
- Confirmed ssh connection works normally.
- Observed the child process of guacd exits when ssh connection is terminated.
- Reran the ssh test script. Observed no crash.
 2017-10-29 18:11:15 -07:00
itsankoff
15f6c4f3dc GUACAMOLE-424: Fix null pointer dereference for vnc client display 2017-10-24 20:21:03 +03:00
Michael Jumper
95be88be19 GUACAMOLE-296: Merge fix for linking issues with FreeRDP 1.1 and guacai (audio input). 2017-10-14 23:45:35 -07:00
Michael Jumper
012a3497eb GUACAMOLE-411: Merge changes fully initializing CMSG buffer prior to use. 2017-10-14 17:50:47 -07:00
Nick Couchman
caedf26a06 GUACAMOLE-296: Break out WINPR libs into their own variable. 2017-10-13 21:25:32 -04:00
Nick Couchman
9487eb2dc9 GUACAMOLE-296: Fix linking issue that causes audio issues with FreeRDP 1.1 2017-10-13 21:04:13 -04:00
Nick Couchman
c49c57ef30 GUACAMOLE-402: Merge fix out-of-tree build 2017-10-12 12:35:46 -04:00