opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2552 from erasche/gie-proxy-issue

Browse Source 
More defensive GIE Proxying
This commit is contained in:
Björn Grüning
2016-06-26 18:28:28 +02:00
committed by GitHub
parent b8fa771c4a 26013f24e4
commit f280645ca2
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/web/proxy/js/lib/proxy.js
+11 -3
View File
@@ -95,10 +95,15 @@ DynamicProxy.prototype.handleProxyRequest = function(req, res) {
this.rewriteRequest(req);
res.oldWriteHead = res.writeHead;
res.writeHead = function(statusCode, headers) {
try {
res.setHeader('Access-Control-Allow-Origin', origin);
if(origin){
res.setHeader('Access-Control-Allow-Origin', origin);
}
res.setHeader('Access-Control-Allow-Credentials', 'true');
if(!headers){
headers = {};
}
res.oldWriteHead(statusCode, headers);
}
catch (error) {
@@ -128,8 +133,11 @@ DynamicProxy.prototype.handleWs = function(req, res, head) {
res.oldWriteHead = res.writeHead;
res.writeHead = function(statusCode, headers) {
try {
res.setHeader('Access-Control-Allow-Origin', origin);
if(origin){
res.setHeader('Access-Control-Allow-Origin', origin);
}
res.setHeader('Access-Control-Allow-Credentials', 'true');
if(!headers){ headers = {}; }
res.oldWriteHead(statusCode, headers);
}
catch (error) {