OpenVPN3 pluggable transport cloak for ios (#227)

OpenVPN3 pluggable transport cloak for ios

.gitattributes

@@ -2,4 +2,3 @@ deploy/data/windows/x64/tap/windows_7/OemVista.inf eol=crlf
 deploy/data/windows/x64/tap/windows_10/OemVista.inf eol=crlf
 deploy/data/windows/x32/tap/windows_7/OemVista.inf eol=crlf
 deploy/data/windows/x32/tap/windows_10/OemVista.inf eol=crlf
-client/3rd/* linguist-vendored

.gitpod.Dockerfile

@@ -1,47 +0,0 @@
-FROM gitpod/workspace-full-vnc
-
-USER gitpod
-
-RUN sudo apt-get -q update \
-    && sudo apt-get install -yq \
-        build-essential \
-        libgl1-mesa-dev \
-        libgstreamer-gl1.0-0 \
-        libpulse-dev \
-        libsecret-1-dev \
-        libxcb-glx0 \
-        libxcb-icccm4 \
-        libxcb-image0 \
-        libxcb-keysyms1 \
-        libxcb-randr0 \
-        libxcb-render-util0 \
-        libxcb-render0 \
-        libxcb-shape0 \
-        libxcb-shm0 \
-        libxcb-sync1 \
-        libxcb-util1 \
-        libxcb-xfixes0 \
-        libxcb-xinerama0 \
-        libxcb1 \
-        libxkbcommon-dev \
-        libxkbcommon-x11-0 \
-        libxcb-xkb-dev \
-        p7zip-full \
-    && sudo rm -rf /var/lib/apt/lists/*
-
-RUN sudo pip3 install aqtinstall
-
-ARG QT_VERSION=6.4.1
-ARG QT_ARCH=gcc_64
-
-ARG QT_DIR=/opt/qt
-RUN sudo aqt install-qt --outputdir ${QT_DIR} linux desktop ${QT_VERSION} ${QT_ARCH} --modules \
-    qtremoteobjects \
-    qt5compat \
-    qtshadertools
-ENV QT_BIN_DIR=${QT_DIR}/${QT_VERSION}/${QT_ARCH}/bin
-
-ARG QIF_VERSION=4.5
-ARG QIF_DIR=/opt/qif
-RUN sudo aqt install-tool --outputdir ${QIF_DIR} linux desktop tools_ifw
-ENV QIF_BIN_DIR=${QIF_DIR}/Tools/QtInstallerFramework/${QIF_VERSION}/bin

.gitpod.yml

@@ -1,8 +0,0 @@
-tasks:
-- init: >-
-    deploy/build_linux.sh
-image:
-  file: .gitpod.Dockerfile
-vscode:
-  extensions:
-  - llvm-vs-code-extensions.vscode-clangd

README.md

@@ -1,8 +1,7 @@
 # Amnezia VPN
 ## _The best client for self-hosted VPN_
 
-[![Build Status](https://github.com/amnezia-vpn/amnezia-client/actions/workflows/deploy.yml/badge.svg?branch=dev)](https://github.com/amnezia-vpn/amnezia-client/actions/workflows/deploy.yml?query=branch:dev)
-[![Gitpod ready-to-code](https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/amnezia-vpn/amnezia-client)
+[![Build Status](https://github.com/amnezia-vpn/desktop-client/actions/workflows/deploy.yml/badge.svg?branch=dev)]
 
 Amnezia is a VPN client with the key feature of deploying your own VPN server on you virtual server.
 

client/configurators/cloak_configurator.cpp

@@ -42,8 +42,11 @@ QString CloakConfigurator::genCloakConfig(const ServerCredentials &credentials,
     config.insert("NumConn", 1);
     config.insert("BrowserSig", "chrome");
     config.insert("StreamTimeout", 300);
-    config.insert("RemoteHost", credentials.hostName);
-    config.insert("RemotePort", "$CLOAK_SERVER_PORT");
+
+    // transfer params to protocol runner
+    config.insert(config_key::transport_proto, "tcp");
+    config.insert(config_key::remote, credentials.hostName);
+    config.insert(config_key::port, "$CLOAK_SERVER_PORT");
 
     QString textCfg = serverController.replaceVars(QJsonDocument(config).toJson(),
                                                    serverController.genVarsForScript(credentials, container, containerConfig));

client/ios/app/Info.plist.in

@@ -80,92 +80,6 @@
 				</array>
 			</dict>
 		</dict>
-                <dict>
-                        <key>UTTypeConformsTo</key>
-                        <array>
-                                <string>public.data</string>
-                        </array>
-                        <key>UTTypeDescription</key>
-                        <string>WireGuard config</string>
-                        <key>UTTypeIconFiles</key>
-                        <array/>
-                        <key>UTTypeIdentifier</key>
-                        <string>org.amnezia.AmneziaVPN.wireguard-config</string>
-                        <key>UTTypeTagSpecification</key>
-                        <dict>
-                                <key>public.filename-extension</key>
-                                <array>
-                                        <string>conf</string>
-                                        <string>cfg</string>
-                                </array>
-                                <key>public.mime-type</key>
-                                <array>
-                                        <string>text/plain</string>
-                                </array>
-                        </dict>
-                </dict>
-                <dict>
-                        <key>UTTypeConformsTo</key>
-                        <array>
-                                <string>public.data</string>
-                        </array>
-                        <key>UTTypeDescription</key>
-                        <string>OpenVPN config</string>
-                        <key>UTTypeIconFiles</key>
-                        <array/>
-                        <key>UTTypeIdentifier</key>
-                        <string>org.amnezia.AmneziaVPN.openvpn-config</string>
-                        <key>UTTypeTagSpecification</key>
-                        <dict>
-                                <key>public.filename-extension</key>
-                                <array>
-                                        <string>ovpn</string>
-                                </array>
-                                <key>public.mime-type</key>
-                                <array>
-                                        <string>text/plain</string>
-                                </array>
-                        </dict>
-                </dict>
-                <dict>
-                        <key>UTTypeConformsTo</key>
-                        <array>
-                                <string>public.data</string>
-                        </array>
-                        <key>UTTypeDescription</key>
-                        <string>AmneziaVPN backup file</string>
-                        <key>UTTypeIconFiles</key>
-                        <array/>
-                        <key>UTTypeIdentifier</key>
-                        <string>org.amnezia.AmneziaVPN.backup-config</string>
-                        <key>UTTypeTagSpecification</key>
-                        <dict>
-                                <key>public.filename-extension</key>
-                                <array>
-                                        <string>backup</string>
-                                </array>
-                                <key>public.mime-type</key>
-                                <array>
-                                        <string>text/plain</string>
-                                </array>
-                        </dict>
-                </dict>
 	</array>
-        <key>CFBundleDocumentTypes</key>
-        <array>
-                <dict>
-                        <key>CFBundleTypeName</key>
-                        <string>Amnezia VPN config</string>
-                        <key>LSHandlerRank</key>
-                        <string>Alternate</string>
-                        <key>LSItemContentTypes</key>
-                        <array>
-                                <string>org.amnezia.AmneziaVPN.amnezia-config</string>
-                                <string>org.amnezia.AmneziaVPN.wireguard-config</string>
-                                <string>org.amnezia.AmneziaVPN.openvpn-config</string>
-                                <string>org.amnezia.AmneziaVPN.backup-config</string>
-                        </array>
-                </dict>
-        </array>
 </dict>
-</plist>
+</plist>

client/platforms/android/android_controller.cpp

@@ -249,7 +249,7 @@ void AndroidController::cleanupBackendLogs() {
 }
 
 void AndroidController::importConfig(const QString& data){
-    m_startPageLogic->importAnyFile(data);
+    m_startPageLogic->selectConfigFormat(data);
 }
 
 const QJsonObject &AndroidController::vpnConfig() const

client/platforms/ios/QtAppDelegate.mm

@@ -73,13 +73,15 @@
     NSLog(@"Application openURL: %@", url);
     if (url.fileURL) {
         QString filePath(url.path.UTF8String);
+        qDebug() << "filePath:" << filePath;
         if (filePath.isEmpty()) return NO;
 
         QFile file(filePath);
         bool isOpenFile = file.open(QIODevice::ReadOnly);
+        qDebug() << "isOpenFile:" << isOpenFile;
         QByteArray data = file.readAll();
         
-        [QtAppDelegate sharedQtAppDelegate].startPageLogic->importAnyFile(QString(data));
+        [QtAppDelegate sharedQtAppDelegate].startPageLogic->importConnectionFromCode(QString(data));
         return YES;
     }
     return NO;

client/protocols/openvpnovercloakprotocol.cpp

@@ -18,7 +18,10 @@ OpenVpnOverCloakProtocol::~OpenVpnOverCloakProtocol()
 {
     qDebug() << "OpenVpnOverCloakProtocol::~OpenVpnOverCloakProtocol";
     OpenVpnOverCloakProtocol::stop();
+    QThread::msleep(200);
+#ifndef Q_OS_IOS
     m_ckProcess.close();
+#endif
 }
 
 ErrorCode OpenVpnOverCloakProtocol::start()
@@ -27,17 +30,11 @@ ErrorCode OpenVpnOverCloakProtocol::start()
         setLastError(ErrorCode::CloakExecutableMissing);
         return lastError();
     }
-
+#ifndef Q_OS_IOS
     if (Utils::processIsRunning(Utils::executable("ck-client", false))) {
         Utils::killProcessByName(Utils::executable("ck-client", false));
     }
 
-    // workaround for desktop releases >= 3.0.7
-    if (!m_cloakConfig.contains("RemoteHost") && m_cloakConfig.contains(config_key::remote)) {
-        m_cloakConfig["RemoteHost"] = m_cloakConfig.value(config_key::remote);
-        m_cloakConfig["RemotePort"] = m_cloakConfig.value(config_key::port);
-    }
-
 #ifdef QT_DEBUG
     m_cloakCfgFile.setAutoRemove(false);
 #endif
@@ -46,8 +43,15 @@ ErrorCode OpenVpnOverCloakProtocol::start()
     m_cloakCfgFile.close();
 
     QStringList args = QStringList() << "-c" << m_cloakCfgFile.fileName()
+                                     << "-s" << m_cloakConfig.value(config_key::remote).toString()
+                                     << "-p" << m_cloakConfig.value(config_key::port).toString(amnezia::protocols::cloak::defaultPort)
                                      << "-l" << amnezia::protocols::openvpn::defaultPort;
 
+    ProtocolEnumNS::TransportProto tp = ProtocolProps::transportProtoFromString(m_cloakConfig.value(config_key::transport_proto).toString());
+    if (tp == ProtocolEnumNS::TransportProto::Udp) {
+        args << "-u";
+    }
+
     qDebug().noquote() << "OpenVpnOverCloakProtocol::start()"
                        << cloakExecPath() << args.join(" ");
 
@@ -82,6 +86,7 @@ ErrorCode OpenVpnOverCloakProtocol::start()
         return OpenVpnProtocol::start();
     }
     else return ErrorCode::CloakExecutableMissing;
+#endif
 }
 
 void OpenVpnOverCloakProtocol::stop()
@@ -95,12 +100,9 @@ void OpenVpnOverCloakProtocol::stop()
     Utils::signalCtrl(m_ckProcess.processId(), CTRL_C_EVENT);
 #endif
 
+#ifndef Q_OS_IOS
     m_ckProcess.terminate();
-
-    if (Utils::processIsRunning(Utils::executable("ck-client", false))) {
-        QThread::msleep(1000);
-        Utils::killProcessByName(Utils::executable("ck-client", false));
-    }
+#endif
 }
 
 QString OpenVpnOverCloakProtocol::cloakExecPath()

client/ui/pages_logic/StartPageLogic.cpp

@@ -192,7 +192,7 @@ void StartPageLogic::onPushButtonImportOpenFile()
     file.open(QIODevice::ReadOnly);
     QByteArray data = file.readAll();
 
-    importAnyFile(QString(data));
+    selectConfigFormat(QString(data));
 }
 
 #ifdef Q_OS_ANDROID
@@ -202,7 +202,7 @@ void StartPageLogic::startQrDecoder()
 }
 #endif
 
-void StartPageLogic::importAnyFile(const QString &configData)
+void StartPageLogic::selectConfigFormat(QString configData)
 {
     auto configFormat = checkConfigFormat(configData);
     if (configFormat == ConfigTypes::OpenVpn) {

client/ui/pages_logic/StartPageLogic.h

@@ -37,7 +37,7 @@ public:
     Q_INVOKABLE void startQrDecoder();
 #endif
 
-    void importAnyFile(const QString &configData);
+    void selectConfigFormat(QString configData);
 
     bool importConnection(const QJsonObject &profile);
     bool importConnectionFromCode(QString code);

client/utilities.cpp

@@ -83,7 +83,7 @@ bool Utils::processIsRunning(const QString& fileName)
     QProcess process;
     process.setReadChannel(QProcess::StandardOutput);
     process.setProcessChannelMode(QProcess::MergedChannels);
-    process.start("wmic.exe", QStringList() << "/OUTPUT:STDOUT" << "PROCESS" << "get" << "Caption");
+    process.start(QString("wmic.exe /OUTPUT:STDOUT PROCESS get %1").arg("Caption"));
     process.waitForStarted();
     process.waitForFinished();
     QString processData(process.readAll());
@@ -165,8 +165,9 @@ bool Utils::checkIpSubnetFormat(const QString &ip)
 void Utils::killProcessByName(const QString &name)
 {           
     qDebug().noquote() << "Kill process" << name;
+    qDebug() << "Hello";
 #ifdef Q_OS_WIN
-    QProcess::execute("taskkill", QStringList() << "/IM" << name << "/F");
+    QProcess::execute(QString("taskkill /im %1 /f").arg(name));
 #elif defined Q_OS_IOS
     return;
 #else