MyFavMirrors/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2024-12-31 17:43:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5393 from Abarna512/patch-1

Browse Source 
Disconnect desktop session from User-side using Privacy bar.
This commit is contained in:
Ylian Saint-Hilaire 2023-10-06 12:04:18 -07:00 committed by GitHub
commit 932584982c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
agents/meshcore.js
View File

@ -2565,27 +2565,24 @@ function kvm_consentpromise_resolved(always)
MeshServerLogEx(32, null, "Remote Desktop Connection Bar Failed or Not Supported (" + this.ws.httprequest.remoteaddr + ")", this.ws.httprequest); MeshServerLogEx(32, null, "Remote Desktop Connection Bar Failed or Not Supported (" + this.ws.httprequest.remoteaddr + ")", this.ws.httprequest);
} }
} }
if (this.ws.httprequest.desktop.kvm.connectionBar) try {
if (this.ws.httprequest.desktop.kvm.connectionBar) {
this.ws.httprequest.desktop.kvm.connectionBar.httprequest = this.ws.httprequest;
this.ws.httprequest.desktop.kvm.connectionBar.on('close', function () {
MeshServerLogEx(29, null, "Remote Desktop Connection forcefully closed by local user (" + this.httprequest.remoteaddr + ")", this.httprequest);
for (var i in this.httprequest.desktop.kvm._pipedStreams) {
this.httprequest.desktop.kvm._pipedStreams[i].end();
}
this.httprequest.desktop.kvm.end();
});
}
}
catch (ex)
{ {
this.ws.httprequest.desktop.kvm.connectionBar.state = if (process.platform != 'darwin')
{ {
userid: this.ws.httprequest.userid, MeshServerLogEx(32, null, "Failed2(" + this.ws.httprequest.remoteaddr + ")", this.ws.httprequest);
xuserid: this.ws.httprequest.xuserid, }
username: this.ws.httprequest.username,
sessionid: this.ws.httprequest.sessionid,
remoteaddr: this.ws.httprequest.remoteaddr,
guestname: this.ws.httprequest.guestname,
desktop: this.ws.httprequest.desktop
};
this.ws.httprequest.desktop.kvm.connectionBar.on('close', function ()
{
MeshServerLogEx(29, null, "Remote Desktop Connection forcefully closed by local user (" + this.state.remoteaddr + ")", state);
for (var i in this.state.desktop.kvm._pipedStreams)
{
this.state.desktop.kvm._pipedStreams[i].end();
}
this.state.desktop.kvm.end();
});
} }
} }
this.ws.httprequest.desktop.kvm.pipe(this.ws, { dataTypeSkip: 1 }); this.ws.httprequest.desktop.kvm.pipe(this.ws, { dataTypeSkip: 1 });