Commit Graph

3164 Commits

Author SHA1 Message Date
Michael Jumper
a0e11dc817 Merge staging/1.2.0 changes back to master. 2020-05-07 14:10:33 -07:00
Mike Jumper
0bf65ce8b0
GUACAMOLE-1059: Merge changes leveraging appropriate FreeRDP checks to verify input stream length. 2020-05-07 14:09:47 -07:00
Nick Couchman
557e2f5944 GUACAMOLE-1059: Fine tune comments and log messages. 2020-05-06 10:17:20 -04:00
Nick Couchman
47bf3ab672 GUACAMOLE-1059: Verify correct number of bytes for incoming wave. 2020-05-05 17:15:47 -04:00
Nick Couchman
315a8a7179 GUACAMOLE-1059: Correctly handle issues processing audio input formats. 2020-05-05 16:53:13 -04:00
Nick Couchman
e761e47cd0 GUACAMOLE-1059: Add missing checks and fix up warning messages. 2020-05-05 16:33:59 -04:00
Nick Couchman
71769b9715 GUACAMOLE-1059: Add missing check for manually copied buffer. 2020-05-04 19:49:15 -04:00
Nick Couchman
ac9e5e91f6 GUACAMOLE-1059: Remove bad check of audio stream against body_size. 2020-05-04 17:53:38 -04:00
Nick Couchman
98f0c271fb GUACAMOLE-1059: Add explanatory comments and additional logging. 2020-05-04 17:45:17 -04:00
Nick Couchman
8560ff9718 GUACAMOLE-1059: Move rdpsnd body size check to correct location. 2020-05-04 12:11:37 -04:00
Nick Couchman
ce28575b3a GUACAMOLE-1059: Use FreeRDP function for verifying Stream length before reading. 2020-05-04 08:48:40 -04:00
Mike Jumper
9c37fc5617
GUACAMOLE-949: Merge removal of unused UNIX_TIME macro. 2020-04-13 23:16:25 -07:00
Nick Couchman
a55e1893dd GUACAMOLE-949: Remove unused UNIX_TIME macro. 2020-04-02 15:53:51 -04:00
Nick Couchman
bbb794966b Merge staging/1.2.0 changes back to master. 2020-03-22 20:30:42 -04:00
Virtually Nick
e78eb589d9
GUACAMOLE-952: Merge correct security negotiation behavior for Hyper-V / VMConnect. 2020-03-22 20:29:33 -04:00
Michael Jumper
04b8633410 GUACAMOLE-952: Add security negotiation mode specific to Hyper-V / VMConnect. 2020-03-22 16:27:55 -07:00
Michael Jumper
aa8c8cac84 GUACAMOLE-952: Remove incorrect Preconnection PDU warning left over from old FreeRDP support. 2020-03-22 16:27:55 -07:00
Virtually Nick
fba6ef461c
GUACAMOLE-982: Merge fix the error log message when the creating thread of RDP client fails 2020-03-09 18:45:11 -04:00
Jimmy
fa86d18353 GUACAMOLE-982: Fix the error log message when the creating thread of RDP client fails. 2020-03-09 23:16:28 +02:00
Nick Couchman
f47491eaca Merge staging/1.2.0 changes back to master. 2020-03-02 18:38:03 -05:00
Virtually Nick
e4407167ab
GUACAMOLE-979: Merge ensure all FreeRDP settings strings are independent duplicates of their corresponding Guacamole settings. 2020-03-02 18:36:33 -05:00
Virtually Nick
253213b29d
GUACAMOLE-978: Merge respond to Handshake/HandshakeEx PDU received via RAIL with client Handshake PDU. 2020-03-02 18:35:53 -05:00
Michael Jumper
5e1b92cb65 GUACAMOLE-979: Ensure all FreeRDP settings strings are independent duplicates of their corresponding Guacamole settings.
FreeRDP 2.0.0 will automatically free all settings strings when the
settings structure is freed. As we will also do the same for our own
settings strings, the FreeRDP settings must be kept independent. There
is no guarantee that the FreeRDP settings will be pushed before an error
causes the connection to abort, nor that the FreeRDP settings will not
need to be pushed multiple times due to an automatic reconnect.
2020-03-02 15:02:03 -08:00
Michael Jumper
789463ce76 GUACAMOLE-978: Respond to Handshake/HandshakeEx PDU received via RAIL with client Handshake PDU. 2020-03-02 14:15:27 -08:00
Nick Couchman
cc688485db Merge staging/1.2.0 changes back to master. 2020-02-28 13:51:13 -05:00
Virtually Nick
cf845be5ee
GUACAMOLE-917: Merge add missing non-dead tilde to German keymap for RDP. 2020-02-28 13:49:45 -05:00
Michael Jumper
28983d964b GUACAMOLE-917: Add missing non-dead tilde to German keymap for RDP. 2020-02-28 10:47:22 -08:00
Michael Jumper
0832dda409 Merge 1.2.0 changes back to master. 2020-02-26 18:51:06 -08:00
Mike Jumper
4b4b11da57
GUACAMOLE-966: Merge bump of guacamole-server version number to 1.2.0. 2020-02-26 18:50:30 -08:00
Nick Couchman
34d798a0ff GUACAMOLE-966: Bump server version to 1.2.0 2020-02-25 20:45:54 -05:00
Nick Couchman
811d2f70e4 Merge staging/1.2.0 changes back to master. 2020-02-24 22:50:10 -05:00
Virtually Nick
83d2f30f8b
GUACAMOLE-818: Merge break SFTP directory JSON at blob boundaries. Do not skip entries. 2020-02-24 21:14:49 -05:00
Michael Jumper
8ea9b14a80 GUACAMOLE-818: Break SFTP directory JSON at blob boundaries. Do not skip entries.
The intent of the previous version of the SFTP directory listing code
was to break the JSON transfer at blob boundaries, waiting for an ack
before sending the next blob, however the ordering of the "blob_written"
and directory read checks could result in a directory entry being
skipped at the boundary of each blob.

