v2.13.7

Windscribe · Jan 21, 2025 · e679d58 · e679d58
1 parent 2520038
commit e679d58
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 12 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -12,7 +12,7 @@ variables:
   BUILD_LINUX_CLI: 'y'
   GIT_DEPTH: 5 # Only grab the last 5 commits when cloning
   NEXUS_PATH_ROOT: 'https://nexus.int.windscribe.com/repository/client-desktop/client-desktop'
-  NEXUS_PATH_DEPS: '$NEXUS_PATH_ROOT/dependencies/current'
+  NEXUS_PATH_DEPS: '$NEXUS_PATH_ROOT/dependencies/2.13'
   NEXUS_PATH_VCPKG_CACHE: '$NEXUS_PATH_ROOT/vcpkg_cache/current'
   NEXUS_PATH_BRANCH_UPLOAD: '${NEXUS_PATH_ROOT}/branches/${CI_COMMIT_BRANCH}'
   NEXUS_PATH_TAGGED_UPLOAD: '${NEXUS_PATH_ROOT}/tagged-builds'

diff --git a/client/common/changelog.txt b/client/common/changelog.txt
@@ -1,7 +1,12 @@
+2.13.7 (21/01/2025)
+Windows:
+   * Fixed installer bootstrap cannot set folder permissions on non-English Windows. #1226
+
+
 2.13.6 (09/01/2025)
 All:
    * Fixed autoconnect attempting to connect to invalid locations. #1221
-   * Fixed incorrect static device name on Mac/Linux. #1233 
+   * Fixed incorrect static device name on Mac/Linux. #1233
 Windows:
    * Fixed incorrect firewall rule blocking IPv6 during inclusive split tunnel. #1111
    * Fixed missing interface in MAC spoofing dropdown. #1200

diff --git a/client/common/version/windscribe_version.h b/client/common/version/windscribe_version.h
@@ -2,7 +2,7 @@
 
 #define WINDSCRIBE_MAJOR_VERSION 2
 #define WINDSCRIBE_MINOR_VERSION 13
-#define WINDSCRIBE_BUILD_VERSION 6
+#define WINDSCRIBE_BUILD_VERSION 7
 
 // only one of these should be enabled; neither -> stable
 #define WINDSCRIBE_IS_BETA

diff --git a/installer/windows/bootstrap/main.cpp b/installer/windows/bootstrap/main.cpp
@@ -162,23 +162,36 @@ static bool setFolderPermissions(const std::filesystem::path &folder)
         return false;
     }
 
-    // Set up an EXPLICIT_ACCESS structure for the Administrators group.
-    EXPLICIT_ACCESS ea;
-    ::ZeroMemory(&ea, sizeof(ea));
-    ea.grfAccessPermissions = GENERIC_ALL;
-    ea.grfAccessMode = SET_ACCESS;
-    ea.grfInheritance = SUB_CONTAINERS_AND_OBJECTS_INHERIT;
-    ea.Trustee.TrusteeForm = TRUSTEE_IS_NAME;
-    ea.Trustee.TrusteeType = TRUSTEE_IS_GROUP;
-    ea.Trustee.ptstrName = (LPWCH)L"Administrators";
+    // Create a SID for the BUILTIN\Administrators group
+    SID_IDENTIFIER_AUTHORITY SIDAuthNT = SECURITY_NT_AUTHORITY;
+    PSID sidAdmin = NULL;
+    result = ::AllocateAndInitializeSid(&SIDAuthNT, 2, SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, &sidAdmin);
+    if (!result) {
+        debugMessage(_T("setFolderPermissions AllocateAndInitializeSid failed: %lu"), ::GetLastError());
+        return false;
+    }
 
     PACL pACL = NULL;
     auto exitGuard = wsl::wsScopeGuard([&] {
         if (pACL) {
             ::LocalFree(pACL);
         }
+
+        if (sidAdmin) {
+            ::FreeSid(sidAdmin);
+        }
     });
 
+    // Set up an EXPLICIT_ACCESS structure for the Administrators group.
+    EXPLICIT_ACCESS ea;
+    ::ZeroMemory(&ea, sizeof(ea));
+    ea.grfAccessPermissions = GENERIC_ALL;
+    ea.grfAccessMode = SET_ACCESS;
+    ea.grfInheritance = SUB_CONTAINERS_AND_OBJECTS_INHERIT;
+    ea.Trustee.TrusteeForm = TRUSTEE_IS_SID;
+    ea.Trustee.TrusteeType = TRUSTEE_IS_GROUP;
+    ea.Trustee.ptstrName = reinterpret_cast<LPTSTR>(sidAdmin);
+
     // Create a new ACL with these permissions.
     result = ::SetEntriesInAcl(1, &ea, NULL, &pACL);
     if (result != ERROR_SUCCESS) {