publicWagsHome/KasmVNC
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Log and send clipboard op ids

Browse Source
This commit is contained in:
Matthew McClaskey
2022-04-05 12:52:38 +00:00
parent 6e84e10317
commit b2e878e79e
10 changed files with 37 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
common/rfb/VNCSConnectionST.cxx
View File

@@ -367,17 +367,18 @@ char *percentEncode4(const uint16_t *str, const unsigned len) {
}
static void cliplog(const char *str, const int len, const int origlen,
const char *dir, const char *client) {
const char *dir, const char *client, const unsigned id) {
if (Server::DLP_ClipLog[0] == 'o')
return;
if (Server::DLP_ClipLog[0] == 'i') {
vlog.info("DLP: client %s: %s %u (%u requested) clipboard bytes", client, dir, len, origlen);
vlog.info("DLP: client %s: %s %u (%u requested) clipboard bytes, id %u", client, dir,
len, origlen, id);
} else {
// URL-encode it
char *enc = percentEncode(str, len);
vlog.info("DLP: client %s: %s %u (%u requested) clipboard bytes: '%s'",
client, dir, len, origlen, enc);
vlog.info("DLP: client %s: %s %u (%u requested) clipboard bytes, id %u: '%s'",
client, dir, len, origlen, id, enc);
free(enc);
}
}
@@ -439,7 +440,8 @@ void VNCSConnectionST::clearBinaryClipboardData()
void VNCSConnectionST::sendBinaryClipboardDataOrClose(const char* mime,
const unsigned char *data,
const unsigned len)
const unsigned len,
const unsigned id)
{
try {
if (!(accessRights & AccessCutText)) return;
@@ -450,10 +452,11 @@ void VNCSConnectionST::sendBinaryClipboardDataOrClose(const char* mime,
return;
}
cliplog((const char *) data, len, len, "sent", sock->getPeerAddress());
cliplog((const char *) data, len, len, "sent", sock->getPeerAddress(),
id);
if (state() != RFBSTATE_NORMAL) return;
addBinaryClipboard(mime, data, len);
addBinaryClipboard(mime, data, len, id);
binclipTimer.start(100);
} catch(rdr::Exception& e) {
close(e.str());
@@ -1049,6 +1052,14 @@ void VNCSConnectionST::handleClipboardAnnounceBinary(const unsigned num, const c
if (!(accessRights & AccessCutText)) return;
if (!rfb::Server::acceptCutText) return;
server->handleClipboardAnnounceBinary(this, num, mimes);
const unsigned tolog = server->clipboardId++;
if (Server::DLP_ClipLog[0] == 'o')
return;
vlog.info("DLP: client %s: %s %u clipboard mimes, id %u",
sock->getPeerAddress(), "received",
num, tolog);
}
// supportsLocalCursor() is called whenever the status of