external/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-02-12 19:11:51 +00:00
Code Issues Releases Wiki Activity

Improved agent upload and download events.

Browse source
This commit is contained in:
Ylian Saint-Hilaire 2021-01-24 22:46:54 -08:00
parent aa01c671a9
commit d849d6cd07
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
agents/meshcore.js
View file

@ -1496,7 +1496,7 @@ function onTunnelClosed() {
*/ */
// If there is a upload or download active on this connection, close the file // If there is a upload or download active on this connection, close the file
if (this.httprequest.uploadFile) { fs.closeSync(this.httprequest.uploadFile); delete this.httprequest.uploadFile; delete this.httprequest.uploadFileid; delete this.httprequest.uploadFilePath; } if (this.httprequest.uploadFile) { fs.closeSync(this.httprequest.uploadFile); delete this.httprequest.uploadFile; delete this.httprequest.uploadFileid; delete this.httprequest.uploadFilePath; delete this.httprequest.uploadFileSize; }
if (this.httprequest.downloadFile) { delete this.httprequest.downloadFile; } if (this.httprequest.downloadFile) { delete this.httprequest.downloadFile; }
// Clean up WebRTC // Clean up WebRTC
@ -1523,9 +1523,11 @@ function onTunnelData(data) {
// Save the data to file being uploaded. // Save the data to file being uploaded.
if (data[0] == 0) { if (data[0] == 0) {
// If data starts with zero, skip the first byte. This is used to escape binary file data from JSON. // If data starts with zero, skip the first byte. This is used to escape binary file data from JSON.
this.httprequest.uploadFileSize += (data.length - 1);
try { fs.writeSync(this.httprequest.uploadFile, data, 1, data.length - 1); } catch (e) { sendConsoleText('FileUpload Error'); this.write(Buffer.from(JSON.stringify({ action: 'uploaderror' }))); return; } // Write to the file, if there is a problem, error out. try { fs.writeSync(this.httprequest.uploadFile, data, 1, data.length - 1); } catch (e) { sendConsoleText('FileUpload Error'); this.write(Buffer.from(JSON.stringify({ action: 'uploaderror' }))); return; } // Write to the file, if there is a problem, error out.
} else { } else {
// If data does not start with zero, save as-is. // If data does not start with zero, save as-is.
this.httprequest.uploadFileSize += data.length;
try { fs.writeSync(this.httprequest.uploadFile, data); } catch (e) { sendConsoleText('FileUpload Error'); this.write(Buffer.from(JSON.stringify({ action: 'uploaderror' }))); return; } // Write to the file, if there is a problem, error out. try { fs.writeSync(this.httprequest.uploadFile, data); } catch (e) { sendConsoleText('FileUpload Error'); this.write(Buffer.from(JSON.stringify({ action: 'uploaderror' }))); return; } // Write to the file, if there is a problem, error out.
} }
this.write(Buffer.from(JSON.stringify({ action: 'uploadack', reqid: this.httprequest.uploadFileid }))); // Ask for more data. this.write(Buffer.from(JSON.stringify({ action: 'uploadack', reqid: this.httprequest.uploadFileid }))); // Ask for more data.
@ -1552,6 +1554,7 @@ function onTunnelData(data) {
try { stats = require('fs').statSync(this.httprequest.xoptions.file) } catch (e) { } try { stats = require('fs').statSync(this.httprequest.xoptions.file) } catch (e) { }
try { if (stats) { this.httprequest.downloadFile = fs.createReadStream(this.httprequest.xoptions.file, { flags: 'rbN' }); } } catch (e) { } try { if (stats) { this.httprequest.downloadFile = fs.createReadStream(this.httprequest.xoptions.file, { flags: 'rbN' }); } } catch (e) { }
if (this.httprequest.downloadFile) { if (this.httprequest.downloadFile) {
MeshServerLogEx(106, [this.httprequest.xoptions.file, stats.size], 'Download: \"' + this.httprequest.xoptions.file + '\", Size: ' + stats.size, this.httprequest);
//sendConsoleText('BasicFileTransfer, ok, ' + this.httprequest.xoptions.file + ', ' + JSON.stringify(stats)); //sendConsoleText('BasicFileTransfer, ok, ' + this.httprequest.xoptions.file + ', ' + JSON.stringify(stats));
this.write(JSON.stringify({ op: 'ok', size: stats.size })); this.write(JSON.stringify({ op: 'ok', size: stats.size }));
this.httprequest.downloadFile.pipe(this); this.httprequest.downloadFile.pipe(this);
@ -2292,7 +2295,7 @@ function onTunnelData(data) {
if (cmd.path == undefined) break; if (cmd.path == undefined) break;
var filepath = cmd.name ? obj.path.join(cmd.path, cmd.name) : cmd.path; var filepath = cmd.name ? obj.path.join(cmd.path, cmd.name) : cmd.path;
this.httprequest.uploadFilePath = filepath; this.httprequest.uploadFilePath = filepath;
MeshServerLogEx(50, [filepath], 'Upload: \"' + filepath + '\"', this.httprequest); this.httprequest.uploadFileSize = 0;
try { this.httprequest.uploadFile = fs.openSync(filepath, 'wbN'); } catch (e) { this.write(Buffer.from(JSON.stringify({ action: 'uploaderror', reqid: cmd.reqid }))); break; } try { this.httprequest.uploadFile = fs.openSync(filepath, 'wbN'); } catch (e) { this.write(Buffer.from(JSON.stringify({ action: 'uploaderror', reqid: cmd.reqid }))); break; }
this.httprequest.uploadFileid = cmd.reqid; this.httprequest.uploadFileid = cmd.reqid;
if (this.httprequest.uploadFile) { this.write(Buffer.from(JSON.stringify({ action: 'uploadstart', reqid: this.httprequest.uploadFileid }))); } if (this.httprequest.uploadFile) { this.write(Buffer.from(JSON.stringify({ action: 'uploadstart', reqid: this.httprequest.uploadFileid }))); }
@ -2302,11 +2305,13 @@ function onTunnelData(data) {
{ {
// Indicates that an upload is done // Indicates that an upload is done
if (this.httprequest.uploadFile) { if (this.httprequest.uploadFile) {
MeshServerLogEx(105, [this.httprequest.uploadFilePath, this.httprequest.uploadFileSize], 'Upload: \"' + this.httprequest.uploadFilePath + '\", Size: ' + this.httprequest.uploadFileSize, this.httprequest);
fs.closeSync(this.httprequest.uploadFile); fs.closeSync(this.httprequest.uploadFile);
this.write(Buffer.from(JSON.stringify({ action: 'uploaddone', reqid: this.httprequest.uploadFileid }))); // Indicate that we closed the file. this.write(Buffer.from(JSON.stringify({ action: 'uploaddone', reqid: this.httprequest.uploadFileid }))); // Indicate that we closed the file.
delete this.httprequest.uploadFile; delete this.httprequest.uploadFile;
delete this.httprequest.uploadFileid; delete this.httprequest.uploadFileid;
delete this.httprequest.uploadFilePath; delete this.httprequest.uploadFilePath;
delete this.httprequest.uploadFileSize;
} }
break; break;
} }
@ -2320,6 +2325,7 @@ function onTunnelData(data) {
delete this.httprequest.uploadFile; delete this.httprequest.uploadFile;
delete this.httprequest.uploadFileid; delete this.httprequest.uploadFileid;
delete this.httprequest.uploadFilePath; delete this.httprequest.uploadFilePath;
delete this.httprequest.uploadFileSize;
} }
break; break;
} }

4
views/default.handlebars
View file

@ -11364,7 +11364,9 @@
101: "Added device share {0} from {1} to {2}", 101: "Added device share {0} from {1} to {2}",
102: "Removed device share {0}", 102: "Removed device share {0}",
103: "Batch upload of {0} file(s) to folder {1}", 103: "Batch upload of {0} file(s) to folder {1}",
104: "Automated download of agent core dump file: \"{0}\"" 104: "Automated download of agent core dump file: \"{0}\"",
105: "Upload: \"{0}\", Size: {1}",
106: "Download: \"{0}\", Size: {1}"
}; };
// Highlights the device being hovered // Highlights the device being hovered