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

fixed hang after creating configuration on connection

Browse source 
- config created on connection is displayed as admin (platform name) on the client management page
- added config creation time on the client management page
This commit is contained in:
vladimir.kuznetsov 2023-12-21 17:47:34 +07:00
parent 0f1519a21f
commit 7aac9f9d0e
6 changed files with 21 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
client/amnezia_application.cpp
View file

@ -330,6 +330,7 @@ void AmneziaApplication::initModels()
ServerCredentials credentials) {
m_serversModel->reloadContainerConfig();
m_clientManagementModel->appendClient(clientId, clientName, container, credentials);
emit m_configurator->clientModelUpdated();
});
}

1
client/configurators/vpn_configurator.h
View file

@ -46,6 +46,7 @@ public:
signals:
void newVpnConfigCreated(const QString &clientId, const QString &clientName, const DockerContainer container,
ServerCredentials credentials);
void clientModelUpdated();
};
#endif // VPN_CONFIGURATOR_H

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

@ -15,6 +15,7 @@ namespace
constexpr char clientName[] = "clientName";
constexpr char container[] = "container";
constexpr char userData[] = "userData";
constexpr char creationDate[] = "creationDate";
}
}
@ -40,6 +41,7 @@ QVariant ClientManagementModel::data(const QModelIndex &index, int role) const
switch (role) {
case ClientNameRole: return userData.value(configKey::clientName).toString();
case CreationDateRole: return userData.value(configKey::creationDate).toString();
}
return QVariant();
@ -200,19 +202,20 @@ ErrorCode ClientManagementModel::appendClient(const QString &clientId, const QSt
for (int i = 0; i < m_clientsTable.size(); i++) {
if (m_clientsTable.at(i).toObject().value(configKey::clientId) == clientId) {
return renameClient(i, clientName, container, credentials);
return renameClient(i, clientName, container, credentials, true);
}
}
beginResetModel();
beginInsertRows(QModelIndex(), rowCount(), 1);
QJsonObject client;
client[configKey::clientId] = clientId;
QJsonObject userData;
userData[configKey::clientName] = clientName;
userData[configKey::creationDate] = QDateTime::currentDateTime().toString();
client[configKey::userData] = userData;
m_clientsTable.push_back(client);
endResetModel();
endInsertRows();
const QByteArray clientsTableString = QJsonDocument(m_clientsTable).toJson();
@ -229,11 +232,14 @@ ErrorCode ClientManagementModel::appendClient(const QString &clientId, const QSt
}
ErrorCode ClientManagementModel::renameClient(const int row, const QString &clientName, const DockerContainer container,
ServerCredentials credentials)
ServerCredentials credentials, bool addTimeStamp)
{
auto client = m_clientsTable.at(row).toObject();
auto userData = client[configKey::userData].toObject();
userData[configKey::clientName] = clientName;
if (addTimeStamp) {
userData[configKey::creationDate] = QDateTime::currentDateTime().toString();
}
client[configKey::userData] = userData;
m_clientsTable.replace(row, client);
@ -369,5 +375,6 @@ QHash<int, QByteArray> ClientManagementModel::roleNames() const
{
QHash<int, QByteArray> roles;
roles[ClientNameRole] = "clientName";
roles[CreationDateRole] = "creationDate";
return roles;
}

3
client/ui/models/clientManagementModel.h
View file

@ -14,6 +14,7 @@ class ClientManagementModel : public QAbstractListModel
public:
enum Roles {
ClientNameRole = Qt::UserRole + 1,
CreationDateRole
};
ClientManagementModel(std::shared_ptr<Settings> settings, QObject *parent = nullptr);
@ -26,7 +27,7 @@ public slots:
ErrorCode appendClient(const QString &clientId, const QString &clientName, const DockerContainer container,
ServerCredentials credentials);
ErrorCode renameClient(const int row, const QString &userName, const DockerContainer container,
ServerCredentials credentials);
ServerCredentials credentials, bool addTimeStamp = false);
ErrorCode revokeClient(const int index, const DockerContainer container, ServerCredentials credentials);
protected:

2
client/ui/qml/Pages2/PageShare.qml
View file

@ -578,7 +578,7 @@ PageType {
Layout.bottomMargin: 24
headerText: clientName
descriptionText: serverSelector.text
descriptionText: qsTr("Creation date: ") + creationDate
}
BasicButtonType {

6
client/vpnconnection.cpp
View file

@ -4,6 +4,7 @@
#include <QFile>
#include <QHostInfo>
#include <QJsonObject>
#include <QEventLoop>
#include <configurators/cloak_configurator.h>
#include <configurators/openvpn_configurator.h>
@ -246,7 +247,10 @@ QString VpnConnection::createVpnConfigurationForProto(int serverIndex, const Ser
m_settings->setProtocolConfig(serverIndex, container, proto, protoObject);
}
emit m_configurator->newVpnConfigCreated(clientId, "unnamed client", container, credentials);
QEventLoop wait;
emit m_configurator->newVpnConfigCreated(clientId, QString("Admin [%1]").arg(QSysInfo::prettyProductName()), container, credentials);
QObject::connect(m_configurator.get(), &VpnConfigurator::clientModelUpdated, &wait, &QEventLoop::quit);
wait.exec();
}
return configData;