diff --git a/AmneziaVPN.pro b/AmneziaVPN.pro old mode 100644 new mode 100755 diff --git a/LICENSE b/LICENSE old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/client/3rd/QRCodeGenerator/QRCodeGenerator.cpp b/client/3rd/QRCodeGenerator/QRCodeGenerator.cpp old mode 100644 new mode 100755 diff --git a/client/3rd/QRCodeGenerator/QRCodeGenerator.h b/client/3rd/QRCodeGenerator/QRCodeGenerator.h old mode 100644 new mode 100755 diff --git a/client/3rd/QRCodeGenerator/QRCodeGenerator.pri b/client/3rd/QRCodeGenerator/QRCodeGenerator.pri old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/.gitignore b/client/3rd/QtSsh/.gitignore old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/.qmake.conf b/client/3rd/QtSsh/.qmake.conf old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/QtSsh.pro b/client/3rd/QtSsh/QtSsh.pro old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/README.md b/client/3rd/QtSsh/README.md old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/examples/examples.pro b/client/3rd/QtSsh/examples/examples.pro old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/examples/gitlab/Qml.qrc b/client/3rd/QtSsh/examples/gitlab/Qml.qrc old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/examples/gitlab/Qml/Main.qml b/client/3rd/QtSsh/examples/gitlab/Qml/Main.qml old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/examples/gitlab/Src/Main.cpp b/client/3rd/QtSsh/examples/gitlab/Src/Main.cpp old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/examples/gitlab/Src/Ssh.cpp b/client/3rd/QtSsh/examples/gitlab/Src/Ssh.cpp old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/examples/gitlab/Src/Ssh.hpp b/client/3rd/QtSsh/examples/gitlab/Src/Ssh.hpp old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/examples/gitlab/gitlab.pro b/client/3rd/QtSsh/examples/gitlab/gitlab.pro old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/botan/botan.cpp b/client/3rd/QtSsh/src/botan/botan.cpp old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/botan/botan.h b/client/3rd/QtSsh/src/botan/botan.h old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/botan/botan.pri b/client/3rd/QtSsh/src/botan/botan.pri old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/botan/configure.py b/client/3rd/QtSsh/src/botan/configure.py old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/botan/doc/license.txt b/client/3rd/QtSsh/src/botan/doc/license.txt old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/botan/readme.txt b/client/3rd/QtSsh/src/botan/readme.txt old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/src.pro b/client/3rd/QtSsh/src/src.pro old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sftpchannel.cpp b/client/3rd/QtSsh/src/ssh/sftpchannel.cpp old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sftpchannel.h b/client/3rd/QtSsh/src/ssh/sftpchannel.h old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sftpchannel_p.h b/client/3rd/QtSsh/src/ssh/sftpchannel_p.h old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sftpdefs.cpp b/client/3rd/QtSsh/src/ssh/sftpdefs.cpp old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sftpdefs.h b/client/3rd/QtSsh/src/ssh/sftpdefs.h old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sftpfilesystemmodel.cpp b/client/3rd/QtSsh/src/ssh/sftpfilesystemmodel.cpp old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sftpfilesystemmodel.h b/client/3rd/QtSsh/src/ssh/sftpfilesystemmodel.h old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sftpincomingpacket.cpp b/client/3rd/QtSsh/src/ssh/sftpincomingpacket.cpp old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sftpincomingpacket_p.h b/client/3rd/QtSsh/src/ssh/sftpincomingpacket_p.h old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sftpoperation.cpp b/client/3rd/QtSsh/src/ssh/sftpoperation.cpp old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sftpoperation_p.h b/client/3rd/QtSsh/src/ssh/sftpoperation_p.h old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sftpoutgoingpacket.cpp b/client/3rd/QtSsh/src/ssh/sftpoutgoingpacket.cpp old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sftpoutgoingpacket_p.h b/client/3rd/QtSsh/src/ssh/sftpoutgoingpacket_p.h old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sftppacket.cpp b/client/3rd/QtSsh/src/ssh/sftppacket.cpp old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sftppacket_p.h b/client/3rd/QtSsh/src/ssh/sftppacket_p.h old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/ssh.pri b/client/3rd/QtSsh/src/ssh/ssh.pri old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/ssh.pro b/client/3rd/QtSsh/src/ssh/ssh.pro old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/ssh_dependencies.pri b/client/3rd/QtSsh/src/ssh/ssh_dependencies.pri old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/ssh_global.h b/client/3rd/QtSsh/src/ssh/ssh_global.h old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sshbotanconversions_p.h b/client/3rd/QtSsh/src/ssh/sshbotanconversions_p.h old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sshcapabilities.cpp b/client/3rd/QtSsh/src/ssh/sshcapabilities.cpp old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sshcapabilities_p.h b/client/3rd/QtSsh/src/ssh/sshcapabilities_p.h old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sshchannel.cpp b/client/3rd/QtSsh/src/ssh/sshchannel.cpp old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sshchannel_p.h b/client/3rd/QtSsh/src/ssh/sshchannel_p.h old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sshchannelmanager.cpp b/client/3rd/QtSsh/src/ssh/sshchannelmanager.cpp old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sshchannelmanager_p.h b/client/3rd/QtSsh/src/ssh/sshchannelmanager_p.h old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sshconnection.cpp b/client/3rd/QtSsh/src/ssh/sshconnection.cpp old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sshconnection.h b/client/3rd/QtSsh/src/ssh/sshconnection.h old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sshconnection_p.h b/client/3rd/QtSsh/src/ssh/sshconnection_p.h old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sshconnectionmanager.cpp b/client/3rd/QtSsh/src/ssh/sshconnectionmanager.cpp old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sshconnectionmanager.h b/client/3rd/QtSsh/src/ssh/sshconnectionmanager.h old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sshcryptofacility.cpp b/client/3rd/QtSsh/src/ssh/sshcryptofacility.cpp old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sshcryptofacility_p.h b/client/3rd/QtSsh/src/ssh/sshcryptofacility_p.h old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sshdirecttcpiptunnel.cpp b/client/3rd/QtSsh/src/ssh/sshdirecttcpiptunnel.cpp old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sshdirecttcpiptunnel.h b/client/3rd/QtSsh/src/ssh/sshdirecttcpiptunnel.h old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sshdirecttcpiptunnel_p.h b/client/3rd/QtSsh/src/ssh/sshdirecttcpiptunnel_p.h old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/ssherrors.h b/client/3rd/QtSsh/src/ssh/ssherrors.h old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sshexception_p.h b/client/3rd/QtSsh/src/ssh/sshexception_p.h old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sshforwardedtcpiptunnel.cpp b/client/3rd/QtSsh/src/ssh/sshforwardedtcpiptunnel.cpp old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sshforwardedtcpiptunnel.h b/client/3rd/QtSsh/src/ssh/sshforwardedtcpiptunnel.h old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sshforwardedtcpiptunnel_p.h b/client/3rd/QtSsh/src/ssh/sshforwardedtcpiptunnel_p.h old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sshhostkeydatabase.cpp b/client/3rd/QtSsh/src/ssh/sshhostkeydatabase.cpp old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sshhostkeydatabase.h b/client/3rd/QtSsh/src/ssh/sshhostkeydatabase.h old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sshincomingpacket.cpp b/client/3rd/QtSsh/src/ssh/sshincomingpacket.cpp old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sshincomingpacket_p.h b/client/3rd/QtSsh/src/ssh/sshincomingpacket_p.h old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sshinit.cpp b/client/3rd/QtSsh/src/ssh/sshinit.cpp old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sshinit_p.h b/client/3rd/QtSsh/src/ssh/sshinit_p.h old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sshkeycreationdialog.cpp b/client/3rd/QtSsh/src/ssh/sshkeycreationdialog.cpp old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sshkeycreationdialog.h b/client/3rd/QtSsh/src/ssh/sshkeycreationdialog.h old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sshkeycreationdialog.ui b/client/3rd/QtSsh/src/ssh/sshkeycreationdialog.ui old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sshkeyexchange.cpp b/client/3rd/QtSsh/src/ssh/sshkeyexchange.cpp old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sshkeyexchange_p.h b/client/3rd/QtSsh/src/ssh/sshkeyexchange_p.h old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sshkeygenerator.cpp b/client/3rd/QtSsh/src/ssh/sshkeygenerator.cpp old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sshkeygenerator.h b/client/3rd/QtSsh/src/ssh/sshkeygenerator.h old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sshkeypasswordretriever.cpp b/client/3rd/QtSsh/src/ssh/sshkeypasswordretriever.cpp old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sshkeypasswordretriever_p.h b/client/3rd/QtSsh/src/ssh/sshkeypasswordretriever_p.h old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sshlogging.cpp b/client/3rd/QtSsh/src/ssh/sshlogging.cpp old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sshlogging_p.h b/client/3rd/QtSsh/src/ssh/sshlogging_p.h old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sshoutgoingpacket.cpp b/client/3rd/QtSsh/src/ssh/sshoutgoingpacket.cpp old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sshoutgoingpacket_p.h b/client/3rd/QtSsh/src/ssh/sshoutgoingpacket_p.h old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sshpacket.cpp b/client/3rd/QtSsh/src/ssh/sshpacket.cpp old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sshpacket_p.h b/client/3rd/QtSsh/src/ssh/sshpacket_p.h old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sshpacketparser.cpp b/client/3rd/QtSsh/src/ssh/sshpacketparser.cpp old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sshpacketparser_p.h b/client/3rd/QtSsh/src/ssh/sshpacketparser_p.h old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sshpseudoterminal.h b/client/3rd/QtSsh/src/ssh/sshpseudoterminal.h old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sshremoteprocess.cpp b/client/3rd/QtSsh/src/ssh/sshremoteprocess.cpp old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sshremoteprocess.h b/client/3rd/QtSsh/src/ssh/sshremoteprocess.h old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sshremoteprocess_p.h b/client/3rd/QtSsh/src/ssh/sshremoteprocess_p.h old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sshremoteprocessrunner.cpp b/client/3rd/QtSsh/src/ssh/sshremoteprocessrunner.cpp old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sshremoteprocessrunner.h b/client/3rd/QtSsh/src/ssh/sshremoteprocessrunner.h old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sshsendfacility.cpp b/client/3rd/QtSsh/src/ssh/sshsendfacility.cpp old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sshsendfacility_p.h b/client/3rd/QtSsh/src/ssh/sshsendfacility_p.h old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sshtcpipforwardserver.cpp b/client/3rd/QtSsh/src/ssh/sshtcpipforwardserver.cpp old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sshtcpipforwardserver.h b/client/3rd/QtSsh/src/ssh/sshtcpipforwardserver.h old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sshtcpipforwardserver_p.h b/client/3rd/QtSsh/src/ssh/sshtcpipforwardserver_p.h old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sshtcpiptunnel.cpp b/client/3rd/QtSsh/src/ssh/sshtcpiptunnel.cpp old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/src/ssh/sshtcpiptunnel_p.h b/client/3rd/QtSsh/src/ssh/sshtcpiptunnel_p.h old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/sync.profile b/client/3rd/QtSsh/sync.profile old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/tests/auto/auto.pro b/client/3rd/QtSsh/tests/auto/auto.pro old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/tests/auto/cmake/cmake.pro b/client/3rd/QtSsh/tests/auto/cmake/cmake.pro old mode 100644 new mode 100755 diff --git a/client/3rd/QtSsh/tests/tests.pro b/client/3rd/QtSsh/tests/tests.pro old mode 100644 new mode 100755 diff --git a/client/3rd/SingleApplication/singleapplication.cpp b/client/3rd/SingleApplication/singleapplication.cpp old mode 100644 new mode 100755 diff --git a/client/3rd/SingleApplication/singleapplication.h b/client/3rd/SingleApplication/singleapplication.h old mode 100644 new mode 100755 diff --git a/client/3rd/SingleApplication/singleapplication.pri b/client/3rd/SingleApplication/singleapplication.pri old mode 100644 new mode 100755 diff --git a/client/3rd/SingleApplication/singleapplication_p.cpp b/client/3rd/SingleApplication/singleapplication_p.cpp old mode 100644 new mode 100755 diff --git a/client/3rd/SingleApplication/singleapplication_p.h b/client/3rd/SingleApplication/singleapplication_p.h old mode 100644 new mode 100755 diff --git a/client/client.pro b/client/client.pro old mode 100644 new mode 100755 diff --git a/client/configurators/cloak_configurator.cpp b/client/configurators/cloak_configurator.cpp old mode 100644 new mode 100755 diff --git a/client/configurators/cloak_configurator.h b/client/configurators/cloak_configurator.h old mode 100644 new mode 100755 diff --git a/client/configurators/openvpn_configurator.cpp b/client/configurators/openvpn_configurator.cpp old mode 100644 new mode 100755 index 09175931..9b9ecddb --- a/client/configurators/openvpn_configurator.cpp +++ b/client/configurators/openvpn_configurator.cpp @@ -19,6 +19,7 @@ QString OpenVpnConfigurator::getEasyRsaShPath() qDebug().noquote() << "EasyRsa sh path" << easyRsaShPath; return easyRsaShPath; + #else return QDir::toNativeSeparators(QApplication::applicationDirPath()) + "/easyrsa"; #endif @@ -29,12 +30,14 @@ QProcessEnvironment OpenVpnConfigurator::prepareEnv() QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); QString pathEnvVar = env.value("PATH"); -#ifdef Q_OS_WIN +#if defined Q_OS_WIN pathEnvVar.clear(); pathEnvVar.prepend(QDir::toNativeSeparators(QApplication::applicationDirPath()) + "\\cygwin;"); pathEnvVar.prepend(QDir::toNativeSeparators(QApplication::applicationDirPath()) + "\\openvpn;"); -#else +#elif defined Q_OS_MAC pathEnvVar.prepend(QDir::toNativeSeparators(QApplication::applicationDirPath()) + "/Contents/MacOS"); +#elif defined Q_OS_LINUX + pathEnvVar.prepend(QDir::toNativeSeparators(QApplication::applicationDirPath()) + "/openvpn"); #endif env.insert("PATH", pathEnvVar); diff --git a/client/configurators/openvpn_configurator.h b/client/configurators/openvpn_configurator.h old mode 100644 new mode 100755 diff --git a/client/configurators/shadowsocks_configurator.cpp b/client/configurators/shadowsocks_configurator.cpp old mode 100644 new mode 100755 diff --git a/client/configurators/shadowsocks_configurator.h b/client/configurators/shadowsocks_configurator.h old mode 100644 new mode 100755 diff --git a/client/configurators/ssh_configurator.cpp b/client/configurators/ssh_configurator.cpp old mode 100644 new mode 100755 diff --git a/client/configurators/ssh_configurator.h b/client/configurators/ssh_configurator.h old mode 100644 new mode 100755 diff --git a/client/configurators/vpn_configurator.cpp b/client/configurators/vpn_configurator.cpp old mode 100644 new mode 100755 diff --git a/client/configurators/vpn_configurator.h b/client/configurators/vpn_configurator.h old mode 100644 new mode 100755 diff --git a/client/configurators/wireguard_configurator.cpp b/client/configurators/wireguard_configurator.cpp old mode 100644 new mode 100755 diff --git a/client/configurators/wireguard_configurator.h b/client/configurators/wireguard_configurator.h old mode 100644 new mode 100755 diff --git a/client/core/defs.h b/client/core/defs.h old mode 100644 new mode 100755 diff --git a/client/core/errorstrings.cpp b/client/core/errorstrings.cpp old mode 100644 new mode 100755 diff --git a/client/core/errorstrings.h b/client/core/errorstrings.h old mode 100644 new mode 100755 diff --git a/client/core/ipcclient.cpp b/client/core/ipcclient.cpp old mode 100644 new mode 100755 diff --git a/client/core/ipcclient.h b/client/core/ipcclient.h old mode 100644 new mode 100755 diff --git a/client/core/scripts_registry.cpp b/client/core/scripts_registry.cpp old mode 100644 new mode 100755 diff --git a/client/core/scripts_registry.h b/client/core/scripts_registry.h old mode 100644 new mode 100755 diff --git a/client/core/server_defs.cpp b/client/core/server_defs.cpp old mode 100644 new mode 100755 diff --git a/client/core/server_defs.h b/client/core/server_defs.h old mode 100644 new mode 100755 diff --git a/client/core/servercontroller.cpp b/client/core/servercontroller.cpp old mode 100644 new mode 100755 diff --git a/client/core/servercontroller.h b/client/core/servercontroller.h old mode 100644 new mode 100755 diff --git a/client/debug.cpp b/client/debug.cpp old mode 100644 new mode 100755 diff --git a/client/debug.h b/client/debug.h old mode 100644 new mode 100755 diff --git a/client/defines.h b/client/defines.h old mode 100644 new mode 100755 diff --git a/client/fonts/Lato-Black.ttf b/client/fonts/Lato-Black.ttf old mode 100644 new mode 100755 diff --git a/client/fonts/Lato-BlackItalic.ttf b/client/fonts/Lato-BlackItalic.ttf old mode 100644 new mode 100755 diff --git a/client/fonts/Lato-Bold.ttf b/client/fonts/Lato-Bold.ttf old mode 100644 new mode 100755 diff --git a/client/fonts/Lato-BoldItalic.ttf b/client/fonts/Lato-BoldItalic.ttf old mode 100644 new mode 100755 diff --git a/client/fonts/Lato-Hairline.ttf b/client/fonts/Lato-Hairline.ttf old mode 100644 new mode 100755 diff --git a/client/fonts/Lato-HairlineItalic.ttf b/client/fonts/Lato-HairlineItalic.ttf old mode 100644 new mode 100755 diff --git a/client/fonts/Lato-Heavy.ttf b/client/fonts/Lato-Heavy.ttf old mode 100644 new mode 100755 diff --git a/client/fonts/Lato-HeavyItalic.ttf b/client/fonts/Lato-HeavyItalic.ttf old mode 100644 new mode 100755 diff --git a/client/fonts/Lato-Italic.ttf b/client/fonts/Lato-Italic.ttf old mode 100644 new mode 100755 diff --git a/client/fonts/Lato-Light.ttf b/client/fonts/Lato-Light.ttf old mode 100644 new mode 100755 diff --git a/client/fonts/Lato-LightItalic.ttf b/client/fonts/Lato-LightItalic.ttf old mode 100644 new mode 100755 diff --git a/client/fonts/Lato-Medium.ttf b/client/fonts/Lato-Medium.ttf old mode 100644 new mode 100755 diff --git a/client/fonts/Lato-MediumItalic.ttf b/client/fonts/Lato-MediumItalic.ttf old mode 100644 new mode 100755 diff --git a/client/fonts/Lato-Regular.ttf b/client/fonts/Lato-Regular.ttf old mode 100644 new mode 100755 diff --git a/client/fonts/Lato-Semibold.ttf b/client/fonts/Lato-Semibold.ttf old mode 100644 new mode 100755 diff --git a/client/fonts/Lato-SemiboldItalic.ttf b/client/fonts/Lato-SemiboldItalic.ttf old mode 100644 new mode 100755 diff --git a/client/fonts/Lato-Thin.ttf b/client/fonts/Lato-Thin.ttf old mode 100644 new mode 100755 diff --git a/client/fonts/Lato-ThinItalic.ttf b/client/fonts/Lato-ThinItalic.ttf old mode 100644 new mode 100755 diff --git a/client/images/AmneziaVPN.png b/client/images/AmneziaVPN.png old mode 100644 new mode 100755 diff --git a/client/images/app.icns b/client/images/app.icns old mode 100644 new mode 100755 diff --git a/client/images/app.ico b/client/images/app.ico old mode 100644 new mode 100755 diff --git a/client/images/arrow_left.png b/client/images/arrow_left.png old mode 100644 new mode 100755 diff --git a/client/images/background_connected.png b/client/images/background_connected.png old mode 100644 new mode 100755 diff --git a/client/images/check.png b/client/images/check.png old mode 100644 new mode 100755 diff --git a/client/images/close.png b/client/images/close.png old mode 100644 new mode 100755 diff --git a/client/images/connect_button_connected.png b/client/images/connect_button_connected.png old mode 100644 new mode 100755 diff --git a/client/images/connect_button_disconnected.png b/client/images/connect_button_disconnected.png old mode 100644 new mode 100755 diff --git a/client/images/controls/check_off.png b/client/images/controls/check_off.png old mode 100644 new mode 100755 diff --git a/client/images/controls/check_on.png b/client/images/controls/check_on.png old mode 100644 new mode 100755 diff --git a/client/images/controls/radio_off.png b/client/images/controls/radio_off.png old mode 100644 new mode 100755 diff --git a/client/images/controls/radio_on.png b/client/images/controls/radio_on.png old mode 100644 new mode 100755 diff --git a/client/images/download.png b/client/images/download.png old mode 100644 new mode 100755 diff --git a/client/images/favorites_disabled.png b/client/images/favorites_disabled.png old mode 100644 new mode 100755 diff --git a/client/images/favorites_enabled.png b/client/images/favorites_enabled.png old mode 100644 new mode 100755 diff --git a/client/images/favorites_hover.png b/client/images/favorites_hover.png old mode 100644 new mode 100755 diff --git a/client/images/folder.png b/client/images/folder.png old mode 100644 new mode 100755 diff --git a/client/images/icon.png b/client/images/icon.png old mode 100644 new mode 100755 diff --git a/client/images/icon_src.png b/client/images/icon_src.png old mode 100644 new mode 100755 diff --git a/client/images/line.png b/client/images/line.png old mode 100644 new mode 100755 diff --git a/client/images/min.png b/client/images/min.png old mode 100644 new mode 100755 diff --git a/client/images/plus.png b/client/images/plus.png old mode 100644 new mode 100755 diff --git a/client/images/reload.png b/client/images/reload.png old mode 100644 new mode 100755 diff --git a/client/images/server_settings.png b/client/images/server_settings.png old mode 100644 new mode 100755 diff --git a/client/images/settings.png b/client/images/settings.png old mode 100644 new mode 100755 diff --git a/client/images/settings_grey.png b/client/images/settings_grey.png old mode 100644 new mode 100755 diff --git a/client/images/share.png b/client/images/share.png old mode 100644 new mode 100755 diff --git a/client/images/tray/active.png b/client/images/tray/active.png old mode 100644 new mode 100755 diff --git a/client/images/tray/default.png b/client/images/tray/default.png old mode 100644 new mode 100755 diff --git a/client/images/tray/error.png b/client/images/tray/error.png old mode 100644 new mode 100755 diff --git a/client/images/uncheck.png b/client/images/uncheck.png old mode 100644 new mode 100755 diff --git a/client/images/upload.png b/client/images/upload.png old mode 100644 new mode 100755 diff --git a/client/main.cpp b/client/main.cpp old mode 100644 new mode 100755 diff --git a/client/managementserver.cpp b/client/managementserver.cpp old mode 100644 new mode 100755 diff --git a/client/managementserver.h b/client/managementserver.h old mode 100644 new mode 100755 diff --git a/client/platform_win/vpnclient.rc b/client/platform_win/vpnclient.rc old mode 100644 new mode 100755 diff --git a/client/protocols/openvpnovercloakprotocol.cpp b/client/protocols/openvpnovercloakprotocol.cpp old mode 100644 new mode 100755 diff --git a/client/protocols/openvpnovercloakprotocol.h b/client/protocols/openvpnovercloakprotocol.h old mode 100644 new mode 100755 diff --git a/client/protocols/openvpnprotocol.cpp b/client/protocols/openvpnprotocol.cpp old mode 100644 new mode 100755 index 5371c566..a756d86d --- a/client/protocols/openvpnprotocol.cpp +++ b/client/protocols/openvpnprotocol.cpp @@ -142,6 +142,8 @@ QString OpenVpnProtocol::openVpnExecPath() const { #ifdef Q_OS_WIN return Utils::executable("openvpn/openvpn", true); +#elif defined Q_OS_LINUX + return Utils::usrExecutable("openvpn"); #else return Utils::executable("/openvpn", true); #endif diff --git a/client/protocols/openvpnprotocol.h b/client/protocols/openvpnprotocol.h old mode 100644 new mode 100755 diff --git a/client/protocols/protocols_defs.cpp b/client/protocols/protocols_defs.cpp old mode 100644 new mode 100755 diff --git a/client/protocols/protocols_defs.h b/client/protocols/protocols_defs.h old mode 100644 new mode 100755 diff --git a/client/protocols/shadowsocksvpnprotocol.cpp b/client/protocols/shadowsocksvpnprotocol.cpp old mode 100644 new mode 100755 index 97a9c258..3d2c2be1 --- a/client/protocols/shadowsocksvpnprotocol.cpp +++ b/client/protocols/shadowsocksvpnprotocol.cpp @@ -95,6 +95,8 @@ QString ShadowSocksVpnProtocol::shadowSocksExecPath() { #ifdef Q_OS_WIN return Utils::executable(QString("ss/ss-local"), true); +#elif defined Q_OS_LINUX + return Utils::usrExecutable(QString("ss-local")); #else return Utils::executable(QString("/ss-local"), true); #endif diff --git a/client/protocols/shadowsocksvpnprotocol.h b/client/protocols/shadowsocksvpnprotocol.h old mode 100644 new mode 100755 diff --git a/client/protocols/vpnprotocol.cpp b/client/protocols/vpnprotocol.cpp old mode 100644 new mode 100755 diff --git a/client/protocols/vpnprotocol.h b/client/protocols/vpnprotocol.h old mode 100644 new mode 100755 diff --git a/client/protocols/wireguardprotocol.cpp b/client/protocols/wireguardprotocol.cpp old mode 100644 new mode 100755 index 4c5b6f0f..b3c2cd04 --- a/client/protocols/wireguardprotocol.cpp +++ b/client/protocols/wireguardprotocol.cpp @@ -122,6 +122,8 @@ QString WireguardProtocol::wireguardExecPath() const { #ifdef Q_OS_WIN return Utils::executable("wireguard/wireguard", true); +#elif defined Q_OS_LINUX + return Utils::usrExecutable("wg"); #else return Utils::executable("/wireguard", true); #endif diff --git a/client/protocols/wireguardprotocol.h b/client/protocols/wireguardprotocol.h old mode 100644 new mode 100755 diff --git a/client/resources.qrc b/client/resources.qrc old mode 100644 new mode 100755 diff --git a/client/server_scripts/build_container.sh b/client/server_scripts/build_container.sh old mode 100644 new mode 100755 diff --git a/client/server_scripts/check_connection.sh b/client/server_scripts/check_connection.sh old mode 100644 new mode 100755 diff --git a/client/server_scripts/install_docker.sh b/client/server_scripts/install_docker.sh old mode 100644 new mode 100755 diff --git a/client/server_scripts/openvpn/Dockerfile b/client/server_scripts/openvpn/Dockerfile old mode 100644 new mode 100755 diff --git a/client/server_scripts/openvpn/configure_container.sh b/client/server_scripts/openvpn/configure_container.sh old mode 100644 new mode 100755 diff --git a/client/server_scripts/openvpn/run_container.sh b/client/server_scripts/openvpn/run_container.sh old mode 100644 new mode 100755 diff --git a/client/server_scripts/openvpn/start.sh b/client/server_scripts/openvpn/start.sh old mode 100644 new mode 100755 diff --git a/client/server_scripts/openvpn/template.ovpn b/client/server_scripts/openvpn/template.ovpn old mode 100644 new mode 100755 diff --git a/client/server_scripts/openvpn_cloak/Dockerfile b/client/server_scripts/openvpn_cloak/Dockerfile old mode 100644 new mode 100755 diff --git a/client/server_scripts/openvpn_cloak/configure_container.sh b/client/server_scripts/openvpn_cloak/configure_container.sh old mode 100644 new mode 100755 diff --git a/client/server_scripts/openvpn_cloak/run_container.sh b/client/server_scripts/openvpn_cloak/run_container.sh old mode 100644 new mode 100755 diff --git a/client/server_scripts/openvpn_cloak/start.sh b/client/server_scripts/openvpn_cloak/start.sh old mode 100644 new mode 100755 diff --git a/client/server_scripts/openvpn_cloak/template.ovpn b/client/server_scripts/openvpn_cloak/template.ovpn old mode 100644 new mode 100755 diff --git a/client/server_scripts/openvpn_shadowsocks/Dockerfile b/client/server_scripts/openvpn_shadowsocks/Dockerfile old mode 100644 new mode 100755 diff --git a/client/server_scripts/openvpn_shadowsocks/configure_container.sh b/client/server_scripts/openvpn_shadowsocks/configure_container.sh old mode 100644 new mode 100755 diff --git a/client/server_scripts/openvpn_shadowsocks/run_container.sh b/client/server_scripts/openvpn_shadowsocks/run_container.sh old mode 100644 new mode 100755 diff --git a/client/server_scripts/openvpn_shadowsocks/start.sh b/client/server_scripts/openvpn_shadowsocks/start.sh old mode 100644 new mode 100755 diff --git a/client/server_scripts/openvpn_shadowsocks/template.ovpn b/client/server_scripts/openvpn_shadowsocks/template.ovpn old mode 100644 new mode 100755 diff --git a/client/server_scripts/prepare_host.sh b/client/server_scripts/prepare_host.sh old mode 100644 new mode 100755 diff --git a/client/server_scripts/remove_all_containers.sh b/client/server_scripts/remove_all_containers.sh old mode 100644 new mode 100755 diff --git a/client/server_scripts/remove_container.sh b/client/server_scripts/remove_container.sh old mode 100644 new mode 100755 diff --git a/client/server_scripts/setup_host_firewall.sh b/client/server_scripts/setup_host_firewall.sh old mode 100644 new mode 100755 diff --git a/client/server_scripts/wireguard/Dockerfile b/client/server_scripts/wireguard/Dockerfile old mode 100644 new mode 100755 diff --git a/client/server_scripts/wireguard/configure_container.sh b/client/server_scripts/wireguard/configure_container.sh old mode 100644 new mode 100755 diff --git a/client/server_scripts/wireguard/run_container.sh b/client/server_scripts/wireguard/run_container.sh old mode 100644 new mode 100755 diff --git a/client/server_scripts/wireguard/start.sh b/client/server_scripts/wireguard/start.sh old mode 100644 new mode 100755 diff --git a/client/server_scripts/wireguard/template.conf b/client/server_scripts/wireguard/template.conf old mode 100644 new mode 100755 diff --git a/client/settings.cpp b/client/settings.cpp old mode 100644 new mode 100755 diff --git a/client/settings.h b/client/settings.h old mode 100644 new mode 100755 diff --git a/client/translations/amneziavpn_ru.qm b/client/translations/amneziavpn_ru.qm old mode 100644 new mode 100755 diff --git a/client/translations/amneziavpn_ru.ts b/client/translations/amneziavpn_ru.ts old mode 100644 new mode 100755 diff --git a/client/ui/Controls/SlidingStackedWidget.cpp b/client/ui/Controls/SlidingStackedWidget.cpp old mode 100644 new mode 100755 diff --git a/client/ui/Controls/SlidingStackedWidget.h b/client/ui/Controls/SlidingStackedWidget.h old mode 100644 new mode 100755 diff --git a/client/ui/framelesswindow.cpp b/client/ui/framelesswindow.cpp old mode 100644 new mode 100755 diff --git a/client/ui/framelesswindow.h b/client/ui/framelesswindow.h old mode 100644 new mode 100755 diff --git a/client/ui/macos_util.h b/client/ui/macos_util.h old mode 100644 new mode 100755 diff --git a/client/ui/macos_util.mm b/client/ui/macos_util.mm old mode 100644 new mode 100755 diff --git a/client/ui/mainwindow.cpp b/client/ui/mainwindow.cpp old mode 100644 new mode 100755 diff --git a/client/ui/mainwindow.h b/client/ui/mainwindow.h old mode 100644 new mode 100755 diff --git a/client/ui/mainwindow.ui b/client/ui/mainwindow.ui old mode 100644 new mode 100755 diff --git a/client/ui/qautostart.cpp b/client/ui/qautostart.cpp old mode 100644 new mode 100755 diff --git a/client/ui/qautostart.h b/client/ui/qautostart.h old mode 100644 new mode 100755 diff --git a/client/ui/server_widget.cpp b/client/ui/server_widget.cpp old mode 100644 new mode 100755 diff --git a/client/ui/server_widget.h b/client/ui/server_widget.h old mode 100644 new mode 100755 diff --git a/client/ui/server_widget.ui b/client/ui/server_widget.ui old mode 100644 new mode 100755 diff --git a/client/ui/sites_model.cpp b/client/ui/sites_model.cpp old mode 100644 new mode 100755 diff --git a/client/ui/sites_model.h b/client/ui/sites_model.h old mode 100644 new mode 100755 diff --git a/client/utils.cpp b/client/utils.cpp old mode 100644 new mode 100755 index 42056e94..ed08610e --- a/client/utils.cpp +++ b/client/utils.cpp @@ -68,6 +68,14 @@ QString Utils::executable(const QString& baseName, bool absPath) return QCoreApplication::applicationDirPath() + "/" + fileName; } +QString Utils::usrExecutable(const QString& baseName) +{ + if (QFileInfo::exists("/usr/sbin/" + baseName)) + return ("/usr/sbin/" + baseName); + else + return ("/usr/bin/" + baseName); +} + bool Utils::processIsRunning(const QString& fileName) { #ifdef Q_OS_WIN diff --git a/client/utils.h b/client/utils.h old mode 100644 new mode 100755 index 3a0ef2ce..709a159e --- a/client/utils.h +++ b/client/utils.h @@ -14,6 +14,7 @@ public: static QString getRandomString(int len); static QString executable(const QString& baseName, bool absPath); + static QString usrExecutable(const QString& baseName); static QString systemLogPath(); static bool createEmptyFile(const QString& path); static bool initializePath(const QString& path); diff --git a/client/vpnconnection.cpp b/client/vpnconnection.cpp old mode 100644 new mode 100755 diff --git a/client/vpnconnection.h b/client/vpnconnection.h old mode 100644 new mode 100755 diff --git a/deploy/data/linux/update-resolv-conf.sh b/deploy/data/linux/update-resolv-conf.sh new file mode 100755 index 00000000..16622a1d --- /dev/null +++ b/deploy/data/linux/update-resolv-conf.sh @@ -0,0 +1,71 @@ +#!/usr/bin/env bash +# +# Parses DHCP options from openvpn to update resolv.conf +# To use set as 'up' and 'down' script in your openvpn *.conf: +# up /etc/openvpn/update-resolv-conf +# down /etc/openvpn/update-resolv-conf +# +# Used snippets of resolvconf script by Thomas Hood +# and Chris Hanson +# Licensed under the GNU GPL. See /usr/share/common-licenses/GPL. +# 07/2013 colin@daedrum.net Fixed intet name +# 05/2006 chlauber@bnc.ch +# +# Example envs set from openvpn: +# foreign_option_1='dhcp-option DNS 193.43.27.132' +# foreign_option_2='dhcp-option DNS 193.43.27.133' +# foreign_option_3='dhcp-option DOMAIN be.bnc.ch' +# foreign_option_4='dhcp-option DOMAIN-SEARCH bnc.local' + +## The 'type' builtins will look for file in $PATH variable, so we set the +## PATH below. You might need to directly set the path to 'resolvconf' +## manually if it still doesn't work, i.e. +## RESOLVCONF=/usr/sbin/resolvconf +export PATH=$PATH:/sbin:/usr/sbin:/bin:/usr/bin +RESOLVCONF=$(type -p resolvconf) + +case $script_type in + +up) + for optionname in ${!foreign_option_*} ; do + option="${!optionname}" + echo $option + part1=$(echo "$option" | cut -d " " -f 1) + if [ "$part1" == "dhcp-option" ] ; then + part2=$(echo "$option" | cut -d " " -f 2) + part3=$(echo "$option" | cut -d " " -f 3) + if [ "$part2" == "DNS" ] ; then + IF_DNS_NAMESERVERS="$IF_DNS_NAMESERVERS $part3" + fi + if [[ "$part2" == "DOMAIN" || "$part2" == "DOMAIN-SEARCH" ]] ; then + IF_DNS_SEARCH="$IF_DNS_SEARCH $part3" + fi + fi + done + R="" + if [ "$IF_DNS_SEARCH" ]; then + R="search " + for DS in $IF_DNS_SEARCH ; do + R="${R} $DS" + done + R="${R} +" + fi + + for NS in $IF_DNS_NAMESERVERS ; do + R="${R}nameserver $NS +" + done + #echo -n "$R" | $RESOLVCONF -x -p -a "${dev}" + echo -n "$R" | $RESOLVCONF -x -a "${dev}.inet" + ;; +down) + $RESOLVCONF -d "${dev}.inet" + ;; +esac + +# Workaround / jm@epiclabs.io +# force exit with no errors. Due to an apparent conflict with the Network Manager +# $RESOLVCONF sometimes exits with error code 6 even though it has performed the +# action correctly and OpenVPN shuts down. +exit 0 diff --git a/service/buildlib/buildlib.pro b/service/buildlib/buildlib.pro old mode 100644 new mode 100755 diff --git a/service/common.pri b/service/common.pri old mode 100644 new mode 100755 diff --git a/service/server/helper_route_mac.c b/service/server/helper_route_mac.c old mode 100644 new mode 100755 diff --git a/service/server/helper_route_mac.h b/service/server/helper_route_mac.h old mode 100644 new mode 100755 diff --git a/service/server/localserver.cpp b/service/server/localserver.cpp old mode 100644 new mode 100755 diff --git a/service/server/localserver.h b/service/server/localserver.h old mode 100644 new mode 100755 diff --git a/service/server/log.cpp b/service/server/log.cpp old mode 100644 new mode 100755 diff --git a/service/server/log.h b/service/server/log.h old mode 100644 new mode 100755 diff --git a/service/server/main.cpp b/service/server/main.cpp old mode 100644 new mode 100755 diff --git a/service/server/router.cpp b/service/server/router.cpp old mode 100644 new mode 100755 diff --git a/service/server/router.h b/service/server/router.h old mode 100644 new mode 100755 diff --git a/service/server/router_mac.cpp b/service/server/router_mac.cpp old mode 100644 new mode 100755 diff --git a/service/server/router_mac.h b/service/server/router_mac.h old mode 100644 new mode 100755 diff --git a/service/server/router_win.cpp b/service/server/router_win.cpp old mode 100644 new mode 100755 diff --git a/service/server/router_win.h b/service/server/router_win.h old mode 100644 new mode 100755 diff --git a/service/server/server.pro b/service/server/server.pro old mode 100644 new mode 100755 diff --git a/service/server/systemservice.cpp b/service/server/systemservice.cpp old mode 100644 new mode 100755 diff --git a/service/server/systemservice.h b/service/server/systemservice.h old mode 100644 new mode 100755 diff --git a/service/server/tapcontroller_win.cpp b/service/server/tapcontroller_win.cpp old mode 100644 new mode 100755 diff --git a/service/server/tapcontroller_win.h b/service/server/tapcontroller_win.h old mode 100644 new mode 100755 diff --git a/service/service.pro b/service/service.pro old mode 100644 new mode 100755 diff --git a/service/src/QtService b/service/src/QtService old mode 100644 new mode 100755 diff --git a/service/src/QtServiceBase b/service/src/QtServiceBase old mode 100644 new mode 100755 diff --git a/service/src/QtServiceController b/service/src/QtServiceController old mode 100644 new mode 100755 diff --git a/service/src/qtservice.cpp b/service/src/qtservice.cpp old mode 100644 new mode 100755 diff --git a/service/src/qtservice.h b/service/src/qtservice.h old mode 100644 new mode 100755 diff --git a/service/src/qtservice.pri b/service/src/qtservice.pri old mode 100644 new mode 100755 diff --git a/service/src/qtservice_p.h b/service/src/qtservice_p.h old mode 100644 new mode 100755 diff --git a/service/src/qtservice_unix.cpp b/service/src/qtservice_unix.cpp old mode 100644 new mode 100755 diff --git a/service/src/qtservice_win.cpp b/service/src/qtservice_win.cpp old mode 100644 new mode 100755 diff --git a/service/src/qtunixserversocket.cpp b/service/src/qtunixserversocket.cpp old mode 100644 new mode 100755 diff --git a/service/src/qtunixserversocket.h b/service/src/qtunixserversocket.h old mode 100644 new mode 100755 diff --git a/service/src/qtunixsocket.cpp b/service/src/qtunixsocket.cpp old mode 100644 new mode 100755 diff --git a/service/src/qtunixsocket.h b/service/src/qtunixsocket.h old mode 100644 new mode 100755