Partial SSH file support for local device group.
This commit is contained in:
Ylian Saint-Hilaire
parent
cb3398e1a7
commit
ded4d61f85
340
apprelays.js
340
apprelays.js
|
|
@ -294,7 +294,6 @@ module.exports.CreateSshRelay = function (parent, db, ws, req, args, domain) {
|
|||
// When data is received from the web socket
|
||||
// SSH default port is 22
|
||||
ws.on('message', function (msg) {
|
||||
console.log('message', msg);
|
||||
try {
|
||||
if (typeof msg != 'string') return;
|
||||
if (msg[0] == '{') {
|
||||
|
|
@ -592,3 +591,342 @@ module.exports.CreateSshTerminalRelay = function (parent, db, ws, req, domain, u
|
|||
|
||||
return obj;
|
||||
};
|
||||
|
||||
|
||||
|
||||
// Construct a SSH Files Relay object, called upon connection
|
||||
module.exports.CreateSshFilesRelay = function (parent, db, ws, req, domain, user, cookie, args) {
|
||||
const Net = require('net');
|
||||
const WebSocket = require('ws');
|
||||
|
||||
// SerialTunnel object is used to embed SSH within another connection.
|
||||
function SerialTunnel(options) {
|
||||
var obj = new require('stream').Duplex(options);
|
||||
obj.forwardwrite = null;
|
||||
obj.updateBuffer = function (chunk) { this.push(chunk); };
|
||||
obj._write = function (chunk, encoding, callback) { if (obj.forwardwrite != null) { obj.forwardwrite(chunk); } if (callback) callback(); }; // Pass data written to forward
|
||||
obj._read = function (size) { }; // Push nothing, anything to read should be pushed from updateBuffer()
|
||||
obj.destroy = function () { delete obj.forwardwrite; }
|
||||
return obj;
|
||||
}
|
||||
|
||||
const obj = {};
|
||||
obj.ws = ws;
|
||||
obj.path = require('path');
|
||||
obj.relayActive = false;
|
||||
obj.firstMessage = true;
|
||||
|
||||
parent.parent.debug('relay', 'SSH: Request for SSH files relay (' + req.clientIp + ')');
|
||||
|
||||
// Disconnect
|
||||
obj.close = function (arg) {
|
||||
if (obj.ws == null) return;
|
||||
|
||||
// Collect how many raw bytes where received and sent.
|
||||
// We sum both the websocket and TCP client in this case.
|
||||
//var inTraffc = obj.ws._socket.bytesRead, outTraffc = obj.ws._socket.bytesWritten;
|
||||
//if (obj.wsClient != null) { inTraffc += obj.wsClient._socket.bytesRead; outTraffc += obj.wsClient._socket.bytesWritten; }
|
||||
//console.log('WinSSH - in', inTraffc, 'out', outTraffc);
|
||||
|
||||
if (obj.sshClient) {
|
||||
obj.sshClient.destroy();
|
||||
obj.sshClient.removeAllListeners('ready');
|
||||
try { obj.sshClient.end(); } catch (ex) { console.log(ex); }
|
||||
delete obj.sshClient;
|
||||
}
|
||||
if (obj.wsClient) {
|
||||
obj.wsClient.removeAllListeners('open');
|
||||
obj.wsClient.removeAllListeners('message');
|
||||
obj.wsClient.removeAllListeners('close');
|
||||
try { obj.wsClient.close(); } catch (ex) { console.log(ex); }
|
||||
delete obj.wsClient;
|
||||
}
|
||||
|
||||
if ((arg == 1) || (arg == null)) { try { ws.close(); } catch (ex) { console.log(ex); } } // Soft close, close the websocket
|
||||
if (arg == 2) { try { ws._socket._parent.end(); } catch (ex) { console.log(ex); } } // Hard close, close the TCP socket
|
||||
obj.ws.removeAllListeners();
|
||||
|
||||
obj.relayActive = false;
|
||||
delete obj.cookie;
|
||||
delete obj.sftp;
|
||||
delete obj.ws;
|
||||
};
|
||||
|
||||
// Save SSH credentials into device
|
||||
function saveSshCredentials() {
|
||||
parent.parent.db.Get(obj.nodeid, function (err, nodes) {
|
||||
if ((err != null) || (nodes == null) || (nodes.length != 1)) return;
|
||||
const node = nodes[0];
|
||||
const changed = (node.ssh == null);
|
||||
|
||||
// Save the credentials
|
||||
node.ssh = { u: obj.username, p: obj.password };
|
||||
parent.parent.db.Set(node);
|
||||
|
||||
// Event node change if needed
|
||||
if (changed) {
|
||||
// Event the node change
|
||||
var event = { etype: 'node', action: 'changenode', nodeid: obj.nodeid, domain: domain.id, userid: user._id, username: user.name, node: parent.CloneSafeNode(node), msg: "Changed SSH credentials" };
|
||||
if (parent.parent.db.changeStream) { event.noact = 1; } // If DB change stream is active, don't use this event to change the node. Another event will come.
|
||||
parent.parent.DispatchEvent(parent.CreateMeshDispatchTargets(node.meshid, [obj.nodeid]), obj, event);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// Start the looppback server
|
||||
function startRelayConnection(authCookie) {
|
||||
try {
|
||||
// Setup the correct URL with domain and use TLS only if needed.
|
||||
var options = { rejectUnauthorized: false };
|
||||
if (domain.dns != null) { options.servername = domain.dns; }
|
||||
var protocol = 'wss';
|
||||
if (args.tlsoffload) { protocol = 'ws'; }
|
||||
var domainadd = '';
|
||||
if ((domain.dns == null) && (domain.id != '')) { domainadd = domain.id + '/' }
|
||||
var url = protocol + '://127.0.0.1:' + args.port + '/' + domainadd + ((obj.mtype == 3) ? 'local' : 'mesh') + 'relay.ashx?noping=1&p=11&auth=' + authCookie // Protocol 11 is Web-SSH
|
||||
parent.parent.debug('relay', 'SSH: Connection websocket to ' + url);
|
||||
obj.wsClient = new WebSocket(url, options);
|
||||
obj.wsClient.on('open', function () { parent.parent.debug('relay', 'SSH: Relay websocket open'); });
|
||||
obj.wsClient.on('message', function (data) { // Make sure to handle flow control.
|
||||
if ((obj.relayActive == false) && (data == 'c')) {
|
||||
obj.relayActive = true;
|
||||
|
||||
// Create a serial tunnel && SSH module
|
||||
obj.ser = new SerialTunnel();
|
||||
const Client = require('ssh2').Client;
|
||||
obj.sshClient = new Client();
|
||||
obj.sshClient.on('ready', function () { // Authentication was successful.
|
||||
// If requested, save the credentials
|
||||
if (obj.keep === true) saveSshCredentials();
|
||||
obj.sshClient.sftp(function(err, sftp) {
|
||||
if (err) { obj.close(); return; }
|
||||
obj.sftp = sftp;
|
||||
obj.ws.send('c');
|
||||
});
|
||||
});
|
||||
obj.sshClient.on('error', function (err) {
|
||||
if (err.level == 'client-authentication') { try { obj.ws.send(JSON.stringify({ action: 'autherror' })); } catch (ex) { } }
|
||||
if (err.level == 'client-timeout') { try { obj.ws.send(JSON.stringify({ action: 'sessiontimeout' })); } catch (ex) { } }
|
||||
obj.close();
|
||||
});
|
||||
|
||||
// Setup the serial tunnel, SSH ---> Relay WS
|
||||
obj.ser.forwardwrite = function (data) { if ((data.length > 0) && (obj.wsClient != null)) { try { obj.wsClient.send(data); } catch (ex) { } } };
|
||||
|
||||
// Connect the SSH module to the serial tunnel
|
||||
var connectionOptions = { sock: obj.ser }
|
||||
if (typeof obj.username == 'string') { connectionOptions.username = obj.username; }
|
||||
if (typeof obj.password == 'string') { connectionOptions.password = obj.password; }
|
||||
obj.sshClient.connect(connectionOptions);
|
||||
|
||||
// We are all set, start receiving data
|
||||
ws._socket.resume();
|
||||
} else {
|
||||
// Relay WS --> SSH
|
||||
if ((data.length > 0) && (obj.ser != null)) { try { obj.ser.updateBuffer(data); } catch (ex) { console.log(ex); } }
|
||||
}
|
||||
});
|
||||
obj.wsClient.on('close', function () { parent.parent.debug('relay', 'SSH: Files relay websocket closed'); obj.close(); });
|
||||
obj.wsClient.on('error', function (err) { parent.parent.debug('relay', 'SSH: Files relay websocket error: ' + err); obj.close(); });
|
||||
} catch (ex) {
|
||||
console.log(ex);
|
||||
}
|
||||
}
|
||||
|
||||
// When data is received from the web socket
|
||||
// SSH default port is 22
|
||||
ws.on('message', function (msg) {
|
||||
if ((obj.firstMessage === true) && (msg != 5)) { obj.close(); return; } else { delete obj.firstMessage; }
|
||||
try {
|
||||
if (typeof msg != 'string') {
|
||||
if (msg[0] == 123) {
|
||||
msg = msg.toString();
|
||||
} else if ((obj.sftp != null) && (obj.uploadHandle != null)) {
|
||||
var off = (msg[0] == 0) ? 1 : 0;
|
||||
obj.sftp.write(obj.uploadHandle, msg, off, msg.length - off, obj.uploadPosition, function (err) {
|
||||
if (err != null) {
|
||||
obj.sftp.close(obj.uploadHandle, function () { });
|
||||
try { obj.ws.send(Buffer.from(JSON.stringify({ action: 'uploaddone', reqid: obj.uploadReqid }))) } catch (ex) { }
|
||||
delete obj.uploadHandle;
|
||||
delete obj.uploadFullpath;
|
||||
delete obj.uploadSize;
|
||||
delete obj.uploadReqid;
|
||||
delete obj.uploadPosition;
|
||||
} else {
|
||||
try { obj.ws.send(Buffer.from(JSON.stringify({ action: 'uploadack', reqid: obj.uploadReqid }))) } catch (ex) { }
|
||||
}
|
||||
});
|
||||
obj.uploadPosition += (msg.length - off);
|
||||
return;
|
||||
}
|
||||
}
|
||||
if (msg[0] == '{') {
|
||||
// Control data
|
||||
msg = JSON.parse(msg);
|
||||
if (typeof msg.action != 'string') return;
|
||||
switch (msg.action) {
|
||||
case 'ls': {
|
||||
if (obj.sftp == null) return;
|
||||
var requestedPath = msg.path;
|
||||
if (requestedPath.startsWith('/') == false) { requestedPath = '/' + requestedPath; }
|
||||
obj.sftp.readdir(requestedPath, function(err, list) {
|
||||
if (err) { console.log(err); obj.close(); }
|
||||
var r = { path: requestedPath, reqid: msg.reqid, dir: [] };
|
||||
for (var i in list) {
|
||||
var file = list[i];
|
||||
if (file.longname[0] == 'd') { r.dir.push({ t: 2, n: file.filename, d: new Date(file.attrs.mtime * 1000).toISOString() }); }
|
||||
else { r.dir.push({ t: 3, n: file.filename, d: new Date(file.attrs.mtime * 1000).toISOString(), s: file.attrs.size }); }
|
||||
}
|
||||
try { obj.ws.send(Buffer.from(JSON.stringify(r))) } catch (ex) { }
|
||||
});
|
||||
break;
|
||||
}
|
||||
case 'mkdir': {
|
||||
if (obj.sftp == null) return;
|
||||
var requestedPath = msg.path;
|
||||
if (requestedPath.startsWith('/') == false) { requestedPath = '/' + requestedPath; }
|
||||
obj.sftp.mkdir(requestedPath, function (err) { console.log(err); });
|
||||
break;
|
||||
}
|
||||
case 'rm': {
|
||||
if (obj.sftp == null) return;
|
||||
var requestedPath = msg.path;
|
||||
if (requestedPath.startsWith('/') == false) { requestedPath = '/' + requestedPath; }
|
||||
for (var i in msg.delfiles) {
|
||||
const ul = obj.path.join(requestedPath, msg.delfiles[i]).split('\\').join('/');
|
||||
obj.sftp.unlink(ul, function (err) { });
|
||||
if (msg.rec === true) { obj.sftp.rmdir(ul + '/', function (err) { }); }
|
||||
}
|
||||
break;
|
||||
}
|
||||
case 'rename': {
|
||||
if (obj.sftp == null) return;
|
||||
var requestedPath = msg.path;
|
||||
if (requestedPath.startsWith('/') == false) { requestedPath = '/' + requestedPath; }
|
||||
const oldpath = obj.path.join(requestedPath, msg.oldname).split('\\').join('/');
|
||||
const newpath = obj.path.join(requestedPath, msg.newname).split('\\').join('/');
|
||||
obj.sftp.rename(oldpath, newpath, function (err) { });
|
||||
break;
|
||||
}
|
||||
case 'upload': {
|
||||
if (obj.sftp == null) return;
|
||||
var requestedPath = msg.path;
|
||||
if (requestedPath.startsWith('/') == false) { requestedPath = '/' + requestedPath; }
|
||||
obj.uploadFullpath = obj.path.join(requestedPath, msg.name).split('\\').join('/');
|
||||
obj.uploadSize = msg.size;
|
||||
obj.uploadReqid = msg.reqid;
|
||||
obj.uploadPosition = 0;
|
||||
obj.sftp.open(obj.uploadFullpath, 'w', 0o666, function (err, handle) {
|
||||
if (err != null) {
|
||||
try { obj.ws.send(Buffer.from(JSON.stringify({ action: 'uploaderror', reqid: obj.uploadReqid }))) } catch (ex) { }
|
||||
} else {
|
||||
obj.uploadHandle = handle;
|
||||
try { obj.ws.send(Buffer.from(JSON.stringify({ action: 'uploadstart', reqid: obj.uploadReqid }))) } catch (ex) { }
|
||||
}
|
||||
|
||||
});
|
||||
break;
|
||||
}
|
||||
case 'uploaddone': {
|
||||
if (obj.sftp == null) return;
|
||||
if (obj.uploadHandle != null) {
|
||||
obj.sftp.close(obj.uploadHandle, function () { });
|
||||
try { obj.ws.send(Buffer.from(JSON.stringify({ action: 'uploaddone', reqid: obj.uploadReqid }))) } catch (ex) { }
|
||||
delete obj.uploadHandle;
|
||||
delete obj.uploadFullpath;
|
||||
delete obj.uploadSize;
|
||||
delete obj.uploadReqid;
|
||||
delete obj.uploadPosition;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case 'uploadcancel': {
|
||||
if (obj.sftp == null) return;
|
||||
if (obj.uploadHandle != null) {
|
||||
obj.sftp.close(obj.uploadHandle, function () { });
|
||||
obj.sftp.unlink(obj.uploadFullpath, function (err) { });
|
||||
try { obj.ws.send(Buffer.from(JSON.stringify({ action: 'uploadcancel', reqid: obj.uploadReqid }))) } catch (ex) { }
|
||||
delete obj.uploadHandle;
|
||||
delete obj.uploadFullpath;
|
||||
delete obj.uploadSize;
|
||||
delete obj.uploadReqid;
|
||||
delete obj.uploadPosition;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case 'sshauth': {
|
||||
if (obj.sshClient != null) return;
|
||||
|
||||
// Verify inputs
|
||||
if ((typeof msg.username != 'string') || (typeof msg.password != 'string')) break;
|
||||
if ((typeof msg.rows != 'number') || (typeof msg.cols != 'number') || (typeof msg.height != 'number') || (typeof msg.width != 'number')) break;
|
||||
|
||||
obj.keep = msg.keep; // If true, keep store credentials on the server if the SSH tunnel connected succesfully.
|
||||
obj.username = msg.username;
|
||||
obj.password = msg.password;
|
||||
|
||||
// Create a mesh relay authentication cookie
|
||||
var cookieContent = { userid: user._id, domainid: user.domain, nodeid: obj.nodeid, tcpport: obj.tcpport };
|
||||
if (obj.mtype == 3) { cookieContent.lc = 1; } // This is a local device
|
||||
startRelayConnection(parent.parent.encodeCookie(cookieContent, parent.parent.loginCookieEncryptionKey));
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (ex) { console.log(ex); obj.close(); }
|
||||
});
|
||||
|
||||
// If error, do nothing
|
||||
ws.on('error', function (err) { parent.parent.debug('relay', 'SSH: Browser websocket error: ' + err); obj.close(); });
|
||||
|
||||
// If the web socket is closed
|
||||
ws.on('close', function (req) { parent.parent.debug('relay', 'SSH: Browser websocket closed'); obj.close(); });
|
||||
|
||||
// Decode the authentication cookie
|
||||
var userCookie = parent.parent.decodeCookie(req.query.auth, parent.parent.loginCookieEncryptionKey);
|
||||
if ((userCookie == null) || (userCookie.a != null)) { obj.close(); return; } // Invalid cookie
|
||||
|
||||
// Fetch the user
|
||||
var user = parent.users[userCookie.userid]
|
||||
if (user == null) { obj.close(); return; } // Invalid userid
|
||||
|
||||
// Check that we have a nodeid
|
||||
if (req.query.nodeid == null) { obj.close(); return; } // Invalid nodeid
|
||||
parent.GetNodeWithRights(domain, user, req.query.nodeid, function (node, rights, visible) {
|
||||
// Check permissions
|
||||
if ((rights & 8) == 0) { obj.close(); return; } // No MESHRIGHT_REMOTECONTROL rights
|
||||
if ((rights != 0xFFFFFFFF) && (rights & 0x00000200)) { obj.close(); return; } // MESHRIGHT_NOTERMINAL is set
|
||||
obj.mtype = node.mtype; // Store the device group type
|
||||
obj.nodeid = node._id; // Store the NodeID
|
||||
|
||||
// Check the SSH port
|
||||
obj.tcpport = 22;
|
||||
if (typeof node.sshport == 'number') { obj.tcpport = node.sshport; }
|
||||
|
||||
// We are all set, start receiving data
|
||||
ws._socket.resume();
|
||||
|
||||
// Check if we have SSH credentials for this device
|
||||
parent.parent.db.Get(obj.nodeid, function (err, nodes) {
|
||||
if ((err != null) || (nodes == null) || (nodes.length != 1)) return;
|
||||
const node = nodes[0];
|
||||
|
||||
if ((node.ssh == null) || (typeof node.ssh != 'object') || (typeof node.ssh.u != 'string') || (typeof node.ssh.p != 'string')) {
|
||||
// Send a request for SSH authentication
|
||||
try { ws.send(JSON.stringify({ action: 'sshauth' })) } catch (ex) { }
|
||||
} else {
|
||||
// Use our existing credentials
|
||||
obj.username = node.ssh.u;
|
||||
obj.password = node.ssh.p;
|
||||
|
||||
// Create a mesh relay authentication cookie
|
||||
var cookieContent = { userid: user._id, domainid: user.domain, nodeid: obj.nodeid, tcpport: obj.tcpport };
|
||||
if (obj.mtype == 3) { cookieContent.lc = 1; } // This is a local device
|
||||
startRelayConnection(parent.parent.encodeCookie(cookieContent, parent.parent.loginCookieEncryptionKey));
|
||||
}
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
return obj;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -604,7 +604,7 @@
|
|||
<span id=connectbutton1span><input type=button id=connectbutton1 cmenu="deskConnectButton" value="Connect" onclick=connectDesktop(event,3) onkeypress="return false" onkeydown="return false" disabled="disabled" /></span>
|
||||
<span id=connectbutton1hspan> <input type=button id=connectbutton1h value="HW Connect" title="Connect using Intel® AMT hardware KVM" onclick=connectDesktop(event,2) onkeypress="return false" onkeydown="return false" disabled="disabled" /></span>
|
||||
<span id=disconnectbutton1span> <input type=button id=disconnectbutton1 value="Disconnect" onclick=connectDesktop(event,0) onkeypress="return false" onkeydown="return false" /></span>
|
||||
<span id="deskstatus" style="line-height:22px">Disconnected</span><span id="deskmetadata"></span>
|
||||
<span id="deskstatus" style="line-height:22px">Disconnected</span><span id="deskmetadata"></span>
|
||||
</div>
|
||||
</div>
|
||||
<div id=deskarea2 style="">
|
||||
|
|
@ -701,7 +701,7 @@
|
|||
<span id="connectbutton2span"><input type="button" id="connectbutton2" cmenu="termConnectButton" value="Connect" onclick=connectTerminal(event,1) onkeypress="return false" onkeydown="return false" disabled="disabled" /></span>
|
||||
<span id="connectbutton2hspan"> <input type="button" id="connectbutton2h" value="HW Connect" title="Connect using Intel® AMT hardware KVM" onclick=connectTerminal(event,2) onkeypress="return false" onkeydown="return false" disabled="disabled" /></span>
|
||||
<span id="disconnectbutton2span"> <input type="button" id="disconnectbutton2" value="Disconnect" onclick=connectTerminal(event,0) onkeypress="return false" onkeydown="return false" /></span>
|
||||
<span id="termstatus" style="line-height:22px">Disconnected</span><span id="termtitle"></span>
|
||||
<span id="termstatus" style="line-height:22px">Disconnected</span><span id="termtitle"></span>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
|
|
@ -754,10 +754,11 @@
|
|||
</div>
|
||||
<table id="p13toolbar" cellpadding="0" cellspacing="0">
|
||||
<tr>
|
||||
<td class="areaHead">
|
||||
<td class="areaHead" style="line-height:24px">
|
||||
<div class="toright2">
|
||||
<input id="filesActionsBtn" type=button title="Perform power actions on the device" value=Actions onclick=deviceActionFunction() />
|
||||
<div id="filesRecordIcon" class='deskareaicon' title="Server is recording this session" style="display:none;background-color:red;width:12px;height:12px;border-radius:6px;margin-top:5px;margin-left:5px"></div>
|
||||
<div id="filesCustomUpperRight" style="float:left;margin-right:6px"></div>
|
||||
<div id="filesCustomUiButtons" style="float:left"></div>
|
||||
</div>
|
||||
<div>
|
||||
|
|
@ -771,19 +772,19 @@
|
|||
<td class="areaHead2" valign=bottom>
|
||||
<div id="p13rightOfButtons" class="toright2"></div>
|
||||
<div>
|
||||
<input type=button id=p13FolderUp disabled="disabled" onclick="p13folderup()" value="Up" />
|
||||
<input type=button id=p13SelectAllButton disabled="disabled" onclick="p13selectallfile()" value="Select All" />
|
||||
<input type=button id=p13RenameFileButton disabled="disabled" value="Rename" onclick="p13renamefile()" />
|
||||
<input type=button id=p13DeleteFileButton disabled="disabled" value="Delete" onclick="p13deletefile()" />
|
||||
<input type=button id=p13ViewFileButton disabled="disabled" value="Edit" onclick="p13viewfile()" />
|
||||
<input type=button id=p13NewFolderButton disabled="disabled" value="New Folder" onclick="p13createfolder()" />
|
||||
<input type=button id=p13UploadButton disabled="disabled" value="Upload" onclick="p13uploadFile()" />
|
||||
<input type=button id=p13CutButton disabled="disabled" value="Cut" onclick="p13copyFile(1)" />
|
||||
<input type=button id=p13CopyButton disabled="disabled" value="Copy" onclick="p13copyFile(0)" />
|
||||
<input type=button id=p13PasteButton disabled="disabled" value="Paste" onclick="p13pasteFile()" />
|
||||
<input type=button id=p13ZipButton disabled="disabled" value="Zip" onclick="p13zipFiles()" />
|
||||
<input type=button id=p13RefreshButton disabled="disabled" value="Refresh" onclick="p13folderup(9999)" />
|
||||
<input type=button id=p13FindButton disabled="disabled" value="Find" onclick="p13findfile()" />
|
||||
<input type=button style="margin-right:2px" disabled="disabled" id=p13FolderUp value="Up" onclick="p13folderup()" />
|
||||
<input type=button style="margin-right:2px" disabled="disabled" id=p13SelectAllButton value="Select All" onclick="p13selectallfile()" />
|
||||
<input type=button style="margin-right:2px" disabled="disabled" id=p13RenameFileButton value="Rename" onclick="p13renamefile()" />
|
||||
<input type=button style="margin-right:2px" disabled="disabled" id=p13DeleteFileButton value="Delete" onclick="p13deletefile()" />
|
||||
<input type=button style="margin-right:2px" disabled="disabled" id=p13ViewFileButton value="Edit" onclick="p13viewfile()" />
|
||||
<input type=button style="margin-right:2px" disabled="disabled" id=p13NewFolderButton value="New Folder" onclick="p13createfolder()" />
|
||||
<input type=button style="margin-right:2px" disabled="disabled" id=p13UploadButton value="Upload" onclick="p13uploadFile()" />
|
||||
<input type=button style="margin-right:2px" disabled="disabled" id=p13CutButton value="Cut" onclick="p13copyFile(1)" />
|
||||
<input type=button style="margin-right:2px" disabled="disabled" id=p13CopyButton value="Copy" onclick="p13copyFile(0)" />
|
||||
<input type=button style="margin-right:2px" disabled="disabled" id=p13PasteButton value="Paste" onclick="p13pasteFile()" />
|
||||
<input type=button style="margin-right:2px" disabled="disabled" id=p13ZipButton value="Zip" onclick="p13zipFiles()" />
|
||||
<input type=button style="margin-right:2px" disabled="disabled" id=p13RefreshButton value="Refresh" onclick="p13folderup(9999)" />
|
||||
<input type=button style="margin-right:2px" disabled="disabled" id=p13FindButton value="Find" onclick="p13findfile()" />
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
|
|
@ -6569,7 +6570,7 @@
|
|||
Q('MainComputerImage').className = ((((!node.conn) || (node.conn == 0)) && (node.mtype != 3))?'gray':'');
|
||||
|
||||
// If we are looking at a local non-windows device, enable terminal capability.
|
||||
if ((node.mtype == 3) && (node.agent != null) && (node.agent.id > 4) && (features2 & 0x00000200)) { node.agent.caps = 2; }
|
||||
if ((node.mtype == 3) && (node.agent != null) && (node.agent.id > 4) && (features2 & 0x00000200)) { node.agent.caps = 6; } // 1 = Terminal, 2 = Desktop, 4 = files
|
||||
|
||||
// Setup/Refresh the desktop tab
|
||||
if (terminalAccess) { setupTerminal(); }
|
||||
|
|
@ -6596,7 +6597,7 @@
|
|||
// Setup/Refresh Intel AMT tab
|
||||
var amtFrameNode = Q('p14iframe').contentWindow.getCurrentMeshNode();
|
||||
if ((amtFrameNode != null) && (amtFrameNode._id != currentNode._id)) { Q('p14iframe').contentWindow.disconnect(); }
|
||||
var online = ((node.conn & 6) != 0)?true:false; // If CIRA (2) or AMT (4) connected, enable Commander
|
||||
var online = ((node.conn & 6) != 0); // If CIRA (2) or AMT (4) connected, enable Commander
|
||||
Q('p14iframe').contentWindow.setConnectionState(online);
|
||||
Q('p14iframe').contentWindow.setFrameHeight('650px');
|
||||
Q('p14iframe').contentWindow.setAuthCallback(updateAmtCredentials);
|
||||
|
|
@ -8586,7 +8587,7 @@
|
|||
var termState = ((terminal != null) && (terminal.state != 0));
|
||||
|
||||
// If we are looking at a local non-windows device, enable terminal capability.
|
||||
if ((terminalNode.mtype == 3) && (terminalNode.agent != null) && (terminalNode.agent.id > 4) && (features2 & 0x00000200)) { terminalNode.agent.caps = 2; }
|
||||
if ((terminalNode.mtype == 3) && (terminalNode.agent != null) && (terminalNode.agent.id > 4) && (features2 & 0x00000200)) { terminalNode.agent.caps = 6; } // 1 = Terminal, 2 = Desktop, 4 = files
|
||||
|
||||
// Show the right buttons
|
||||
QV('disconnectbutton2span', (termState == true));
|
||||
|
|
@ -8944,9 +8945,10 @@
|
|||
// Setup the files tab
|
||||
var samenode = (filesNode == currentNode);
|
||||
filesNode = currentNode;
|
||||
var online = ((filesNode.conn & 1) != 0)?true:false; // If Agent (1) connected, enable Terminal
|
||||
var online = ((filesNode.conn & 1) != 0) || (filesNode.mtype == 3); // If Agent (1) connected, enable Terminal
|
||||
QE('p13Connect', online);
|
||||
if (((samenode == false) || (online == false)) && files) { files.Stop(); files = null; }
|
||||
p13setActions();
|
||||
}
|
||||
|
||||
function onFilesStateChange(xfiles, state) {
|
||||
|
|
@ -8997,6 +8999,7 @@
|
|||
if (!files) {
|
||||
// Setup a mesh agent files
|
||||
files = CreateAgentRedirect(meshserver, CreateRemoteFiles(p13gotFiles), serverPublicNamePort, authCookie, authRelayCookie, domainUrl);
|
||||
if (filesNode.mtype == 3) { files.urlname = 'sshfilesrelay.ashx'; } // If this is a SSH session, change the URL to the SSH application relay.
|
||||
files.attemptWebRTC = attemptWebRTC;
|
||||
files.onStateChanged = onFilesStateChange;
|
||||
files.onConsoleMessageChange = function () {
|
||||
|
|
@ -9249,6 +9252,17 @@
|
|||
QE('p13ZipButton', advancedFeatures && (cc > 0) && ((p13filetreelocation.length > 0) || (winAgent == false)));
|
||||
QE('p13PasteButton', advancedFeatures && ((p13filetreelocation.length > 0) || (winAgent == false)) && ((p13clipboard != null) && (p13clipboard.length > 0)));
|
||||
}
|
||||
if (filesNode.mtype != 3) {
|
||||
QH('filesCustomUpperRight', '');
|
||||
} else {
|
||||
QH('filesCustomUpperRight', '<a onclick=cmsshportaction(1,event)>' + format("SSH Port {0}", (filesNode.sshport?filesNode.sshport:22)) + '</a>');
|
||||
}
|
||||
QV('filesActionsBtn', filesNode.mtype != 3);
|
||||
QV('p13FindButton', filesNode.mtype != 3);
|
||||
QV('p13CutButton', filesNode.mtype != 3);
|
||||
QV('p13CopyButton', filesNode.mtype != 3);
|
||||
QV('p13ZipButton', filesNode.mtype != 3);
|
||||
QV('p13PasteButton', filesNode.mtype != 3);
|
||||
}
|
||||
|
||||
function p13getFileSelCount(includeDirs) { var cc = 0; var checkboxes = document.getElementsByName('fd'); for (var i = 0; i < checkboxes.length; i++) { if ((checkboxes[i].checked) && ((includeDirs != false) || (checkboxes[i].attributes.file.value == '3'))) cc++; } return cc; }
|
||||
|
|
|
|||
|
|
@ -5592,6 +5592,11 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
|
|||
require('./apprelays.js').CreateSshTerminalRelay(obj, obj.db, ws1, req1, domain, user, cookie, obj.args);
|
||||
});
|
||||
});
|
||||
obj.app.ws(url + 'sshfilesrelay.ashx', function (ws, req) {
|
||||
PerformWSSessionAuth(ws, req, true, function (ws1, req1, domain, user, cookie) {
|
||||
require('./apprelays.js').CreateSshFilesRelay(obj, obj.db, ws1, req1, domain, user, cookie, obj.args);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
// Setup firebase push only server
|
||||
|
|
|
|||
Loading…
Reference in New Issue