AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix revoking client when clear profile

Browse source
This commit is contained in:
aiamnezia 2024-11-11 20:38:04 +04:00
parent c907818311
commit 83967d7a88
1 changed files with 39 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

40
client/ui/models/clientManagementModel.cpp
View file

@ -446,6 +446,7 @@ ErrorCode ClientManagementModel::appendClient(QJsonObject &protocolConfig, const
} else { } else {
clientId = protocolConfig.value(config_key::clientId).toString(); clientId = protocolConfig.value(config_key::clientId).toString();
} }
return appendClient(clientId, clientName, container, credentials, serverController); return appendClient(clientId, clientName, container, credentials, serverController);
} }
@ -613,9 +614,46 @@ ErrorCode ClientManagementModel::revokeClient(const QJsonObject &containerConfig
auto protocolConfig = ContainerProps::getProtocolConfigFromContainer(protocol, containerConfig); auto protocolConfig = ContainerProps::getProtocolConfigFromContainer(protocol, containerConfig);
QString clientId;
if (container == DockerContainer::Xray) {
if (!protocolConfig.contains("outbounds")) {
return ErrorCode::InternalError;
}
QJsonArray outbounds = protocolConfig.value("outbounds").toArray();
if (outbounds.isEmpty()) {
return ErrorCode::InternalError;
}
QJsonObject outbound = outbounds[0].toObject();
if (!outbound.contains("settings")) {
return ErrorCode::InternalError;
}
QJsonObject settings = outbound["settings"].toObject();
if (!settings.contains("vnext")) {
return ErrorCode::InternalError;
}
QJsonArray vnext = settings["vnext"].toArray();
if (vnext.isEmpty()) {
return ErrorCode::InternalError;
}
QJsonObject vnextObj = vnext[0].toObject();
if (!vnextObj.contains("users")) {
return ErrorCode::InternalError;
}
QJsonArray users = vnextObj["users"].toArray();
if (users.isEmpty()) {
return ErrorCode::InternalError;
}
QJsonObject user = users[0].toObject();
if (!user.contains("id")) {
return ErrorCode::InternalError;
}
clientId = user["id"].toString();
} else {
clientId = protocolConfig.value(config_key::clientId).toString();
}
int row; int row;
bool clientExists = false; bool clientExists = false;
QString clientId = protocolConfig.value(config_key::clientId).toString();
for (row = 0; row < rowCount(); row++) { for (row = 0; row < rowCount(); row++) {
auto client = m_clientsTable.at(row).toObject(); auto client = m_clientsTable.at(row).toObject();
if (clientId == client.value(configKey::clientId).toString()) { if (clientId == client.value(configKey::clientId).toString()) {