ShadowSocksLogic
CloakLogic
This commit is contained in:
pokamest
parent
a6e5cfff8a
commit
deda2e158e
13 changed files with 684 additions and 762 deletions
|
|
@ -1,51 +1,264 @@
|
|||
#include <QApplication>
|
||||
#include <QClipboard>
|
||||
#include <QDebug>
|
||||
#include <QDesktopServices>
|
||||
#include <QFileDialog>
|
||||
#include <QHBoxLayout>
|
||||
#include <QHostInfo>
|
||||
#include <QItemSelectionModel>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QKeyEvent>
|
||||
#include <QMenu>
|
||||
#include <QMessageBox>
|
||||
#include <QMetaEnum>
|
||||
#include <QSysInfo>
|
||||
#include <QThread>
|
||||
#include <QTimer>
|
||||
#include <QRegularExpression>
|
||||
#include <QSaveFile>
|
||||
|
||||
//#include "configurators/cloak_configurator.h"
|
||||
//#include "configurators/vpn_configurator.h"
|
||||
//#include "configurators/openvpn_configurator.h"
|
||||
//#include "configurators/shadowsocks_configurator.h"
|
||||
//#include "configurators/ssh_configurator.h"
|
||||
|
||||
//#include "core/servercontroller.h"
|
||||
//#include "core/server_defs.h"
|
||||
//#include "core/errorstrings.h"
|
||||
|
||||
//#include "protocols/protocols_defs.h"
|
||||
//#include "protocols/shadowsocksvpnprotocol.h"
|
||||
|
||||
#include "debug.h"
|
||||
#include "defines.h"
|
||||
#include "CloakLogic.h"
|
||||
#include "utils.h"
|
||||
#include "vpnconnection.h"
|
||||
#include "core/servercontroller.h"
|
||||
#include <functional>
|
||||
|
||||
#include "../../uilogic.h"
|
||||
|
||||
using namespace amnezia;
|
||||
using namespace PageEnumNS;
|
||||
|
||||
|
||||
CloakLogic::CloakLogic(UiLogic *uiLogic, QObject *parent):
|
||||
QObject(parent),
|
||||
m_uiLogic(uiLogic)
|
||||
m_uiLogic(uiLogic),
|
||||
m_comboBoxProtoCloakCipherText{"chacha20-poly1305"},
|
||||
m_lineEditProtoCloakSiteText{"tile.openstreetmap.org"},
|
||||
m_lineEditProtoCloakPortText{},
|
||||
m_widgetProtoCloakEnabled{false},
|
||||
m_pushButtonProtoCloakSaveVisible{false},
|
||||
m_progressBarProtoCloakResetVisible{false},
|
||||
m_lineEditProtoCloakPortEnabled{false},
|
||||
m_pageProtoCloakEnabled{true},
|
||||
m_labelProtoCloakInfoVisible{true},
|
||||
m_labelProtoCloakInfoText{},
|
||||
m_progressBarProtoCloakResetValue{0},
|
||||
m_progressBarProtoCloakResetMaximium{100}
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void CloakLogic::updateCloakPage(const QJsonObject &ckConfig, DockerContainer container, bool haveAuthData)
|
||||
{
|
||||
setWidgetProtoCloakEnabled(haveAuthData);
|
||||
setPushButtonProtoCloakSaveVisible(haveAuthData);
|
||||
setProgressBarProtoCloakResetVisible(haveAuthData);
|
||||
|
||||
setComboBoxProtoCloakCipherText(ckConfig.value(config_key::cipher).
|
||||
toString(protocols::cloak::defaultCipher));
|
||||
|
||||
setLineEditProtoCloakSiteText(ckConfig.value(config_key::site).
|
||||
toString(protocols::cloak::defaultRedirSite));
|
||||
|
||||
setLineEditProtoCloakPortText(ckConfig.value(config_key::port).
|
||||
toString(protocols::cloak::defaultPort));
|
||||
|
||||
setLineEditProtoCloakPortEnabled(container == DockerContainer::OpenVpnOverCloak);
|
||||
}
|
||||
|
||||
|
||||
|
||||
QJsonObject CloakLogic::getCloakConfigFromPage(QJsonObject oldConfig)
|
||||
{
|
||||
oldConfig.insert(config_key::cipher, getComboBoxProtoCloakCipherText());
|
||||
oldConfig.insert(config_key::site, getLineEditProtoCloakSiteText());
|
||||
oldConfig.insert(config_key::port, getLineEditProtoCloakPortText());
|
||||
|
||||
return oldConfig;
|
||||
}
|
||||
|
||||
QString CloakLogic::getComboBoxProtoCloakCipherText() const
|
||||
{
|
||||
return m_comboBoxProtoCloakCipherText;
|
||||
}
|
||||
|
||||
void CloakLogic::setComboBoxProtoCloakCipherText(const QString &comboBoxProtoCloakCipherText)
|
||||
{
|
||||
if (m_comboBoxProtoCloakCipherText != comboBoxProtoCloakCipherText) {
|
||||
m_comboBoxProtoCloakCipherText = comboBoxProtoCloakCipherText;
|
||||
emit comboBoxProtoCloakCipherTextChanged();
|
||||
}
|
||||
}
|
||||
|
||||
QString CloakLogic::getLineEditProtoCloakPortText() const
|
||||
{
|
||||
return m_lineEditProtoCloakPortText;
|
||||
}
|
||||
|
||||
void CloakLogic::setLineEditProtoCloakPortText(const QString &lineEditProtoCloakPortText)
|
||||
{
|
||||
if (m_lineEditProtoCloakPortText != lineEditProtoCloakPortText) {
|
||||
m_lineEditProtoCloakPortText = lineEditProtoCloakPortText;
|
||||
emit lineEditProtoCloakPortTextChanged();
|
||||
}
|
||||
}
|
||||
|
||||
QString CloakLogic::getLineEditProtoCloakSiteText() const
|
||||
{
|
||||
return m_lineEditProtoCloakSiteText;
|
||||
}
|
||||
|
||||
void CloakLogic::setLineEditProtoCloakSiteText(const QString &lineEditProtoCloakSiteText)
|
||||
{
|
||||
if (m_lineEditProtoCloakSiteText != lineEditProtoCloakSiteText) {
|
||||
m_lineEditProtoCloakSiteText = lineEditProtoCloakSiteText;
|
||||
emit lineEditProtoCloakSiteTextChanged();
|
||||
}
|
||||
}
|
||||
|
||||
bool CloakLogic::getWidgetProtoCloakEnabled() const
|
||||
{
|
||||
return m_widgetProtoCloakEnabled;
|
||||
}
|
||||
|
||||
void CloakLogic::setWidgetProtoCloakEnabled(bool widgetProtoCloakEnabled)
|
||||
{
|
||||
if (m_widgetProtoCloakEnabled != widgetProtoCloakEnabled) {
|
||||
m_widgetProtoCloakEnabled = widgetProtoCloakEnabled;
|
||||
emit widgetProtoCloakEnabledChanged();
|
||||
}
|
||||
}
|
||||
|
||||
bool CloakLogic::getPushButtonProtoCloakSaveVisible() const
|
||||
{
|
||||
return m_pushButtonProtoCloakSaveVisible;
|
||||
}
|
||||
|
||||
void CloakLogic::setPushButtonProtoCloakSaveVisible(bool pushButtonProtoCloakSaveVisible)
|
||||
{
|
||||
if (m_pushButtonProtoCloakSaveVisible != pushButtonProtoCloakSaveVisible) {
|
||||
m_pushButtonProtoCloakSaveVisible = pushButtonProtoCloakSaveVisible;
|
||||
emit pushButtonProtoCloakSaveVisibleChanged();
|
||||
}
|
||||
}
|
||||
|
||||
bool CloakLogic::getProgressBarProtoCloakResetVisible() const
|
||||
{
|
||||
return m_progressBarProtoCloakResetVisible;
|
||||
}
|
||||
|
||||
void CloakLogic::setProgressBarProtoCloakResetVisible(bool progressBarProtoCloakResetVisible)
|
||||
{
|
||||
if (m_progressBarProtoCloakResetVisible != progressBarProtoCloakResetVisible) {
|
||||
m_progressBarProtoCloakResetVisible = progressBarProtoCloakResetVisible;
|
||||
emit progressBarProtoCloakResetVisibleChanged();
|
||||
}
|
||||
}
|
||||
|
||||
bool CloakLogic::getLineEditProtoCloakPortEnabled() const
|
||||
{
|
||||
return m_lineEditProtoCloakPortEnabled;
|
||||
}
|
||||
|
||||
void CloakLogic::setLineEditProtoCloakPortEnabled(bool lineEditProtoCloakPortEnabled)
|
||||
{
|
||||
if (m_lineEditProtoCloakPortEnabled != lineEditProtoCloakPortEnabled) {
|
||||
m_lineEditProtoCloakPortEnabled = lineEditProtoCloakPortEnabled;
|
||||
emit lineEditProtoCloakPortEnabledChanged();
|
||||
}
|
||||
}
|
||||
|
||||
bool CloakLogic::getPageProtoCloakEnabled() const
|
||||
{
|
||||
return m_pageProtoCloakEnabled;
|
||||
}
|
||||
|
||||
void CloakLogic::setPageProtoCloakEnabled(bool pageProtoCloakEnabled)
|
||||
{
|
||||
if (m_pageProtoCloakEnabled != pageProtoCloakEnabled) {
|
||||
m_pageProtoCloakEnabled = pageProtoCloakEnabled;
|
||||
emit pageProtoCloakEnabledChanged();
|
||||
}
|
||||
}
|
||||
|
||||
bool CloakLogic::getLabelProtoCloakInfoVisible() const
|
||||
{
|
||||
return m_labelProtoCloakInfoVisible;
|
||||
}
|
||||
|
||||
void CloakLogic::setLabelProtoCloakInfoVisible(bool labelProtoCloakInfoVisible)
|
||||
{
|
||||
if (m_labelProtoCloakInfoVisible != labelProtoCloakInfoVisible) {
|
||||
m_labelProtoCloakInfoVisible = labelProtoCloakInfoVisible;
|
||||
emit labelProtoCloakInfoVisibleChanged();
|
||||
}
|
||||
}
|
||||
|
||||
QString CloakLogic::getLabelProtoCloakInfoText() const
|
||||
{
|
||||
return m_labelProtoCloakInfoText;
|
||||
}
|
||||
|
||||
void CloakLogic::setLabelProtoCloakInfoText(const QString &labelProtoCloakInfoText)
|
||||
{
|
||||
if (m_labelProtoCloakInfoText != labelProtoCloakInfoText) {
|
||||
m_labelProtoCloakInfoText = labelProtoCloakInfoText;
|
||||
emit labelProtoCloakInfoTextChanged();
|
||||
}
|
||||
}
|
||||
|
||||
int CloakLogic::getProgressBarProtoCloakResetValue() const
|
||||
{
|
||||
return m_progressBarProtoCloakResetValue;
|
||||
}
|
||||
|
||||
void CloakLogic::setProgressBarProtoCloakResetValue(int progressBarProtoCloakResetValue)
|
||||
{
|
||||
if (m_progressBarProtoCloakResetValue != progressBarProtoCloakResetValue) {
|
||||
m_progressBarProtoCloakResetValue = progressBarProtoCloakResetValue;
|
||||
emit progressBarProtoCloakResetValueChanged();
|
||||
}
|
||||
}
|
||||
|
||||
int CloakLogic::getProgressBarProtoCloakResetMaximium() const
|
||||
{
|
||||
return m_progressBarProtoCloakResetMaximium;
|
||||
}
|
||||
|
||||
void CloakLogic::setProgressBarProtoCloakResetMaximium(int progressBarProtoCloakResetMaximium)
|
||||
{
|
||||
if (m_progressBarProtoCloakResetMaximium != progressBarProtoCloakResetMaximium) {
|
||||
m_progressBarProtoCloakResetMaximium = progressBarProtoCloakResetMaximium;
|
||||
emit progressBarProtoCloakResetMaximiumChanged();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void CloakLogic::onPushButtonProtoCloakSaveClicked()
|
||||
{
|
||||
QJsonObject protocolConfig = m_settings.protocolConfig(m_uiLogic->selectedServerIndex, m_uiLogic->selectedDockerContainer, Protocol::Cloak);
|
||||
protocolConfig = getCloakConfigFromPage(protocolConfig);
|
||||
|
||||
QJsonObject containerConfig = m_settings.containerConfig(m_uiLogic->selectedServerIndex, m_uiLogic->selectedDockerContainer);
|
||||
QJsonObject newContainerConfig = containerConfig;
|
||||
newContainerConfig.insert(config_key::cloak, protocolConfig);
|
||||
|
||||
UiLogic::PageFunc page_proto_cloak;
|
||||
page_proto_cloak.setEnabledFunc = [this] (bool enabled) -> void {
|
||||
setPageProtoCloakEnabled(enabled);
|
||||
};
|
||||
UiLogic::ButtonFunc pushButton_proto_cloak_save;
|
||||
pushButton_proto_cloak_save.setVisibleFunc = [this] (bool visible) ->void {
|
||||
setPushButtonProtoCloakSaveVisible(visible);
|
||||
};
|
||||
UiLogic::LabelFunc label_proto_cloak_info;
|
||||
label_proto_cloak_info.setVisibleFunc = [this] (bool visible) ->void {
|
||||
setLabelProtoCloakInfoVisible(visible);
|
||||
};
|
||||
label_proto_cloak_info.setTextFunc = [this] (const QString& text) ->void {
|
||||
setLabelProtoCloakInfoText(text);
|
||||
};
|
||||
UiLogic::ProgressFunc progressBar_proto_cloak_reset;
|
||||
progressBar_proto_cloak_reset.setVisibleFunc = [this] (bool visible) ->void {
|
||||
setProgressBarProtoCloakResetVisible(visible);
|
||||
};
|
||||
progressBar_proto_cloak_reset.setValueFunc = [this] (int value) ->void {
|
||||
setProgressBarProtoCloakResetValue(value);
|
||||
};
|
||||
progressBar_proto_cloak_reset.getValueFunc = [this] (void) -> int {
|
||||
return getProgressBarProtoCloakResetValue();
|
||||
};
|
||||
progressBar_proto_cloak_reset.getMaximiumFunc = [this] (void) -> int {
|
||||
return getProgressBarProtoCloakResetMaximium();
|
||||
};
|
||||
|
||||
ErrorCode e = m_uiLogic->doInstallAction([this, containerConfig, newContainerConfig](){
|
||||
return ServerController::updateContainer(m_settings.serverCredentials(m_uiLogic->selectedServerIndex), m_uiLogic->selectedDockerContainer, containerConfig, newContainerConfig);
|
||||
},
|
||||
page_proto_cloak, progressBar_proto_cloak_reset,
|
||||
pushButton_proto_cloak_save, label_proto_cloak_info);
|
||||
|
||||
if (!e) {
|
||||
m_settings.setContainerConfig(m_uiLogic->selectedServerIndex, m_uiLogic->selectedDockerContainer, newContainerConfig);
|
||||
m_settings.clearLastConnectionConfig(m_uiLogic->selectedServerIndex, m_uiLogic->selectedDockerContainer);
|
||||
}
|
||||
|
||||
qDebug() << "Protocol saved with code:" << e << "for" << m_uiLogic->selectedServerIndex << m_uiLogic->selectedDockerContainer;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,12 +10,66 @@ class CloakLogic : public QObject
|
|||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
Q_PROPERTY(QString comboBoxProtoCloakCipherText READ getComboBoxProtoCloakCipherText WRITE setComboBoxProtoCloakCipherText NOTIFY comboBoxProtoCloakCipherTextChanged)
|
||||
Q_PROPERTY(QString lineEditProtoCloakSiteText READ getLineEditProtoCloakSiteText WRITE setLineEditProtoCloakSiteText NOTIFY lineEditProtoCloakSiteTextChanged)
|
||||
Q_PROPERTY(QString lineEditProtoCloakPortText READ getLineEditProtoCloakPortText WRITE setLineEditProtoCloakPortText NOTIFY lineEditProtoCloakPortTextChanged)
|
||||
Q_PROPERTY(bool widgetProtoCloakEnabled READ getWidgetProtoCloakEnabled WRITE setWidgetProtoCloakEnabled NOTIFY widgetProtoCloakEnabledChanged)
|
||||
Q_PROPERTY(bool pushButtonProtoCloakSaveVisible READ getPushButtonProtoCloakSaveVisible WRITE setPushButtonProtoCloakSaveVisible NOTIFY pushButtonProtoCloakSaveVisibleChanged)
|
||||
Q_PROPERTY(bool progressBarProtoCloakResetVisible READ getProgressBarProtoCloakResetVisible WRITE setProgressBarProtoCloakResetVisible NOTIFY progressBarProtoCloakResetVisibleChanged)
|
||||
Q_PROPERTY(bool lineEditProtoCloakPortEnabled READ getLineEditProtoCloakPortEnabled WRITE setLineEditProtoCloakPortEnabled NOTIFY lineEditProtoCloakPortEnabledChanged)
|
||||
Q_PROPERTY(bool pageProtoCloakEnabled READ getPageProtoCloakEnabled WRITE setPageProtoCloakEnabled NOTIFY pageProtoCloakEnabledChanged)
|
||||
Q_PROPERTY(bool labelProtoCloakInfoVisible READ getLabelProtoCloakInfoVisible WRITE setLabelProtoCloakInfoVisible NOTIFY labelProtoCloakInfoVisibleChanged)
|
||||
Q_PROPERTY(QString labelProtoCloakInfoText READ getLabelProtoCloakInfoText WRITE setLabelProtoCloakInfoText NOTIFY labelProtoCloakInfoTextChanged)
|
||||
Q_PROPERTY(int progressBarProtoCloakResetValue READ getProgressBarProtoCloakResetValue WRITE setProgressBarProtoCloakResetValue NOTIFY progressBarProtoCloakResetValueChanged)
|
||||
Q_PROPERTY(int progressBarProtoCloakResetMaximium READ getProgressBarProtoCloakResetMaximium WRITE setProgressBarProtoCloakResetMaximium NOTIFY progressBarProtoCloakResetMaximiumChanged)
|
||||
|
||||
Q_INVOKABLE void onPushButtonProtoCloakSaveClicked();
|
||||
public:
|
||||
explicit CloakLogic(UiLogic *uiLogic, QObject *parent = nullptr);
|
||||
~CloakLogic() = default;
|
||||
|
||||
signals:
|
||||
void updateCloakPage(const QJsonObject &ckConfig, DockerContainer container, bool haveAuthData);
|
||||
QJsonObject getCloakConfigFromPage(QJsonObject oldConfig);
|
||||
|
||||
QString getComboBoxProtoCloakCipherText() const;
|
||||
void setComboBoxProtoCloakCipherText(const QString &comboBoxProtoCloakCipherText);
|
||||
QString getLineEditProtoCloakSiteText() const;
|
||||
void setLineEditProtoCloakSiteText(const QString &lineEditProtoCloakSiteText);
|
||||
QString getLineEditProtoCloakPortText() const;
|
||||
void setLineEditProtoCloakPortText(const QString &lineEditProtoCloakPortText);
|
||||
bool getWidgetProtoCloakEnabled() const;
|
||||
void setWidgetProtoCloakEnabled(bool widgetProtoCloakEnabled);
|
||||
bool getPushButtonProtoCloakSaveVisible() const;
|
||||
void setPushButtonProtoCloakSaveVisible(bool pushButtonProtoCloakSaveVisible);
|
||||
bool getProgressBarProtoCloakResetVisible() const;
|
||||
void setProgressBarProtoCloakResetVisible(bool progressBarProtoCloakResetVisible);
|
||||
bool getLineEditProtoCloakPortEnabled() const;
|
||||
void setLineEditProtoCloakPortEnabled(bool lineEditProtoCloakPortEnabled);
|
||||
bool getPageProtoCloakEnabled() const;
|
||||
void setPageProtoCloakEnabled(bool pageProtoCloakEnabled);
|
||||
bool getLabelProtoCloakInfoVisible() const;
|
||||
void setLabelProtoCloakInfoVisible(bool labelProtoCloakInfoVisible);
|
||||
QString getLabelProtoCloakInfoText() const;
|
||||
void setLabelProtoCloakInfoText(const QString &labelProtoCloakInfoText);
|
||||
int getProgressBarProtoCloakResetValue() const;
|
||||
void setProgressBarProtoCloakResetValue(int progressBarProtoCloakResetValue);
|
||||
int getProgressBarProtoCloakResetMaximium() const;
|
||||
void setProgressBarProtoCloakResetMaximium(int progressBarProtoCloakResetMaximium);
|
||||
|
||||
signals:
|
||||
void comboBoxProtoCloakCipherTextChanged();
|
||||
void lineEditProtoCloakSiteTextChanged();
|
||||
void lineEditProtoCloakPortTextChanged();
|
||||
void widgetProtoCloakEnabledChanged();
|
||||
void pushButtonProtoCloakSaveVisibleChanged();
|
||||
void progressBarProtoCloakResetVisibleChanged();
|
||||
void lineEditProtoCloakPortEnabledChanged();
|
||||
void pageProtoCloakEnabledChanged();
|
||||
void labelProtoCloakInfoVisibleChanged();
|
||||
void labelProtoCloakInfoTextChanged();
|
||||
void progressBarProtoCloakResetValueChanged();
|
||||
void progressBarProtoCloakResetMaximiumChanged();
|
||||
|
||||
private:
|
||||
|
||||
|
|
@ -28,7 +82,18 @@ private:
|
|||
Settings m_settings;
|
||||
UiLogic *m_uiLogic;
|
||||
|
||||
|
||||
QString m_comboBoxProtoCloakCipherText;
|
||||
QString m_lineEditProtoCloakSiteText;
|
||||
QString m_lineEditProtoCloakPortText;
|
||||
bool m_widgetProtoCloakEnabled;
|
||||
bool m_pushButtonProtoCloakSaveVisible;
|
||||
bool m_progressBarProtoCloakResetVisible;
|
||||
bool m_lineEditProtoCloakPortEnabled;
|
||||
bool m_pageProtoCloakEnabled;
|
||||
bool m_labelProtoCloakInfoVisible;
|
||||
QString m_labelProtoCloakInfoText;
|
||||
int m_progressBarProtoCloakResetValue;
|
||||
int m_progressBarProtoCloakResetMaximium;
|
||||
|
||||
};
|
||||
#endif // CLOAK_LOGIC_H
|
||||
|
|
|
|||
|
|
@ -1,41 +1,5 @@
|
|||
//#include <QApplication>
|
||||
//#include <QClipboard>
|
||||
//#include <QDebug>
|
||||
//#include <QDesktopServices>
|
||||
//#include <QFileDialog>
|
||||
//#include <QHBoxLayout>
|
||||
//#include <QHostInfo>
|
||||
//#include <QItemSelectionModel>
|
||||
//#include <QJsonDocument>
|
||||
//#include <QJsonObject>
|
||||
//#include <QKeyEvent>
|
||||
//#include <QMenu>
|
||||
//#include <QMessageBox>
|
||||
//#include <QMetaEnum>
|
||||
//#include <QSysInfo>
|
||||
//#include <QThread>
|
||||
//#include <QTimer>
|
||||
//#include <QRegularExpression>
|
||||
//#include <QSaveFile>
|
||||
|
||||
//#include "configurators/cloak_configurator.h"
|
||||
//#include "configurators/vpn_configurator.h"
|
||||
//#include "configurators/openvpn_configurator.h"
|
||||
//#include "configurators/shadowsocks_configurator.h"
|
||||
//#include "configurators/ssh_configurator.h"
|
||||
|
||||
#include "core/servercontroller.h"
|
||||
//#include "core/server_defs.h"
|
||||
//#include "core/errorstrings.h"
|
||||
|
||||
//#include "protocols/protocols_defs.h"
|
||||
//#include "protocols/shadowsocksvpnprotocol.h"
|
||||
|
||||
#include "debug.h"
|
||||
#include "defines.h"
|
||||
#include "OpenVpnLogic.h"
|
||||
#include "utils.h"
|
||||
#include "vpnconnection.h"
|
||||
#include "core/servercontroller.h"
|
||||
#include <functional>
|
||||
#include "../../uilogic.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -36,6 +36,9 @@ public:
|
|||
Q_PROPERTY(int progressBarProtoOpenvpnResetValue READ getProgressBarProtoOpenvpnResetValue WRITE setProgressBarProtoOpenvpnResetValue NOTIFY progressBarProtoOpenvpnResetValueChanged)
|
||||
Q_PROPERTY(int progressBarProtoOpenvpnResetMaximium READ getProgressBarProtoOpenvpnResetMaximium WRITE setProgressBarProtoOpenvpnResetMaximium NOTIFY progressBarProtoOpenvpnResetMaximiumChanged)
|
||||
|
||||
Q_INVOKABLE void onCheckBoxProtoOpenvpnAutoEncryptionClicked();
|
||||
Q_INVOKABLE void onPushButtonProtoOpenvpnSaveClicked();
|
||||
|
||||
public:
|
||||
explicit OpenVpnLogic(UiLogic *uiLogic, QObject *parent = nullptr);
|
||||
~OpenVpnLogic() = default;
|
||||
|
|
@ -91,9 +94,6 @@ public:
|
|||
int getProgressBarProtoOpenvpnResetMaximium() const;
|
||||
void setProgressBarProtoOpenvpnResetMaximium(int progressBarProtoOpenvpnResetMaximium);
|
||||
|
||||
Q_INVOKABLE void onCheckBoxProtoOpenvpnAutoEncryptionClicked();
|
||||
Q_INVOKABLE void onPushButtonProtoOpenvpnSaveClicked();
|
||||
|
||||
signals:
|
||||
void lineEditProtoOpenvpnSubnetTextChanged();
|
||||
void radioButtonProtoOpenvpnUdpCheckedChanged();
|
||||
|
|
|
|||
|
|
@ -1,50 +1,241 @@
|
|||
#include <QApplication>
|
||||
#include <QClipboard>
|
||||
#include <QDebug>
|
||||
#include <QDesktopServices>
|
||||
#include <QFileDialog>
|
||||
#include <QHBoxLayout>
|
||||
#include <QHostInfo>
|
||||
#include <QItemSelectionModel>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QKeyEvent>
|
||||
#include <QMenu>
|
||||
#include <QMessageBox>
|
||||
#include <QMetaEnum>
|
||||
#include <QSysInfo>
|
||||
#include <QThread>
|
||||
#include <QTimer>
|
||||
#include <QRegularExpression>
|
||||
#include <QSaveFile>
|
||||
|
||||
//#include "configurators/cloak_configurator.h"
|
||||
//#include "configurators/vpn_configurator.h"
|
||||
//#include "configurators/openvpn_configurator.h"
|
||||
//#include "configurators/shadowsocks_configurator.h"
|
||||
//#include "configurators/ssh_configurator.h"
|
||||
|
||||
//#include "core/servercontroller.h"
|
||||
//#include "core/server_defs.h"
|
||||
//#include "core/errorstrings.h"
|
||||
|
||||
//#include "protocols/protocols_defs.h"
|
||||
//#include "protocols/shadowsocksvpnprotocol.h"
|
||||
|
||||
#include "debug.h"
|
||||
#include "defines.h"
|
||||
#include "ShadowSocksLogic.h"
|
||||
#include "utils.h"
|
||||
#include "vpnconnection.h"
|
||||
#include "core/servercontroller.h"
|
||||
#include <functional>
|
||||
#include "../../uilogic.h"
|
||||
|
||||
using namespace amnezia;
|
||||
using namespace PageEnumNS;
|
||||
|
||||
|
||||
ShadowSocksLogic::ShadowSocksLogic(UiLogic *uiLogic, QObject *parent):
|
||||
QObject(parent),
|
||||
m_uiLogic(uiLogic)
|
||||
m_uiLogic(uiLogic),
|
||||
m_widgetProtoSsEnabled{false},
|
||||
m_comboBoxProtoShadowsocksCipherText{"chacha20-poly1305"},
|
||||
m_lineEditProtoShadowsocksPortText{},
|
||||
m_pushButtonProtoShadowsocksSaveVisible{false},
|
||||
m_progressBarProtoShadowsocksResetVisible{false},
|
||||
m_lineEditProtoShadowsocksPortEnabled{false},
|
||||
m_pageProtoShadowsocksEnabled{true},
|
||||
m_labelProtoShadowsocksInfoVisible{true},
|
||||
m_labelProtoShadowsocksInfoText{},
|
||||
m_progressBarProtoShadowsocksResetValue{0},
|
||||
m_progressBarProtoShadowsocksResetMaximium{100}
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void ShadowSocksLogic::updateShadowSocksPage(const QJsonObject &ssConfig, DockerContainer container, bool haveAuthData)
|
||||
{
|
||||
setWidgetProtoSsEnabled(haveAuthData);
|
||||
setPushButtonProtoShadowsocksSaveVisible(haveAuthData);
|
||||
setProgressBarProtoShadowsocksResetVisible(haveAuthData);
|
||||
|
||||
setComboBoxProtoShadowsocksCipherText(ssConfig.value(config_key::cipher).
|
||||
toString(protocols::shadowsocks::defaultCipher));
|
||||
|
||||
setLineEditProtoShadowsocksPortText(ssConfig.value(config_key::port).
|
||||
toString(protocols::shadowsocks::defaultPort));
|
||||
|
||||
setLineEditProtoShadowsocksPortEnabled(container == DockerContainer::OpenVpnOverShadowSocks);
|
||||
}
|
||||
|
||||
QJsonObject ShadowSocksLogic::getShadowSocksConfigFromPage(QJsonObject oldConfig)
|
||||
{
|
||||
oldConfig.insert(config_key::cipher, getComboBoxProtoShadowsocksCipherText());
|
||||
oldConfig.insert(config_key::port, getLineEditProtoShadowsocksPortText());
|
||||
|
||||
return oldConfig;
|
||||
}
|
||||
|
||||
QString ShadowSocksLogic::getComboBoxProtoShadowsocksCipherText() const
|
||||
{
|
||||
return m_comboBoxProtoShadowsocksCipherText;
|
||||
}
|
||||
|
||||
void ShadowSocksLogic::setComboBoxProtoShadowsocksCipherText(const QString &comboBoxProtoShadowsocksCipherText)
|
||||
{
|
||||
if (m_comboBoxProtoShadowsocksCipherText != comboBoxProtoShadowsocksCipherText) {
|
||||
m_comboBoxProtoShadowsocksCipherText = comboBoxProtoShadowsocksCipherText;
|
||||
emit comboBoxProtoShadowsocksCipherTextChanged();
|
||||
}
|
||||
}
|
||||
|
||||
QString ShadowSocksLogic::getLineEditProtoShadowsocksPortText() const
|
||||
{
|
||||
return m_lineEditProtoShadowsocksPortText;
|
||||
}
|
||||
|
||||
void ShadowSocksLogic::setLineEditProtoShadowsocksPortText(const QString &lineEditProtoShadowsocksPortText)
|
||||
{
|
||||
if (m_lineEditProtoShadowsocksPortText != lineEditProtoShadowsocksPortText) {
|
||||
m_lineEditProtoShadowsocksPortText = lineEditProtoShadowsocksPortText;
|
||||
emit lineEditProtoShadowsocksPortTextChanged();
|
||||
}
|
||||
}
|
||||
|
||||
bool ShadowSocksLogic::getPushButtonProtoShadowsocksSaveVisible() const
|
||||
{
|
||||
return m_pushButtonProtoShadowsocksSaveVisible;
|
||||
}
|
||||
|
||||
void ShadowSocksLogic::setPushButtonProtoShadowsocksSaveVisible(bool pushButtonProtoShadowsocksSaveVisible)
|
||||
{
|
||||
if (m_pushButtonProtoShadowsocksSaveVisible != pushButtonProtoShadowsocksSaveVisible) {
|
||||
m_pushButtonProtoShadowsocksSaveVisible = pushButtonProtoShadowsocksSaveVisible;
|
||||
emit pushButtonProtoShadowsocksSaveVisibleChanged();
|
||||
}
|
||||
}
|
||||
|
||||
bool ShadowSocksLogic::getProgressBarProtoShadowsocksResetVisible() const
|
||||
{
|
||||
return m_progressBarProtoShadowsocksResetVisible;
|
||||
}
|
||||
|
||||
void ShadowSocksLogic::setProgressBarProtoShadowsocksResetVisible(bool progressBarProtoShadowsocksResetVisible)
|
||||
{
|
||||
if (m_progressBarProtoShadowsocksResetVisible != progressBarProtoShadowsocksResetVisible) {
|
||||
m_progressBarProtoShadowsocksResetVisible = progressBarProtoShadowsocksResetVisible;
|
||||
emit progressBarProtoShadowsocksResetVisibleChanged();
|
||||
}
|
||||
}
|
||||
|
||||
bool ShadowSocksLogic::getLineEditProtoShadowsocksPortEnabled() const
|
||||
{
|
||||
return m_lineEditProtoShadowsocksPortEnabled;
|
||||
}
|
||||
|
||||
void ShadowSocksLogic::setLineEditProtoShadowsocksPortEnabled(bool lineEditProtoShadowsocksPortEnabled)
|
||||
{
|
||||
if (m_lineEditProtoShadowsocksPortEnabled != lineEditProtoShadowsocksPortEnabled) {
|
||||
m_lineEditProtoShadowsocksPortEnabled = lineEditProtoShadowsocksPortEnabled;
|
||||
emit lineEditProtoShadowsocksPortEnabledChanged();
|
||||
}
|
||||
}
|
||||
|
||||
bool ShadowSocksLogic::getPageProtoShadowsocksEnabled() const
|
||||
{
|
||||
return m_pageProtoShadowsocksEnabled;
|
||||
}
|
||||
|
||||
void ShadowSocksLogic::setPageProtoShadowsocksEnabled(bool pageProtoShadowsocksEnabled)
|
||||
{
|
||||
if (m_pageProtoShadowsocksEnabled != pageProtoShadowsocksEnabled) {
|
||||
m_pageProtoShadowsocksEnabled = pageProtoShadowsocksEnabled;
|
||||
emit pageProtoShadowsocksEnabledChanged();
|
||||
}
|
||||
}
|
||||
|
||||
bool ShadowSocksLogic::getLabelProtoShadowsocksInfoVisible() const
|
||||
{
|
||||
return m_labelProtoShadowsocksInfoVisible;
|
||||
}
|
||||
|
||||
void ShadowSocksLogic::setLabelProtoShadowsocksInfoVisible(bool labelProtoShadowsocksInfoVisible)
|
||||
{
|
||||
if (m_labelProtoShadowsocksInfoVisible != labelProtoShadowsocksInfoVisible) {
|
||||
m_labelProtoShadowsocksInfoVisible = labelProtoShadowsocksInfoVisible;
|
||||
emit labelProtoShadowsocksInfoVisibleChanged();
|
||||
}
|
||||
}
|
||||
|
||||
QString ShadowSocksLogic::getLabelProtoShadowsocksInfoText() const
|
||||
{
|
||||
return m_labelProtoShadowsocksInfoText;
|
||||
}
|
||||
|
||||
void ShadowSocksLogic::setLabelProtoShadowsocksInfoText(const QString &labelProtoShadowsocksInfoText)
|
||||
{
|
||||
if (m_labelProtoShadowsocksInfoText != labelProtoShadowsocksInfoText) {
|
||||
m_labelProtoShadowsocksInfoText = labelProtoShadowsocksInfoText;
|
||||
emit labelProtoShadowsocksInfoTextChanged();
|
||||
}
|
||||
}
|
||||
|
||||
int ShadowSocksLogic::getProgressBarProtoShadowsocksResetValue() const
|
||||
{
|
||||
return m_progressBarProtoShadowsocksResetValue;
|
||||
}
|
||||
|
||||
void ShadowSocksLogic::setProgressBarProtoShadowsocksResetValue(int progressBarProtoShadowsocksResetValue)
|
||||
{
|
||||
if (m_progressBarProtoShadowsocksResetValue != progressBarProtoShadowsocksResetValue) {
|
||||
m_progressBarProtoShadowsocksResetValue = progressBarProtoShadowsocksResetValue;
|
||||
emit progressBarProtoShadowsocksResetValueChanged();
|
||||
}
|
||||
}
|
||||
|
||||
int ShadowSocksLogic::getProgressBarProtoShadowsocksResetMaximium() const
|
||||
{
|
||||
return m_progressBarProtoShadowsocksResetMaximium;
|
||||
}
|
||||
|
||||
void ShadowSocksLogic::setProgressBarProtoShadowsocksResetMaximium(int progressBarProtoShadowsocksResetMaximium)
|
||||
{
|
||||
if (m_progressBarProtoShadowsocksResetMaximium != progressBarProtoShadowsocksResetMaximium) {
|
||||
m_progressBarProtoShadowsocksResetMaximium = progressBarProtoShadowsocksResetMaximium;
|
||||
emit progressBarProtoShadowsocksResetMaximiumChanged();
|
||||
}
|
||||
}
|
||||
|
||||
bool ShadowSocksLogic::getWidgetProtoSsEnabled() const
|
||||
{
|
||||
return m_widgetProtoSsEnabled;
|
||||
}
|
||||
|
||||
void ShadowSocksLogic::setWidgetProtoSsEnabled(bool widgetProtoSsEnabled)
|
||||
{
|
||||
if (m_widgetProtoSsEnabled != widgetProtoSsEnabled) {
|
||||
m_widgetProtoSsEnabled = widgetProtoSsEnabled;
|
||||
emit widgetProtoSsEnabledChanged();
|
||||
}
|
||||
}
|
||||
|
||||
void ShadowSocksLogic::onPushButtonProtoShadowsocksSaveClicked()
|
||||
{
|
||||
QJsonObject protocolConfig = m_settings.protocolConfig(m_uiLogic->selectedServerIndex, m_uiLogic->selectedDockerContainer, Protocol::ShadowSocks);
|
||||
protocolConfig = getShadowSocksConfigFromPage(protocolConfig);
|
||||
|
||||
QJsonObject containerConfig = m_settings.containerConfig(m_uiLogic->selectedServerIndex, m_uiLogic->selectedDockerContainer);
|
||||
QJsonObject newContainerConfig = containerConfig;
|
||||
newContainerConfig.insert(config_key::shadowsocks, protocolConfig);
|
||||
UiLogic::PageFunc page_proto_shadowsocks;
|
||||
page_proto_shadowsocks.setEnabledFunc = [this] (bool enabled) -> void {
|
||||
setPageProtoShadowsocksEnabled(enabled);
|
||||
};
|
||||
UiLogic::ButtonFunc pushButton_proto_shadowsocks_save;
|
||||
pushButton_proto_shadowsocks_save.setVisibleFunc = [this] (bool visible) ->void {
|
||||
setPushButtonProtoShadowsocksSaveVisible(visible);
|
||||
};
|
||||
UiLogic::LabelFunc label_proto_shadowsocks_info;
|
||||
label_proto_shadowsocks_info.setVisibleFunc = [this] (bool visible) ->void {
|
||||
setLabelProtoShadowsocksInfoVisible(visible);
|
||||
};
|
||||
label_proto_shadowsocks_info.setTextFunc = [this] (const QString& text) ->void {
|
||||
setLabelProtoShadowsocksInfoText(text);
|
||||
};
|
||||
UiLogic::ProgressFunc progressBar_proto_shadowsocks_reset;
|
||||
progressBar_proto_shadowsocks_reset.setVisibleFunc = [this] (bool visible) ->void {
|
||||
setProgressBarProtoShadowsocksResetVisible(visible);
|
||||
};
|
||||
progressBar_proto_shadowsocks_reset.setValueFunc = [this] (int value) ->void {
|
||||
setProgressBarProtoShadowsocksResetValue(value);
|
||||
};
|
||||
progressBar_proto_shadowsocks_reset.getValueFunc = [this] (void) -> int {
|
||||
return getProgressBarProtoShadowsocksResetValue();
|
||||
};
|
||||
progressBar_proto_shadowsocks_reset.getMaximiumFunc = [this] (void) -> int {
|
||||
return getProgressBarProtoShadowsocksResetMaximium();
|
||||
};
|
||||
|
||||
ErrorCode e = m_uiLogic->doInstallAction([this, containerConfig, newContainerConfig](){
|
||||
return ServerController::updateContainer(m_settings.serverCredentials(m_uiLogic->selectedServerIndex), m_uiLogic->selectedDockerContainer, containerConfig, newContainerConfig);
|
||||
},
|
||||
page_proto_shadowsocks, progressBar_proto_shadowsocks_reset,
|
||||
pushButton_proto_shadowsocks_save, label_proto_shadowsocks_info);
|
||||
|
||||
if (!e) {
|
||||
m_settings.setContainerConfig(m_uiLogic->selectedServerIndex, m_uiLogic->selectedDockerContainer, newContainerConfig);
|
||||
m_settings.clearLastConnectionConfig(m_uiLogic->selectedServerIndex, m_uiLogic->selectedDockerContainer);
|
||||
}
|
||||
qDebug() << "Protocol saved with code:" << e << "for" << m_uiLogic->selectedServerIndex << m_uiLogic->selectedDockerContainer;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,12 +10,65 @@ class ShadowSocksLogic : public QObject
|
|||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
Q_PROPERTY(bool widgetProtoSsEnabled READ getWidgetProtoSsEnabled WRITE setWidgetProtoSsEnabled NOTIFY widgetProtoSsEnabledChanged)
|
||||
Q_PROPERTY(QString comboBoxProtoShadowsocksCipherText READ getComboBoxProtoShadowsocksCipherText WRITE setComboBoxProtoShadowsocksCipherText NOTIFY comboBoxProtoShadowsocksCipherTextChanged)
|
||||
Q_PROPERTY(QString lineEditProtoShadowsocksPortText READ getLineEditProtoShadowsocksPortText WRITE setLineEditProtoShadowsocksPortText NOTIFY lineEditProtoShadowsocksPortTextChanged)
|
||||
Q_PROPERTY(bool pushButtonProtoShadowsocksSaveVisible READ getPushButtonProtoShadowsocksSaveVisible WRITE setPushButtonProtoShadowsocksSaveVisible NOTIFY pushButtonProtoShadowsocksSaveVisibleChanged)
|
||||
Q_PROPERTY(bool progressBarProtoShadowsocksResetVisible READ getProgressBarProtoShadowsocksResetVisible WRITE setProgressBarProtoShadowsocksResetVisible NOTIFY progressBarProtoShadowsocksResetVisibleChanged)
|
||||
Q_PROPERTY(bool lineEditProtoShadowsocksPortEnabled READ getLineEditProtoShadowsocksPortEnabled WRITE setLineEditProtoShadowsocksPortEnabled NOTIFY lineEditProtoShadowsocksPortEnabledChanged)
|
||||
Q_PROPERTY(bool pageProtoShadowsocksEnabled READ getPageProtoShadowsocksEnabled WRITE setPageProtoShadowsocksEnabled NOTIFY pageProtoShadowsocksEnabledChanged)
|
||||
Q_PROPERTY(bool labelProtoShadowsocksInfoVisible READ getLabelProtoShadowsocksInfoVisible WRITE setLabelProtoShadowsocksInfoVisible NOTIFY labelProtoShadowsocksInfoVisibleChanged)
|
||||
Q_PROPERTY(QString labelProtoShadowsocksInfoText READ getLabelProtoShadowsocksInfoText WRITE setLabelProtoShadowsocksInfoText NOTIFY labelProtoShadowsocksInfoTextChanged)
|
||||
Q_PROPERTY(int progressBarProtoShadowsocksResetValue READ getProgressBarProtoShadowsocksResetValue WRITE setProgressBarProtoShadowsocksResetValue NOTIFY progressBarProtoShadowsocksResetValueChanged)
|
||||
Q_PROPERTY(int progressBarProtoShadowsocksResetMaximium READ getProgressBarProtoShadowsocksResetMaximium WRITE setProgressBarProtoShadowsocksResetMaximium NOTIFY progressBarProtoShadowsocksResetMaximiumChanged)
|
||||
|
||||
Q_INVOKABLE void onPushButtonProtoShadowsocksSaveClicked();
|
||||
|
||||
public:
|
||||
explicit ShadowSocksLogic(UiLogic *uiLogic, QObject *parent = nullptr);
|
||||
~ShadowSocksLogic() = default;
|
||||
|
||||
signals:
|
||||
void updateShadowSocksPage(const QJsonObject &ssConfig, DockerContainer container, bool haveAuthData);
|
||||
QJsonObject getShadowSocksConfigFromPage(QJsonObject oldConfig);
|
||||
|
||||
bool getWidgetProtoSsEnabled() const;
|
||||
void setWidgetProtoSsEnabled(bool widgetProtoSsEnabled);
|
||||
QString getComboBoxProtoShadowsocksCipherText() const;
|
||||
void setComboBoxProtoShadowsocksCipherText(const QString &comboBoxProtoShadowsocksCipherText);
|
||||
QString getLineEditProtoShadowsocksPortText() const;
|
||||
void setLineEditProtoShadowsocksPortText(const QString &lineEditProtoShadowsocksPortText);
|
||||
|
||||
bool getPushButtonProtoShadowsocksSaveVisible() const;
|
||||
void setPushButtonProtoShadowsocksSaveVisible(bool pushButtonProtoShadowsocksSaveVisible);
|
||||
bool getProgressBarProtoShadowsocksResetVisible() const;
|
||||
void setProgressBarProtoShadowsocksResetVisible(bool progressBarProtoShadowsocksResetVisible);
|
||||
bool getLineEditProtoShadowsocksPortEnabled() const;
|
||||
void setLineEditProtoShadowsocksPortEnabled(bool lineEditProtoShadowsocksPortEnabled);
|
||||
|
||||
bool getPageProtoShadowsocksEnabled() const;
|
||||
void setPageProtoShadowsocksEnabled(bool pageProtoShadowsocksEnabled);
|
||||
bool getLabelProtoShadowsocksInfoVisible() const;
|
||||
void setLabelProtoShadowsocksInfoVisible(bool labelProtoShadowsocksInfoVisible);
|
||||
QString getLabelProtoShadowsocksInfoText() const;
|
||||
void setLabelProtoShadowsocksInfoText(const QString &labelProtoShadowsocksInfoText);
|
||||
int getProgressBarProtoShadowsocksResetValue() const;
|
||||
void setProgressBarProtoShadowsocksResetValue(int progressBarProtoShadowsocksResetValue);
|
||||
int getProgressBarProtoShadowsocksResetMaximium() const;
|
||||
void setProgressBarProtoShadowsocksResetMaximium(int progressBarProtoShadowsocksResetMaximium);
|
||||
|
||||
signals:
|
||||
void widgetProtoSsEnabledChanged();
|
||||
void comboBoxProtoShadowsocksCipherTextChanged();
|
||||
void lineEditProtoShadowsocksPortTextChanged();
|
||||
void pushButtonProtoShadowsocksSaveVisibleChanged();
|
||||
void progressBarProtoShadowsocksResetVisibleChanged();
|
||||
void lineEditProtoShadowsocksPortEnabledChanged();
|
||||
void pageProtoShadowsocksEnabledChanged();
|
||||
void labelProtoShadowsocksInfoVisibleChanged();
|
||||
void labelProtoShadowsocksInfoTextChanged();
|
||||
void progressBarProtoShadowsocksResetValueChanged();
|
||||
void progressBarProtoShadowsocksResetMaximiumChanged();
|
||||
|
||||
private:
|
||||
|
||||
|
|
@ -28,7 +81,17 @@ private:
|
|||
Settings m_settings;
|
||||
UiLogic *m_uiLogic;
|
||||
|
||||
|
||||
bool m_widgetProtoSsEnabled;
|
||||
QString m_comboBoxProtoShadowsocksCipherText;
|
||||
QString m_lineEditProtoShadowsocksPortText;
|
||||
bool m_pushButtonProtoShadowsocksSaveVisible;
|
||||
bool m_progressBarProtoShadowsocksResetVisible;
|
||||
bool m_lineEditProtoShadowsocksPortEnabled;
|
||||
bool m_pageProtoShadowsocksEnabled;
|
||||
bool m_labelProtoShadowsocksInfoVisible;
|
||||
QString m_labelProtoShadowsocksInfoText;
|
||||
int m_progressBarProtoShadowsocksResetValue;
|
||||
int m_progressBarProtoShadowsocksResetMaximium;
|
||||
|
||||
};
|
||||
#endif // SHADOWSOCKS_LOGIC_H
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue