mirrors/mumble
2
0
Fork 0
mirror of https://github.com/mumble-voip/mumble.git synced 2025-10-26 11:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #5916: FIX(client): Fixes link context menu creation for channels

Browse Source 
The commit 902fe58 introduced links in the log for users and channels. This either never worked correctly, or regressed due to an undocumented behavior change in Qt. The 'channelid' stored in the host part of a QUrl is automatically converted to an IP address (e.g. '1' -> '0.0.0.1') which lets the channel lookup fail. A different code path for clients was present, so the issue was not observed often (or at all) there.

This commit changes the host part composition to contain a string (e.g. '1' > 'id.1') and makes sure this new string is parsed correctly.

Fixes #2961
This commit is contained in:
Robert Adam 2022-10-13 07:55:17 +02:00 committed by GitHub
commit 7f7b9ecf12
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mumble/Log.cpp
View File

@ -509,7 +509,7 @@ QString Log::msgColor(const QString &text, LogColorType t) {
}
QString Log::formatChannel(::Channel *c) {
return QString::fromLatin1("<a href='channelid://%1/%3' class='log-channel'>%2</a>")
return QString::fromLatin1("<a href='channelid://id.%1/%3' class='log-channel'>%2</a>")
.arg(c->iId)
.arg(c->qsName.toHtmlEscaped())
.arg(QString::fromLatin1(Global::get().sh->qbaDigest.toBase64()));
@ -539,7 +539,7 @@ QString Log::formatClientUser(ClientUser *cu, LogColorType t, const QString &dis
if (cu) {
QString name = (displayName.isNull() ? cu->qsName : displayName).toHtmlEscaped();
if (cu->qsHash.isEmpty()) {
return QString::fromLatin1("<a href='clientid://%2/%4' class='log-user log-%1'>%3</a>")
return QString::fromLatin1("<a href='clientid://id.%2/%4' class='log-user log-%1'>%3</a>")
.arg(className)
.arg(cu->uiSession)
.arg(name)

18
src/mumble/MainWindow.cpp
View File

@ -829,6 +829,10 @@ ContextMenuTarget MainWindow::getContextMenuTargets() {
}
bool MainWindow::handleSpecialContextMenu(const QUrl &url, const QPoint &pos_, bool focus) {
// This method abuses QUrls for internal data serialization
// The protocol, host and path parts of the URL may contain
// special values which are only parsable by this method.
if (url.scheme() == QString::fromLatin1("clientid")) {
bool ok = false;
QString maybeUserHash(url.host());
@ -839,8 +843,13 @@ bool MainWindow::handleSpecialContextMenu(const QUrl &url, const QPoint &pos_, b
ok = true;
}
} else {
// We expect the host part of the URL to contain the user id in the format
// id.<id>
// where <id> is the user id as integer. This is necessary, because QUrl parses
// plain integers in the host field as IP addresses
QByteArray qbaServerDigest = QByteArray::fromBase64(url.path().remove(0, 1).toLatin1());
cuContextUser = ClientUser::get(url.host().toInt(&ok, 10));
QString id = url.host().split(".").value(1, "-1");
cuContextUser = ClientUser::get(id.toInt(&ok, 10));
ServerHandlerPtr sh = Global::get().sh;
ok = ok && sh && (qbaServerDigest == sh->qbaDigest);
}
@ -855,9 +864,14 @@ bool MainWindow::handleSpecialContextMenu(const QUrl &url, const QPoint &pos_, b
}
cuContextUser.clear();
} else if (url.scheme() == QString::fromLatin1("channelid")) {
// We expect the host part of the URL to contain the channel id in the format
// id.<id>
// where <id> is the channel id as integer. This is necessary, because QUrl parses
// plain integers in the host field as IP addresses
bool ok;
QByteArray qbaServerDigest = QByteArray::fromBase64(url.path().remove(0, 1).toLatin1());
cContextChannel = Channel::get(url.host().toInt(&ok, 10));
QString id = url.host().split(".").value(1, "-1");
cContextChannel = Channel::get(id.toInt(&ok, 10));
ServerHandlerPtr sh = Global::get().sh;
ok = ok && sh && (qbaServerDigest == sh->qbaDigest);
if (ok) {