v2.11.5

Author: bernerdad

Dockerfile

@@ -1,8 +1,14 @@
-FROM ubuntu:22.04
-
+FROM ubuntu:20.04
 COPY ./tools/requirements.txt /r/
+ENV PATH=/opt/cmake/bin:$PATH
 ENV DEBIAN_FRONTEND=noninteractive
-RUN apt update && apt install -y build-essential cmake git curl patchelf libpam0g-dev software-properties-common libgl1-mesa-dev fakeroot python3-pip zip unzip libnl-genl-3-dev pkg-config libcap-ng-dev wget autoconf libtool libfontconfig1-dev libfreetype6-dev libx11-dev libx11-xcb-dev libxext-dev libxfixes-dev libxi-dev libxrender-dev libxcb1-dev libxcb-cursor-dev libxcb-glx0-dev libxcb-keysyms1-dev libxcb-image0-dev libxcb-shm0-dev libxcb-icccm4-dev libxcb-sync-dev libxcb-xfixes0-dev libxcb-shape0-dev libxcb-randr0-dev libxcb-render-util0-dev libxcb-util-dev libxcb-xinerama0-dev libxcb-xkb-dev libxkbcommon-dev libxkbcommon-x11-dev golang \
- && python3 -m pip install -r /r/requirements.txt
+RUN apt update && apt install -y build-essential cmake git curl patchelf libpam0g-dev software-properties-common libgl1-mesa-dev fakeroot python3-pip zip unzip libnl-genl-3-dev pkg-config libcap-ng-dev wget autoconf libtool libfontconfig1-dev libfreetype6-dev libx11-dev libx11-xcb-dev libxext-dev libxfixes-dev libxi-dev libxrender-dev libxcb1-dev libxcb-cursor-dev libxcb-glx0-dev libxcb-keysyms1-dev libxcb-image0-dev libxcb-shm0-dev libxcb-icccm4-dev libxcb-sync-dev libxcb-xfixes0-dev libxcb-shape0-dev libxcb-randr0-dev libxcb-render-util0-dev libxcb-util-dev libxcb-xinerama0-dev libxcb-xkb-dev libxkbcommon-dev libxkbcommon-x11-dev libwayland-dev
+RUN python3 -m pip install -r /r/requirements.txt
+
+RUN wget https://go.dev/dl/go1.22.5.linux-amd64.tar.gz && rm -rf /usr/local/go && tar -C /usr/local -xzf go1.22.5.linux-amd64.tar.gz
+RUN ln -sf /usr/local/go/bin/go /usr/local/bin/go
+
+RUN wget https://cmake.org/files/v3.29/cmake-3.29.6-linux-x86_64.sh && mkdir -p /opt/cmake && yes | sh cmake-3.29.6-linux-x86_64.sh --prefix=/opt/cmake
+RUN ln -sf /opt/cmake/cmake-3.29.6-linux-x86_64/bin/cmake /usr/bin/cmake
 
 WORKDIR /w

README.md

