mirror of
https://github.com/amnezia-vpn/amnezia-client.git
synced 2026-06-21 02:01:03 +07:00
fix: xray stability and split-tunneling (#2187)
* 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
This commit is contained in:
@@ -40,6 +40,14 @@ void IpcServerProcess::start()
|
||||
m_process->waitForStarted();
|
||||
}
|
||||
|
||||
void IpcServerProcess::terminate() {
|
||||
m_process->terminate();
|
||||
}
|
||||
|
||||
void IpcServerProcess::kill() {
|
||||
m_process->kill();
|
||||
}
|
||||
|
||||
void IpcServerProcess::close()
|
||||
{
|
||||
m_process->close();
|
||||
@@ -47,7 +55,7 @@ void IpcServerProcess::close()
|
||||
|
||||
void IpcServerProcess::setArguments(const QStringList &arguments)
|
||||
{
|
||||
m_process->setArguments(arguments);
|
||||
m_process->setArguments(amnezia::sanitizeArguments(m_program, arguments));
|
||||
}
|
||||
|
||||
void IpcServerProcess::setInputChannelMode(QProcess::InputChannelMode mode)
|
||||
@@ -69,7 +77,9 @@ void IpcServerProcess::setProcessChannelMode(QProcess::ProcessChannelMode mode)
|
||||
|
||||
void IpcServerProcess::setProgram(int programId)
|
||||
{
|
||||
m_process->setProgram(amnezia::permittedProcessPath(static_cast<amnezia::PermittedProcess>(programId)));
|
||||
m_program = static_cast<amnezia::PermittedProcess>(programId);
|
||||
m_process->setProgram(amnezia::permittedProcessPath(m_program));
|
||||
m_process->setArguments({});
|
||||
}
|
||||
|
||||
void IpcServerProcess::setWorkingDirectory(const QString &dir)
|
||||
@@ -92,4 +102,20 @@ QByteArray IpcServerProcess::readAllStandardOutput()
|
||||
return m_process->readAllStandardOutput();
|
||||
}
|
||||
|
||||
bool IpcServerProcess::waitForStarted() {
|
||||
return m_process->waitForStarted();
|
||||
}
|
||||
|
||||
bool IpcServerProcess::waitForStarted(int msecs) {
|
||||
return m_process->waitForStarted(msecs);
|
||||
}
|
||||
|
||||
bool IpcServerProcess::waitForFinished() {
|
||||
return m_process->waitForFinished();
|
||||
}
|
||||
|
||||
bool IpcServerProcess::waitForFinished(int msecs) {
|
||||
return m_process->waitForFinished(msecs);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user