seg_yinzy
/
che-server
mirror of https://github.com/eclipse-che/che-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

loader.html fixes for correct reridectUrl validation

6.19.x
Max Shaposhnik 2018-08-02 16:05:12 +03:00 committed by GitHub
parent 60da580c92
commit 5446e00792
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ide/che-ide-gwt-app/src/main/resources/org/eclipse/che/ide/public/loader.html
View File

@ -172,7 +172,19 @@
return;
}
const server = workspace.runtime.links.find(link => redirectUrl.startsWith(link));
var machines = Object.keys(workspace.runtime.machines)
.map(machineName => workspace.runtime.machines[machineName]);
var servers = machines.map(machine => {
const servers = Object.keys(machine.servers)
.map(serverName => machine.servers[serverName]);
return servers;
}).reduce((servers, machineServers) => {
return servers.concat(...machineServers);
}, []);
var server = servers.find(_server => {
return _server.url && redirectUrl.startsWith( _server.url);
});
if (server) {
resolve(server);
} else {