safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-10 07:01:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #211 from glyptodon/cors-httptunnel

Browse Source 
GUAC-1083: Allow use of CORS with Guacamole.HTTPTunnel
This commit is contained in:
James Muehlner
2015-07-07 22:11:46 -07:00
parent c3b6d68588 19eb4e3971
commit 7aeb16f31e
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
guacamole-common-js/src/main/webapp/modules/Tunnel.js
View File

@@ -137,9 +137,16 @@ Guacamole.Tunnel.State = {
* *
* @constructor * @constructor
* @augments Guacamole.Tunnel * @augments Guacamole.Tunnel
* @param {String} tunnelURL The URL of the HTTP tunneling service. *
* @param {String} tunnelURL
* The URL of the HTTP tunneling service.
*
* @param {Boolean} [crossDomain=false]
* Whether tunnel requests will be cross-domain, and thus must use CORS
* mechanisms and headers. By default, it is assumed that tunnel requests
* will be made to the same domain.
*/ */
Guacamole.HTTPTunnel = function(tunnelURL) { Guacamole.HTTPTunnel = function(tunnelURL, crossDomain) {
/** /**
* Reference to this HTTP tunnel. * Reference to this HTTP tunnel.
@@ -162,6 +169,10 @@ Guacamole.HTTPTunnel = function(tunnelURL) {
var sendingMessages = false; var sendingMessages = false;
var outputMessageBuffer = ""; var outputMessageBuffer = "";
// If requests are expected to be cross-domain, the cookie that the HTTP
// tunnel depends on will only be sent if withCredentials is true
var withCredentials = !!crossDomain;
/** /**
* The current receive timeout ID, if any. * The current receive timeout ID, if any.
* @private * @private
@@ -278,6 +289,7 @@ Guacamole.HTTPTunnel = function(tunnelURL) {
var message_xmlhttprequest = new XMLHttpRequest(); var message_xmlhttprequest = new XMLHttpRequest();
message_xmlhttprequest.open("POST", TUNNEL_WRITE + tunnel_uuid); message_xmlhttprequest.open("POST", TUNNEL_WRITE + tunnel_uuid);
message_xmlhttprequest.withCredentials = withCredentials;
message_xmlhttprequest.setRequestHeader("Content-type", "application/x-www-form-urlencoded; charset=UTF-8"); message_xmlhttprequest.setRequestHeader("Content-type", "application/x-www-form-urlencoded; charset=UTF-8");
// Once response received, send next queued event. // Once response received, send next queued event.
@@ -508,6 +520,7 @@ Guacamole.HTTPTunnel = function(tunnelURL) {
// Make request, increment request ID // Make request, increment request ID
var xmlhttprequest = new XMLHttpRequest(); var xmlhttprequest = new XMLHttpRequest();
xmlhttprequest.open("GET", TUNNEL_READ + tunnel_uuid + ":" + (request_id++)); xmlhttprequest.open("GET", TUNNEL_READ + tunnel_uuid + ":" + (request_id++));
xmlhttprequest.withCredentials = withCredentials;
xmlhttprequest.send(null); xmlhttprequest.send(null);
return xmlhttprequest; return xmlhttprequest;
@@ -547,6 +560,7 @@ Guacamole.HTTPTunnel = function(tunnelURL) {
}; };
connect_xmlhttprequest.open("POST", TUNNEL_CONNECT, true); connect_xmlhttprequest.open("POST", TUNNEL_CONNECT, true);
connect_xmlhttprequest.withCredentials = withCredentials;
connect_xmlhttprequest.setRequestHeader("Content-type", "application/x-www-form-urlencoded; charset=UTF-8"); connect_xmlhttprequest.setRequestHeader("Content-type", "application/x-www-form-urlencoded; charset=UTF-8");
connect_xmlhttprequest.send(data); connect_xmlhttprequest.send(data);