Skip to content

fix: Error in obtaining VPN password modification #424

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
caixr23 merged 1 commit into from
Oct 28, 2025
Merged

fix: Error in obtaining VPN password modification #424

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 5 additions & 10 deletions network-service-plugin/src/session/networksecretagent.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,8 +318,8 @@ void NetworkSecretAgent::vpnDialogStarted()
if (!request) {
return;
}
NMStringMap vpnData = request->connection.value("vpn").value("data").value<NMStringMap>();
NMStringMap vpnSecretData = request->connection.value("vpn").value("secrets").value<NMStringMap>();
NMStringMap vpnData = qdbus_cast<NMStringMap>(request->connection.value("vpn").value("data").value<QDBusArgument>());
NMStringMap vpnSecretData = qdbus_cast<NMStringMap>(request->connection.value("vpn").value("secrets").value<QDBusArgument>());
// send vpn connection data to the authentication dialog binary
for (auto it = vpnData.begin(); it != vpnData.end(); ++it) {
QString data = "DATA_KEY=" + it.key() + "\n" + "DATA_VAL=" + it.value() + "\n\n";
Expand Down Expand Up @@ -617,8 +617,8 @@ bool NetworkSecretAgent::processGetSecrets(SecretsRequest &request)
createPendingKey(request);
return false;
} else {
vpnSecretsData = request.connection.value("vpn").value("secrets").value<NMStringMap>();
NMStringMap vpnDataMap = request.connection.value("vpn").value("data").value<NMStringMap>();
vpnSecretsData = qdbus_cast<NMStringMap>(request.connection.value("vpn").value("secrets").value<QDBusArgument>());
NMStringMap vpnDataMap = qdbus_cast<NMStringMap>(request.connection.value("vpn").value("data").value<QDBusArgument>());
QStringList askItems;
for (auto &&secretKey : VpnSecretKeys) {
bool ok = false;
Expand All @@ -636,10 +636,6 @@ bool NetworkSecretAgent::processGetSecrets(SecretsRequest &request)
}
}
QMap<QString, QString> resultSaved = m_secretService->getAll(connUUID, request.settingName);
if (resultSaved.isEmpty()) {
dbusConnection().send(request.message.createReply(QVariant::fromValue(NMVariantMapMap())));
return true;
}
qCDebug(DSM()) << "getAll resultSaved:" << resultSaved;
for (auto it = resultSaved.begin(); it != resultSaved.end(); ++it) {
if (vpnSecretsData.contains(it.key())) {
Expand All @@ -648,7 +644,6 @@ bool NetworkSecretAgent::processGetSecrets(SecretsRequest &request)
qCDebug(DSM()) << "not override key" << it.key();
}
}
sendError(Error::InvalidConnection, "not found connection uuid", request.message);
setting.insert("secrets", QVariant::fromValue(vpnSecretsData));
} else if (SecretSettingKeys.contains(request.settingName)) {

Expand Down Expand Up @@ -825,7 +820,7 @@ bool NetworkSecretAgent::processSaveSecrets(SecretsRequest &request) const
}
}
}
NMStringMap vpnData = request.connection.value("vpn").value("data").value<NMStringMap>();
NMStringMap vpnData = qdbus_cast<NMStringMap>(request.connection.value("vpn").value("data").value<QDBusArgument>());
if (!vpnData.isEmpty()) {
for (auto &&secretKey : VpnSecretKeys) {
bool ok = false;
Expand Down