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

added page to display raw config

Browse source
This commit is contained in:
vladimir.kuznetsov 2023-07-14 13:14:50 +09:00
parent c13b9754eb
commit 3aaa7b62ef
16 changed files with 266 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

31
client/ui/controllers/exportController.cpp
View file

@ -36,10 +36,9 @@ void ExportController::generateFullAccessConfig()
QByteArray compressedConfig = QJsonDocument(config).toJson();
compressedConfig = qCompress(compressedConfig, 8);
m_rawConfig = QString("vpn://%1")
.arg(QString(compressedConfig.toBase64(QByteArray::Base64UrlEncoding
| QByteArray::OmitTrailingEquals)));
m_formattedConfig = m_rawConfig;
m_config = QString("vpn://%1")
.arg(QString(compressedConfig.toBase64(QByteArray::Base64UrlEncoding
| QByteArray::OmitTrailingEquals)));
m_qrCodes = generateQrCodeImageSeries(compressedConfig);
emit exportConfigChanged();
@ -88,10 +87,9 @@ void ExportController::generateConnectionConfig()
QByteArray compressedConfig = QJsonDocument(config).toJson();
compressedConfig = qCompress(compressedConfig, 8);
m_rawConfig = QString("vpn://%1")
.arg(QString(compressedConfig.toBase64(QByteArray::Base64UrlEncoding
| QByteArray::OmitTrailingEquals)));
m_formattedConfig = m_rawConfig;
m_config = QString("vpn://%1")
.arg(QString(compressedConfig.toBase64(QByteArray::Base64UrlEncoding
| QByteArray::OmitTrailingEquals)));
m_qrCodes = generateQrCodeImageSeries(compressedConfig);
emit exportConfigChanged();
@ -120,12 +118,10 @@ void ExportController::generateOpenVpnConfig()
}
config = m_configurator->processConfigWithExportSettings(serverIndex, container, Proto::OpenVpn, config);
m_rawConfig = config;
auto configJson = QJsonDocument::fromJson(config.toUtf8()).object();
QStringList lines = configJson.value(config_key::config).toString().replace("\r", "").split("\n");
for (const QString &line : lines) {
m_formattedConfig.append(line + "\n");
m_config.append(line + "\n");
}
emit exportConfigChanged();
@ -154,20 +150,18 @@ void ExportController::generateWireGuardConfig()
}
config = m_configurator->processConfigWithExportSettings(serverIndex, container, Proto::WireGuard, config);
m_rawConfig = config;
auto configJson = QJsonDocument::fromJson(config.toUtf8()).object();
QStringList lines = configJson.value(config_key::config).toString().replace("\r", "").split("\n");
for (const QString &line : lines) {
m_formattedConfig.append(line + "\n");
m_config.append(line + "\n");
}
emit exportConfigChanged();
}
QString ExportController::getFormattedConfig()
QString ExportController::getConfig()
{
return m_formattedConfig;
return m_config;
}
QList<QString> ExportController::getQrCodes()
@ -193,7 +187,7 @@ void ExportController::saveFile()
QFile save(fileName.toLocalFile());
save.open(QIODevice::WriteOnly);
save.write(m_rawConfig.toUtf8());
save.write(m_config.toUtf8());
save.close();
QFileInfo fi(fileName.toLocalFile());
@ -233,7 +227,6 @@ int ExportController::getQrCodesCount()
void ExportController::clearPreviousConfig()
{
m_rawConfig.clear();
m_formattedConfig.clear();
m_config.clear();
m_qrCodes.clear();
}

7
client/ui/controllers/exportController.h
View file

@ -18,7 +18,7 @@ public:
Q_PROPERTY(QList<QString> qrCodes READ getQrCodes NOTIFY exportConfigChanged)
Q_PROPERTY(int qrCodesCount READ getQrCodesCount NOTIFY exportConfigChanged)
Q_PROPERTY(QString formattedConfig READ getFormattedConfig NOTIFY exportConfigChanged)
Q_PROPERTY(QString config READ getConfig NOTIFY exportConfigChanged)
public slots:
void generateFullAccessConfig();
@ -26,7 +26,7 @@ public slots:
void generateOpenVpnConfig();
void generateWireGuardConfig();
QString getFormattedConfig();
QString getConfig();
QList<QString> getQrCodes();
void saveFile();
@ -50,8 +50,7 @@ private:
std::shared_ptr<Settings> m_settings;
std::shared_ptr<VpnConfigurator> m_configurator;
QString m_rawConfig;
QString m_formattedConfig;
QString m_config;
QList<QString> m_qrCodes;
};

4
client/ui/controllers/pageController.h
View file

@ -42,7 +42,8 @@ namespace PageLoader
PageProtocolShadowSocksSettings,
PageProtocolCloakSettings,
PageProtocolWireGuardSettings,
PageProtocolIKev2Settings
PageProtocolIKev2Settings,
PageProtocolRaw
};
Q_ENUM_NS(PageEnum)
@ -70,6 +71,7 @@ signals:
void showErrorMessage(QString errorMessage);
void showInfoMessage(QString message);
void showBusyIndicator(bool visible);
void raise();
private:
QSharedPointer<ServersModel> m_serversModel;