Merge pull request #6966 from RedesignedRobot/fix/macos-installer-permissions-tahoe

macOS: fix chflags failure on fresh installs breaking permission setup

Author: AenBleidd

clientgui/mac/SetupSecurity.cpp

@@ -986,25 +986,30 @@ static OSStatus CreateUserAndGroup(char * user_name, char * group_name) {
 
     // Hide the home directory and share point https://support.apple.com/en-mn/102099
     // Something like "sudo chflags hidden /Users/boinc_master"
-    args[0] = "/usr/bin/sudo";
-    args[1] = "chflags";
-    args[2] = "hidden";
-    args[3] = buf2;
-    args[4] = NULL;
-    err = posix_spawnp(&thePid, "/usr/bin/sudo", NULL, NULL, args, environ);
-    waitpid(thePid, &status, WUNTRACED);
-    if (status != 0) {
-        err = status;
-    } else {
-        if (WIFEXITED(status)) {
-            err = WEXITSTATUS(status);
-            if (err == 1) {
-                err = errno;
-            }
-        }   // end if (WIFEXITED(status)) else
-    }       // end if waitpid returned 0 sstaus else
-if (err)
-    return err;
+    // buf2 was overwritten to DSCL path "/users/<name>" above; rebuild filesystem path.
+    // Skip if the directory doesn't exist (fresh installs set home to /var/empty).
+    sprintf(buf2, "/Users/%s", user_name);
+    if (access(buf2, F_OK) == 0) {
+        args[0] = "/usr/bin/sudo";
+        args[1] = "chflags";
+        args[2] = "hidden";
+        args[3] = buf2;
+        args[4] = NULL;
+        err = posix_spawnp(&thePid, "/usr/bin/sudo", NULL, NULL, args, environ);
+        waitpid(thePid, &status, WUNTRACED);
+        if (status != 0) {
+            err = status;
+        } else {
+            if (WIFEXITED(status)) {
+                err = WEXITSTATUS(status);
+                if (err == 1) {
+                    err = errno;
+                }
+            }   // end if (WIFEXITED(status)) else
+        }       // end if waitpid returned 0 sstaus else
+        if (err)
+            return err;
+    }
 
     err = ResynchDSSystem();
     if (err != noErr)

mac_installer/PostInstall.cpp

@@ -384,27 +384,27 @@ int main(int argc, char *argv[])
     for (i=0; i<RETRY_LIMIT; ++i) {
         err = CreateBOINCUsersAndGroups();
         if (err != noErr) {
-            printf("CreateBOINCUsersAndGroups returned %d (repetition=%d)", err, i);
+            printf("CreateBOINCUsersAndGroups returned %d (repetition=%d)\n", err, i);
             fflush(stdout);
-            REPORT_ERROR(i >= RETRY_LIMIT);
+            REPORT_ERROR(i >= RETRY_LIMIT - 1);
             continue;
         }
 
         // err = SetBOINCAppOwnersGroupsAndPermissions("/Applications/GridRepublic Desktop.app");
         err = SetBOINCAppOwnersGroupsAndPermissions(appPath[brandID]);
 
         if (err != noErr) {
-            printf("SetBOINCAppOwnersGroupsAndPermissions returned %d (repetition=%d)", err, i);
+            printf("SetBOINCAppOwnersGroupsAndPermissions returned %d (repetition=%d)\n", err, i);
             fflush(stdout);
-            REPORT_ERROR(i >= RETRY_LIMIT);
+            REPORT_ERROR(i >= RETRY_LIMIT - 1);
             continue;
         }
 
         err = SetBOINCDataOwnersGroupsAndPermissions();
         if (err != noErr) {
-            printf("SetBOINCDataOwnersGroupsAndPermissions returned %d (repetition=%d)", err, i);
+            printf("SetBOINCDataOwnersGroupsAndPermissions returned %d (repetition=%d)\n", err, i);
             fflush(stdout);
-            REPORT_ERROR(i >= RETRY_LIMIT);
+            REPORT_ERROR(i >= RETRY_LIMIT - 1);
             continue;
         }
 
@@ -414,14 +414,23 @@ int main(int argc, char *argv[])
             true, false, NULL, 0
         );
         if (err != noErr) {
-            printf("check_security returned %d (repetition=%d)", err, i);
+            printf("check_security returned %d (repetition=%d)\n", err, i);
             fflush(stdout);
-            REPORT_ERROR(i >= RETRY_LIMIT);
+            REPORT_ERROR(i >= RETRY_LIMIT - 1);
         } else {
             break;
         }
     }
 
+    // If security setup failed after all retries, report failure to the
+    // macOS Installer so it does not show "Installation Successful" when
+    // permissions were never set correctly.
+    if (err != noErr) {
+        printf("BOINC security setup failed after %d attempts (last error=%d)\n", RETRY_LIMIT, err);
+        fflush(stdout);
+        return err;
+    }
+
 #else   // ! defined(SANDBOX)
 
     Boolean                 Success = false;