@@ -15,7 +15,7 @@ This repo contains the complete source code for the Windscribe 2.0 app. This inc
 - Install Ninja v1.10.2 from [here](https://github.com/ninja-build/ninja/releases)
 - Install vcpkg from [here]((https://vcpkg.io/en/getting-started.html)
     - Create a `VCPKG_ROOT` environment variable referencing the full path to your vcpkg install folder.
-    - Go to the vcpkg directory and `git checkout a664e41ee50b61adcc90a44a761eca139a4b7dd7~`, since versions beyond this will fail to build with the current baseline.
+    - Go to the vcpkg directory and `git checkout 576379156e82da642f8d1834220876759f13534d`.
     - Do the bootstrap step after the above command.
 - Verify the following entries are in your System `PATH` environment variable. If they are not, add them to the System `PATH` environment variable and reboot.
     - `C:\Program Files\Git\cmd`
@@ -113,7 +113,7 @@ See `build_all --help` for other build options.
 - Install CMake v3.28.x or newer from [here](https://cmake.org/download/) and make sure that the cmake executable is in the path and available for execution. The project will build with older versions of CMake, but you may encounter some warnings.
 - Install vcpkg from [here](https://vcpkg.io/en/getting-started.html)
     - Create a `VCPKG_ROOT` environment variable referencing the full path to your vcpkg install folder.
-    - Go to the vcpkg directory and `git checkout a664e41ee50b61adcc90a44a761eca139a4b7dd7~`, since versions beyond this will fail to build with the current baseline.
+    - Go to the vcpkg directory and `git checkout 576379156e82da642f8d1834220876759f13534d`.
     - Do the bootstrap step after the above command.
 - Clone the repository.
 - Install python deps:
@@ -164,7 +164,7 @@ The repository contains Dockerfile to simplify building process. Skip all the ot
 ```
 - Install vcpkg:
 ```bash
-  sudo docker run --rm -v .:/w ws-builder /bin/bash -c "git clone https://github.com/Microsoft/vcpkg.git && ./vcpkg/bootstrap-vcpkg.sh --disableMetrics"
+  sudo docker run --rm -v .:/w ws-builder /bin/bash -c "git clone https://github.com/Microsoft/vcpkg.git && git checkout 576379156e82da642f8d1834220876759f13534d && ./vcpkg/bootstrap-vcpkg.sh --disableMetrics"
 ```
 - Build all the dependencies:
 ```bash
@@ -190,7 +190,7 @@ Build process tested on Ubuntu 20.04/ZorinOS 16 (gcc 9.3.0).
 ```
 - Install vcpkg from [here](https://vcpkg.io/en/getting-started.html)
     - Create a `VCPKG_ROOT` environment variable referencing the full path to your vcpkg install folder.
-    - Go to the vcpkg directory and `git checkout a664e41ee50b61adcc90a44a761eca139a4b7dd7~`, since versions beyond this will fail to build with the current baseline.
+    - Go to the vcpkg directory and `git checkout 576379156e82da642f8d1834220876759f13534d`.
     - Do the bootstrap step after the above command.
 - Install golang (minimum version 1.18): follow instructions from `https://go.dev/doc/install`
 - Clone the repository.

backend/linux/helper/process_command.cpp

@@ -360,7 +360,7 @@ CMD_ANSWER startCtrld(boost::archive::text_iarchive &ia)
     Logger::instance().out("Starting ctrld");
 
     // Validate URLs
-    if (!Utils::isValidUrl(cmd.upstream1) || (!cmd.upstream2.empty() && !Utils::isValidUrl(cmd.upstream2))) {
+    if (cmd.upstream1.empty() || Utils::normalizeAddress(cmd.upstream1).empty() || (!cmd.upstream2.empty() && Utils::normalizeAddress(cmd.upstream2).empty())) {
         Logger::instance().out("Invalid upstream URL(s)");
         answer.executed = 0;
         return answer;

backend/linux/helper/split_tunneling/hostnames_manager/dns_resolver.cpp

@@ -12,7 +12,7 @@ DnsResolver::DnsResolver(std::function<void (std::map<std::string, HostInfo>)> r
     }, false);
 
 
-    if (!WSNet::initialize("", "", false, "")) {
+    if (!WSNet::initialize("", "", "", "", "", false, "")) {
         Logger::instance().out("WSNet::initialize failed");
     }
 

backend/linux/helper/utils.cpp

@@ -172,34 +172,38 @@ bool isValidIpAddress(const std::string &address)
     return inet_pton(AF_INET, address.c_str(), &(sa.sin_addr)) != 0;
 }
 
-bool isValidUrl(const std::string &address)
+bool isValidDomain(const std::string &address)
 {
     if (isValidIpAddress(address)) {
-        return true;
+        return false;
     }
 
-    auto url = skyr::parse(address);
-    // parsing still "succeeds" if there are invalid characters in the URL e.g. if there are characters which are invalid after the domain.
-    // check that the serialized URL is the same as the original.
-    if (!url || skyr::serialize(url.value()) != address) {
+    auto domain = skyr::parse_host(address);
+    if (!domain) {
         return false;
     }
 
     return true;
 }
 
-bool isValidDomain(const std::string &address)
+std::string normalizeAddress(const std::string &address)
 {
+    std::string addr = address;
+
     if (isValidIpAddress(address)) {
-        return false;
+        return addr;
     }
 
-    auto domain = skyr::parse_host(address);
-    if (!domain) {
-        return false;
+    if (isValidDomain(address)) {
+        return addr;
     }
 
-    return true;
+    auto url = skyr::parse(address);
+    if (!url) {
+        return "";
+    }
+
+    return skyr::serialize(url.value());
 }
 
 } // namespace Utils

backend/linux/helper/utils.h

@@ -40,7 +40,7 @@ namespace Utils
     std::string getExePath();
 
     // check if a string is a valid address
+    std::string normalizeAddress(const std::string &address);
     bool isValidIpAddress(const std::string &address);
-    bool isValidUrl(const std::string &address);
     bool isValidDomain(const std::string &address);
 };

backend/mac/helper/helper-info.plist

@@ -9,7 +9,7 @@
     <key>CFBundleName</key>
     <string>WindscribeHelper</string>
     <key>CFBundleVersion</key>
-    <string>69</string>
+    <string>73</string>
     <key>NSHumanReadableCopyright</key>
     <string>Copyright © 2024 Windscribe Limited. All rights reserved.</string>
     <key>LSMinimumSystemVersion</key>

backend/mac/helper/ip_hostnames/ares_library_init.cpp

@@ -19,12 +19,12 @@ AresLibraryInit::~AresLibraryInit()
 void AresLibraryInit::init()
 {
     if (!init_ && !failedInit_) {
-		int status = ares_library_init(ARES_LIB_INIT_ALL);
-		if (status != ARES_SUCCESS) {
-			Logger::instance().out("ares_library_init failed: %s", ares_strerror(status));
-			failedInit_ = true;
-		} else {
-			init_ = true;
-		}
+        int status = ares_library_init(ARES_LIB_INIT_ALL);
+        if (status != ARES_SUCCESS) {
+            Logger::instance().out("ares_library_init failed: %s", ares_strerror(status));
+            failedInit_ = true;
+        } else {
+            init_ = true;
+        }
     }
 }