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

ShadowSocks password - sha256

Browse source
This commit is contained in:
pokamest 2021-03-13 14:16:24 +03:00
parent 02f966bc67
commit a2bb382652
3 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
client/core/servercontroller.cpp
View file

@ -1,5 +1,6 @@
#include "servercontroller.h" #include "servercontroller.h"
#include <QCryptographicHash>
#include <QFile> #include <QFile>
#include <QEventLoop> #include <QEventLoop>
#include <QLoggingCategory> #include <QLoggingCategory>
@ -107,7 +108,7 @@ ErrorCode ServerController::uploadTextFileToContainer(DockerContainer container,
QString script = QString("docker exec -i %1 sh -c \"echo \'%2\' > %3\""). QString script = QString("docker exec -i %1 sh -c \"echo \'%2\' > %3\"").
arg(getContainerName(container)).arg(file).arg(path); arg(getContainerName(container)).arg(file).arg(path);
qDebug().noquote() << script; // qDebug().noquote() << "uploadTextFileToContainer\n" << script;
SshConnection *client = connectToHost(sshParams(credentials)); SshConnection *client = connectToHost(sshParams(credentials));
if (client->state() != SshConnection::State::Connected) { if (client->state() != SshConnection::State::Connected) {
@ -389,7 +390,8 @@ ErrorCode ServerController::setupShadowSocksServer(const ServerCredentials &cred
ssConfig.insert("server", "0.0.0.0"); ssConfig.insert("server", "0.0.0.0");
ssConfig.insert("server_port", ssRemotePort()); ssConfig.insert("server_port", ssRemotePort());
ssConfig.insert("local_port", ssContainerPort()); ssConfig.insert("local_port", ssContainerPort());
ssConfig.insert("password", credentials.password); ssConfig.insert("password", QString(QCryptographicHash::hash(credentials.password.toUtf8(), QCryptographicHash::Sha256).toHex()));
//ssConfig.insert("password", credentials.password);
ssConfig.insert("timeout", 60); ssConfig.insert("timeout", 60);
ssConfig.insert("method", ssEncryption()); ssConfig.insert("method", ssEncryption());
QString configData = QJsonDocument(ssConfig).toJson(); QString configData = QJsonDocument(ssConfig).toJson();

4
client/protocols/shadowsocksvpnprotocol.cpp
View file

@ -4,6 +4,7 @@
#include "debug.h" #include "debug.h"
#include "utils.h" #include "utils.h"
#include <QCryptographicHash>
#include <QJsonDocument> #include <QJsonDocument>
#include <QJsonObject> #include <QJsonObject>
@ -71,7 +72,8 @@ QJsonObject ShadowSocksVpnProtocol::genShadowSocksConfig(const ServerCredentials
ssConfig.insert("server", credentials.hostName); ssConfig.insert("server", credentials.hostName);
ssConfig.insert("server_port", ServerController::ssRemotePort()); ssConfig.insert("server_port", ServerController::ssRemotePort());
ssConfig.insert("local_port", ServerController::ssContainerPort()); ssConfig.insert("local_port", ServerController::ssContainerPort());
ssConfig.insert("password", credentials.password); ssConfig.insert("password", QString(QCryptographicHash::hash(credentials.password.toUtf8(), QCryptographicHash::Sha256).toHex()));
//ssConfig.insert("password", credentials.password);
ssConfig.insert("timeout", 60); ssConfig.insert("timeout", 60);
ssConfig.insert("method", ServerController::ssEncryption()); ssConfig.insert("method", ServerController::ssEncryption());
return ssConfig; return ssConfig;

4
client/vpnconnection.cpp
View file

@ -99,12 +99,16 @@ ErrorCode VpnConnection::createVpnConfiguration(const ServerCredentials &credent
QJsonObject ssConfigData = ShadowSocksVpnProtocol::genShadowSocksConfig(credentials); QJsonObject ssConfigData = ShadowSocksVpnProtocol::genShadowSocksConfig(credentials);
m_vpnConfiguration.insert(config::key_shadowsocks_config_data(), ssConfigData); m_vpnConfiguration.insert(config::key_shadowsocks_config_data(), ssConfigData);
} }
//qDebug().noquote() << "VPN config" << QJsonDocument(m_vpnConfiguration).toJson();
return ErrorCode::NoError; return ErrorCode::NoError;
} }
ErrorCode VpnConnection::connectToVpn(const ServerCredentials &credentials, Protocol protocol) ErrorCode VpnConnection::connectToVpn(const ServerCredentials &credentials, Protocol protocol)
{ {
qDebug() << "connectToVpn, CustomRouting is" << m_settings.customRouting(); qDebug() << "connectToVpn, CustomRouting is" << m_settings.customRouting();
// qDebug() << "Cred" << m_settings.serverCredentials().hostName <<
// m_settings.serverCredentials().password;
protocol = Protocol::ShadowSocks; protocol = Protocol::ShadowSocks;
// TODO: Try protocols one by one in case of Protocol::Any // TODO: Try protocols one by one in case of Protocol::Any