michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-03-20 16:50:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1766 from webmin/dev/dont-expose-socket-as-global-variable

Browse Source 
Fix not to expose active `socket` to a global scope
This commit is contained in:
Jamie Cameron
2022-10-27 13:06:36 -07:00
committed by GitHub
parent 3c5e065edc 5204bd1a1b
commit 989e15d4cd
1 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
xterm/index.cgi
View File

@@ -177,14 +177,29 @@ sleep(1);
my $url = "wss://".$ENV{'HTTP_HOST'}.$wspath;
my $term_script = <<EOF;
var term = new Terminal($termjs_opts{'Options'}),
termcont = document.getElementById('terminal'),
socket = new WebSocket('$url', 'binary'),
attachAddon = new AttachAddon.AttachAddon(socket);
termcont.focus();
term.loadAddon(attachAddon);
term.open(termcont);
term.focus();
(function() {
var socket = new WebSocket('$url', 'binary'),
termcont = document.getElementById('terminal'),
err_conn_cannot = 'Cannot connect to the socket $url',
err_conn_lost = 'Connection to the socket $url lost';
socket.onopen = function() {
var term = new Terminal($termjs_opts{'Options'}),
attachAddon = new AttachAddon.AttachAddon(this);
term.loadAddon(attachAddon);
term.open(termcont);
term.focus();
socket.send('clear\\r');
};
socket.onerror = function() {
termcont.innerHTML = '<tt style="color: \#ff0000">Error: ' +
err_conn_cannot + '</tt>';
};
socket.onclose = function() {
termcont.innerHTML = '<tt style="color: \#ff0000">Error: ' +
err_conn_lost + '</tt>';
};
})();
EOF
# Return inline script data depending on type