The proper order would be to check the "blob_written" flag first,
however the "blob_written" flag is unnecessary. It's simpler and more
correct to just break out of the loop once the desired blob has been
flushed.
2020-02-24 17:58:29 -08:00
Virtually Nick
d2ee11f15a
GUACAMOLE-962: Merge allow misbehaving RDP servers to use OpaqueRect and PatBlt. 2020-02-24 20:27:20 -05:00
Michael Jumper
a80cd8db06 GUACAMOLE-962: Restore OpaqueRect and PatBlt handlers.
This commit effectively reverts commit 9855d875c7.

With relaxed order checks enabled, FreeRDP will indeed invoke the
OpaqueRect and PatBlt handlers (even though we do not announce support
for those orders) as long as handlers are provided.
2020-02-24 16:48:14 -08:00
Michael Jumper
3b0abe376e GUACAMOLE-962: Request relaxed RDP order checks if supported by FreeRDP. 2020-02-24 16:48:14 -08:00
Mike Jumper
090bb3bbea
GUACAMOLE-958: Merge changes correcting race condition and potential deadlock in guacd_timed_client_free(). 2020-02-13 09:49:35 -08:00
Jonas Zeiger
783aa85c1b GUACAMOLE-958: Avoid race/deadlock in guacd_timed_client_free() 2020-02-12 15:06:25 +01:00
Virtually Nick
5ecad1c3d9
GUACAMOLE-947: Merge fix the initialization issue of CLIPRDR_FORMAT_LIST object 2020-02-06 16:54:39 -05:00
Jimmy
659cdd09a0 GUACAMOLE-947: Fix the initialization issue of CLIPRDR_FORMAT_LIST object. 2020-02-06 18:17:40 +02:00
Mike Jumper
68a6285818
GUACAMOLE-625: Merge changes correcting failing build due to trailing whitespace in Makefile.am. 2020-01-24 08:09:32 -08:00
Nick Couchman
0e845a2914 GUACAMOLE-625: Remove trailing whitespace in Makefile.am and fix style 2020-01-24 10:32:25 -05:00
Virtually Nick
550e13ae9f
GUACAMOLE-625: Merge include Latin American RDP keymap 2020-01-24 10:07:10 -05:00
Adolfo Gómez García
b13fae7a9f GUACAMOLE-625: Included Latin American keymap 2020-01-24 10:50:23 +01:00
Nick Couchman
0aecca3e04 Merge staging/1.1.0 changes back to master. 2020-01-22 16:25:39 -05:00
Virtually Nick
a054073ec7
GUACAMOLE-935: Merge do not assign SVC plugin context as it may be automatically freed. 2020-01-22 16:23:38 -05:00
Michael Jumper
8ebe5c571a GUACAMOLE-935: Do not assign SVC plugin context as it may be automatically freed.
FreeRDP version 2.0.0-rc0 and older will automatically free whatever
entry_points->pInterface is set to when the channel plugin is unloaded.
This doesn't happen in later versions, but will result in a double-free
upon disconnect for 2.0.0-rc0 in our case. As we don't need pInterface,
we can safely set this to NULL and avoid the issue entirely.
2020-01-22 11:10:50 -08:00
James Muehlner
28f7d3694e Merge 1.1.0 changes back to master. 2020-01-21 23:30:27 -08:00
James Muehlner
3bc00c429a
GUACAMOLE-935: Merge fix for differing rdpBitmap free behavior. 2020-01-21 23:28:46 -08:00
Michael Jumper
87a3c7392b GUACAMOLE-935: Periods within regexes must be escaped if intended to match literal periods. 2020-01-21 22:35:26 -08:00