mirror of
https://github.com/amnezia-vpn/amnezia-client.git
synced 2026-05-17 08:16:06 +03:00
* refactor: move business logic from servers model * refactor: move containersModel initialization * refactor: added protocol ui controller and removed settings class from protocols model * refactor: moved cli management to separate controller * refactor: moved app split to separate controller * refactor: moved site split to separate controller * refactor: moved allowed dns to separate controller * refactor: moved language logic to separate ui controller * refactor: removed Settings from devices model * refactor: moved configs and services api logit to separate core controller * refactor: added a layer with a repository between the storage and controllers * refactor: use child parent system instead of smart pointers for controllers and models initialization * refactor: moved install functions from server controller to install controller * refactor: install controller refactoring * chore: renamed exportController to exportUiController * refactor: separate export controller * refactor: removed VpnConfigurationsController * chore: renamed ServerController to SshSession * refactor: replaced ServerController to SshSession * chore: moved qml controllers to separate folder * chore: include fixes * chore: moved utils from core root to core/utils * chore: include fixes * chore: rename core/utils files to camelCase foramt * chore: include fixes * chore: moved some utils to api and selfhosted folders * chore: include fixes * chore: remove unused file * chore: moved serialization folder to core/utils * chore: include fixes * chore: moved some files from client root to core/utils * chore: include fixes * chore: moved ui utils to ui/utils folder * chore: include fixes * chore: move utils from root to ui/utils * chore: include fixes * chore: moved configurators to core/configurators * chore: include fixes * refactor: moved iap logic from ui controller to core * refactor: moved remaining core logic from ApiConfigsController to SubscriptionController * chore: rename apiNewsController to apiNewsUiController * refactor: moved core logic from news ui controller to core * chore: renamed apiConfigsController to subscriptionUiController * chore: include fixes * refactor: merge ApiSettingsController with SubscriptionUiController * chore: moved ui selfhosted controllers to separate folder * chore: include fixes * chore: rename connectionController to connectiomUiController * refactor: moved core logic from connectionUiController * chore: rename settingsController to settingsUiController * refactor: move core logic from settingsUiController * refactor: moved core controller signal/slot connections to separate class * fix: newsController fixes after refactoring * chore: rename model to camelCase * chore: include fixes * chore: remove unused code * chore: move selfhosted core to separate folder * chore: include fixes * chore: rename importController to importUiController * refactor: move core logic from importUiController * chore: minor fixes * chore: remove prem v1 migration * refactor: remove openvpn over cloak and openvpn over shadowsocks * refactor: removed protocolsForContainer function * refactor: add core models * refactor: replace json with c++ structs for server config * refactor: move getDnsPair to ServerConfigUtils * feat: add admin selfhosted config export test * feat: add multi import test * refactor: use coreController for tests * feat: add few simple tests * chore: qrepos in all core controllers * feat: add test for settings * refactor: remove repo dependency from configurators * chore: moved protocols to core folder * chore: include fixes * refactor: moved containersDefs, defs, apiDefs, protocolsDefs to different places * chore: include fixes * chore: build fixes * chore: build fixes * refactor: remove q repo and interface repo * feat: add test for ui servers model and controller * chore: renamed to camelCase * chore: include fixes * refactor: moved core logic from sites ui controller * fix: fixed api config processing * fix: fixed processed server index processing * refactor: protocol models now use c++ structs instead of json configs * refactor: servers model now use c++ struct instead of json config * fix: fixed default server index processing * fix: fix logs init * fix: fix secure settings load keys * chore: build fixes * fix: fixed clear settings * fix: fixed restore backup * fix: sshSession usage * fix: fixed export functions signatures * fix: return missing part from buildContainerWorker * fix: fixed server description on page home * refactor: add container config helpers functions * refactor: c++ structs instead of json * chore: add dns protocol config struct * refactor: move config utils functions to config structs * feat: add test for selfhosted server setup * refactor: separate resources.qrc * fix: fixed server rename * chore: return nameOverriddenByUser * fix: build fixes * fix: fixed models init * refactor: cleanup models usage * fix: fixed models init * chore: cleanup connections and functions signatures * chore: cleanup updateModel calls * feat: added cache to servers repo * chore: cleanup unused functions * chore: ssxray processing * chore: remove transportProtoWithDefault and portWithDefault functions * chore: removed proto types any and l2tp * refactor: moved some constants * fix: fixed native configs export * refactor: remove json from processConfigWith functions * fix: fixed processed server index usage * fix: qml warning fixes * chore: merge fixes * chore: update tests * fix: fixed xray config processing * fix: fixed split tunneling processing * chore: rename sites controllers and model * chore: rename fixes * chore: minor fixes * chore: remove ability to load backup from "file with connection settings" button * fix: fixed api device revoke * fix: remove full model update when renaming a user * fix: fixed premium/free server rename * fix: fixed selfhosted new server install * fix: fixed updateContainer function * fix: fixed revoke for external premium configs * feat: add native configs qr processing * chore: codestyle fixes * fix: fixed admin config create * chore: again remove ability to load backup from "file with connection settings" button * chore: minor fixes * fix: fixed variables initialization * fix: fixed qml imports * fix: minor fixes * fix: fix vpnConnection function calls * feat: add buckup error handling * fix: fixed admin config revok * fix: fixed selfhosted awg installation * fix: ad visability * feat: add empty check for primary dns * chore: minor fixes
144 lines
4.9 KiB
C++
144 lines
4.9 KiB
C++
#include <QString>
|
|
#include <QJsonArray>
|
|
#include <QJsonObject>
|
|
#include <QList>
|
|
#include <QHostAddress>
|
|
#include <QRandomGenerator>
|
|
#include <QTcpServer>
|
|
#include <stdexcept>
|
|
#include "3rd/QJsonStruct/QJsonIO.hpp"
|
|
#include "transfer.h"
|
|
#include "serialization.h"
|
|
|
|
namespace amnezia::serialization::inbounds
|
|
{
|
|
|
|
//"inbounds": [
|
|
// {
|
|
// "listen": "127.0.0.1",
|
|
// "port": 10808,
|
|
// "protocol": "socks",
|
|
// "settings": {
|
|
// "auth": "password",
|
|
// "accounts": [{"user": "...", "pass": "..."}],
|
|
// "udp": true
|
|
// }
|
|
// }
|
|
//],
|
|
|
|
const static QString listen = "127.0.0.1";
|
|
const static int defaultPort = 10808;
|
|
const static QString protocol = "socks";
|
|
|
|
static int indexOfSocksInbound(const QJsonArray &inbounds)
|
|
{
|
|
for (int i = 0; i < inbounds.size(); ++i) {
|
|
const QString p = inbounds.at(i).toObject().value(QLatin1String("protocol")).toString();
|
|
if (p.compare(QLatin1String("socks"), Qt::CaseInsensitive) == 0)
|
|
return i;
|
|
}
|
|
return -1;
|
|
}
|
|
|
|
// Ask the OS for a free TCP port on loopback (same stack as inbound "listen": "127.0.0.1").
|
|
static int acquireFreeLocalPort()
|
|
{
|
|
QTcpServer probe;
|
|
if (!probe.listen(QHostAddress(QStringLiteral("127.0.0.1")), 0)) {
|
|
throw std::runtime_error(
|
|
"Failed to bind a local TCP port on 127.0.0.1 for SOCKS inbound "
|
|
"(QTcpServer::listen failed; possible permission or OS network error).");
|
|
}
|
|
return static_cast<int>(probe.serverPort());
|
|
}
|
|
|
|
// Generates a hex string of `byteCount` random bytes (URL-safe, no special chars).
|
|
static QString generateRandomHex(int byteCount)
|
|
{
|
|
if (byteCount <= 0)
|
|
return {};
|
|
// fillRange writes full quint32 words; size the buffer to a multiple of 4 bytes to avoid
|
|
// overrunning a short buffer when byteCount is not divisible by 4.
|
|
const int numUint32 = (byteCount + int(sizeof(quint32)) - 1) / int(sizeof(quint32));
|
|
QByteArray buf(numUint32 * int(sizeof(quint32)), '\0');
|
|
QRandomGenerator::system()->fillRange(reinterpret_cast<quint32 *>(buf.data()), numUint32);
|
|
return QString::fromLatin1(buf.left(byteCount).toHex());
|
|
}
|
|
|
|
QJsonObject GenerateInboundEntry()
|
|
{
|
|
QJsonObject root;
|
|
QJsonIO::SetValue(root, listen, "listen");
|
|
QJsonIO::SetValue(root, defaultPort, "port");
|
|
QJsonIO::SetValue(root, protocol, "protocol");
|
|
QJsonIO::SetValue(root, true, "settings", "udp");
|
|
return root;
|
|
}
|
|
|
|
InboundCredentials GetInboundCredentials(const QJsonObject &xrayConfig)
|
|
{
|
|
InboundCredentials creds;
|
|
creds.port = defaultPort;
|
|
|
|
const QJsonArray inbounds = xrayConfig.value("inbounds").toArray();
|
|
const int socksIdx = indexOfSocksInbound(inbounds);
|
|
if (socksIdx < 0)
|
|
return creds;
|
|
|
|
const QJsonObject inbound = inbounds.at(socksIdx).toObject();
|
|
creds.port = inbound.value("port").toInt(defaultPort);
|
|
|
|
const QJsonObject settings = inbound.value("settings").toObject();
|
|
const QJsonArray accounts = settings.value("accounts").toArray();
|
|
if (accounts.isEmpty())
|
|
return creds;
|
|
|
|
const QJsonObject account = accounts.first().toObject();
|
|
creds.username = account.value("user").toString();
|
|
creds.password = account.value("pass").toString();
|
|
return creds;
|
|
}
|
|
|
|
InboundCredentials EnsureInboundAuth(QJsonObject &xrayConfig)
|
|
{
|
|
QJsonArray inbounds = xrayConfig.value("inbounds").toArray();
|
|
const int socksIdx = indexOfSocksInbound(inbounds);
|
|
if (socksIdx < 0)
|
|
return GetInboundCredentials(xrayConfig); // no SOCKS inbound to patch
|
|
|
|
QJsonObject inbound = inbounds.at(socksIdx).toObject();
|
|
InboundCredentials creds;
|
|
creds.port = acquireFreeLocalPort();
|
|
inbound["port"] = creds.port;
|
|
|
|
QJsonObject settings = inbound.value("settings").toObject();
|
|
const QJsonArray accounts = settings.value("accounts").toArray();
|
|
if (!accounts.isEmpty()) {
|
|
const QJsonObject account = accounts.first().toObject();
|
|
creds.username = account.value("user").toString();
|
|
creds.password = account.value("pass").toString();
|
|
}
|
|
|
|
if (creds.username.isEmpty() || creds.password.isEmpty()) {
|
|
// Generate fresh credentials for this session (never persisted)
|
|
creds.username = generateRandomHex(8); // 16 hex chars
|
|
creds.password = generateRandomHex(16); // 32 hex chars
|
|
QJsonObject account;
|
|
account["user"] = creds.username;
|
|
account["pass"] = creds.password;
|
|
settings["accounts"] = QJsonArray{ account };
|
|
}
|
|
|
|
// Always ensure auth mode is enforced, even for imported configs that had
|
|
// accounts but auth: "noauth" (or no auth field at all).
|
|
settings["auth"] = QStringLiteral("password");
|
|
inbound["settings"] = settings;
|
|
inbounds[socksIdx] = inbound;
|
|
xrayConfig["inbounds"] = inbounds;
|
|
|
|
return creds;
|
|
}
|
|
|
|
} // namespace amnezia::serialization::inbounds
|
|
|