mirror of
https://github.com/amnezia-vpn/amnezia-client.git
synced 2026-05-08 14:33:23 +00:00
911a999c64
* fix: xray heap corruption * fix: use proper configuration for split-tunneled apps * chore: enable killswitch * chore: xray windows split-tunneling cleanup * chore: proper xray killswitch log * feat: add wait for the tun device * chore: update amnezia_xray deps for macos * fix: add nullptr check for split-tunnel on win * fix: modernize vpnAdapter grabbing function * fix: remove network watcher due to its fragileness * chore: xrayprotocol cleanup * fix: correct wrong iface index on win * chore: move tun2socks implementation to the client from the service * chore: xrayprotocol cleanup * chore: more xrayprotocol cleanup * fix: consistent tun device with GUID specified * chore: tun2socks logs * chore: PrivilegedProcess cleanup * better error handling in establishment phase * terminate&kill ops for remote process * fix: straighforward killing the process on windows * fix: finally remove GUID setting from tun2socks due to instability * fix: add sanitizer to ipc process * chore: do not collect sensitive info from tun2socks
103 lines
2.4 KiB
C++
103 lines
2.4 KiB
C++
#ifndef IPC_H
|
|
#define IPC_H
|
|
|
|
#include <QObject>
|
|
#include <QString>
|
|
|
|
#include "../client/utilities.h"
|
|
|
|
#define IPC_SERVICE_URL "local:AmneziaVpnIpcInterface"
|
|
|
|
namespace amnezia {
|
|
|
|
enum PermittedProcess {
|
|
Invalid,
|
|
OpenVPN,
|
|
Wireguard,
|
|
Tun2Socks,
|
|
CertUtil
|
|
};
|
|
|
|
inline QString permittedProcessPath(PermittedProcess pid)
|
|
{
|
|
switch (pid) {
|
|
case PermittedProcess::OpenVPN:
|
|
return Utils::openVpnExecPath();
|
|
case PermittedProcess::Wireguard:
|
|
return Utils::wireguardExecPath();
|
|
case PermittedProcess::CertUtil:
|
|
return Utils::certUtilPath();
|
|
case PermittedProcess::Tun2Socks:
|
|
return Utils::tun2socksPath();
|
|
default:
|
|
return "";
|
|
}
|
|
}
|
|
|
|
|
|
inline QString getIpcServiceUrl() {
|
|
#ifdef Q_OS_WIN
|
|
return IPC_SERVICE_URL;
|
|
#else
|
|
return QString("/tmp/%1").arg(IPC_SERVICE_URL);
|
|
#endif
|
|
}
|
|
|
|
inline QString getIpcProcessUrl(int pid) {
|
|
#ifdef Q_OS_WIN
|
|
return QString("%1_%2").arg(IPC_SERVICE_URL).arg(pid);
|
|
#else
|
|
return QString("/tmp/%1_%2").arg(IPC_SERVICE_URL).arg(pid);
|
|
#endif
|
|
}
|
|
|
|
inline QStringList sanitizeArguments(PermittedProcess proc, const QStringList &args) {
|
|
using Validator = std::function<bool(const QString&)>;
|
|
QMap<QString, Validator> namedArgs;
|
|
QList<Validator> positionalArgs;
|
|
|
|
switch (proc) {
|
|
case Tun2Socks:
|
|
namedArgs["-device"] = [](const QString& v) { return v.startsWith("tun://"); };
|
|
namedArgs["-proxy"] = [](const QString& v) { return v.startsWith("socks5://"); };
|
|
break;
|
|
default:
|
|
//FIXME
|
|
return args;
|
|
}
|
|
|
|
|
|
QStringList sanitized;
|
|
|
|
for (int i = 0, pos = 0; i < args.size(); i++) {
|
|
const auto& key = args[i];
|
|
|
|
if (const auto found = namedArgs.find(key); found != namedArgs.end()) {
|
|
const auto validator = found.value();
|
|
|
|
if (validator) {
|
|
if (i + 1 < args.size()) {
|
|
const auto& value = args[i+1];
|
|
if (validator(value)) {
|
|
sanitized << key << value;
|
|
i++;
|
|
}
|
|
}
|
|
} else {
|
|
sanitized << key;
|
|
}
|
|
} else if (pos < positionalArgs.size()) {
|
|
if (const auto validator = positionalArgs[pos]; validator && validator(key)) {
|
|
sanitized << key;
|
|
pos++;
|
|
}
|
|
}
|
|
}
|
|
|
|
return sanitized;
|
|
}
|
|
|
|
} // namespace amnezia
|
|
|
|
#endif // IPC_H
|