Backed out 5 changesets (bug 1732435) for causing bustages at nsXREDirProvider.cpp. CLOSED TREE

Backed out changeset db0701b309ad (bug 1732435)
Backed out changeset 22a583f191e2 (bug 1732435)
Backed out changeset b37ed631436f (bug 1732435)
Backed out changeset 8a734e8a313b (bug 1732435)
Backed out changeset 9cb78a88ffde (bug 1732435)

Author: Butkovits Atila

browser/installer/windows/nsis/installer.nsi

@@ -410,6 +410,12 @@ Section "-Application" APP_IDX
     StrCpy $AddDesktopSC "1"
   ${EndIf}
 
+  ${CreateUpdateDir} "Mozilla"
+  ${If} ${Errors}
+    Pop $0
+    ${LogMsg} "** ERROR Failed to create update directory: $0"
+  ${EndIf}
+
   ${LogHeader} "Adding Registry Entries"
   SetShellVarContext current  ; Set SHCTX to HKCU
   ${RegCleanMain} "Software\Mozilla"

browser/installer/windows/nsis/uninstaller.nsi

@@ -327,8 +327,7 @@ Function un.OpenRefreshHelpURL
   ExecShell "open" "${URLProfileRefreshHelp}"
 FunctionEnd
 
-; Returns the common directory (typically
-; "C:\ProgramData\Mozilla-1de4eec8-1241-4177-a864-e594e8d1fb38") on the stack.
+; Returns the common directory (typically "C:\ProgramData\Mozilla") on the stack.
 Function un.GetCommonDirectory
   Push $0   ; Save $0
 
@@ -337,7 +336,7 @@ Function un.GetCommonDirectory
 
   ; Add our subdirectory, this is hardcoded as grandparent of the update directory in
   ; several other places.
-  StrCpy $0 "$0\Mozilla-1de4eec8-1241-4177-a864-e594e8d1fb38"
+  StrCpy $0 "$0\Mozilla"
 
   Exch $0   ; Restore original $0 and put our $0 on the stack.
 FunctionEnd

toolkit/components/maintenanceservice/workmonitor.cpp

@@ -801,6 +801,25 @@ BOOL ExecuteServiceCommand(int argc, LPWSTR* argv) {
     // because the service self updates itself and the service
     // installer will stop the service.
     LOG(("Service command %ls complete.", argv[2]));
+  } else if (!lstrcmpi(argv[2], L"fix-update-directory-perms")) {
+    bool gotInstallDir = true;
+    mozilla::UniquePtr<wchar_t[]> updateDir;
+    if (argc <= 3) {
+      LOG_WARN(("Didn't get an install dir for fix-update-directory-perms"));
+      gotInstallDir = false;
+    }
+    HRESULT permResult =
+        GetCommonUpdateDirectory(gotInstallDir ? argv[3] : nullptr,
+                                 SetPermissionsOf::AllFilesAndDirs, updateDir);
+    if (FAILED(permResult)) {
+      LOG_WARN(
+          ("Unable to set the permissions on the update directory "
+           "('%S'): %d",
+           updateDir.get(), permResult));
+      result = FALSE;
+    } else {
+      result = TRUE;
+    }
   } else {
     LOG_WARN(("Service command not recognized: %ls.", argv[2]));
     // result is already set to FALSE

toolkit/mozapps/installer/windows/nsis/common.nsh

@@ -3567,11 +3567,11 @@
           ${If} $R2 != ""
             ; Backup the old update directory logs and delete the directory
             ${If} ${FileExists} "$R2\updates\last-update.log"
-              Rename "$R2\updates\last-update.log" "$TEMP\moz-update-old-1-last-update.log"
+              Rename "$R2\updates\last-update.log" "$TEMP\moz-update-oldest-last-update.log"
             ${EndIf}
 
             ${If} ${FileExists} "$R2\updates\backup-update.log"
-              Rename "$R2\updates\backup-update.log" "$TEMP\moz-update-old-1-backup-update.log"
+              Rename "$R2\updates\backup-update.log" "$TEMP\moz-update-oldest-backup-update.log"
             ${EndIf}
 
             ${If} ${FileExists} "$R2\updates"
@@ -3592,50 +3592,24 @@
           StrCpy $R0 "$R9\$R8\$R1"
 
           ${If} ${FileExists} "$R0\updates\last-update.log"
-            Rename "$R0\updates\last-update.log" "$TEMP\moz-update-old-2-last-update.log"
+            Rename "$R0\updates\last-update.log" "$TEMP\moz-update-older-last-update.log"
           ${EndIf}
 
           ${If} ${FileExists} "$R0\updates\backup-update.log"
-            Rename "$R0\updates\backup-update.log" "$TEMP\moz-update-old-2-backup-update.log"
+            Rename "$R0\updates\backup-update.log" "$TEMP\moz-update-older-backup-update.log"
           ${EndIf}
 
           ; Remove the old updates directory, located in the user's Windows profile directory
           ${If} ${FileExists} "$R0\updates"
             RmDir /r "$R0"
           ${EndIf}
 
+          ; Get the new updates directory so we can remove that too
+          ; The new update directory is in the Program Data directory
+          ; (currently C:\ProgramData).
           ${GetCommonAppDataFolder} $R0
           StrCpy $R0 "$R0\$R8\$R1"
 
-          ${If} ${FileExists} "$R0\updates\last-update.log"
-            Rename "$R0\updates\last-update.log" "$TEMP\moz-update-old-3-last-update.log"
-          ${EndIf}
-
-          ${If} ${FileExists} "$R0\updates\backup-update.log"
-            Rename "$R0\updates\backup-update.log" "$TEMP\moz-update-old-3-backup-update.log"
-          ${EndIf}
-
-          ; Even though this is an old update directory, completely clear it out
-          ; on uninstall only, not on installation. If this is an installation,
-          ; it may be a paveover install and there may be un-migrated settings
-          ; in the update directory that we don't want to lose.
-          ; On install though, we should still remove pending updates and update
-          ; metadata since migrating that data could potentially confuse Firefox
-          ; into thinking that it failed to apply an update.
-          !if "${_MOZFUNC_UN}" == "un."
-            ${If} ${FileExists} "$R0"
-              RmDir /r "$R0"
-            ${EndIf}
-          !else
-            ${If} ${FileExists} "$R0\updates"
-              RmDir /r "$R0\updates"
-            ${EndIf}
-            Delete "$R0\active-update.xml"
-          !endif
-
-          ${GetCommonAppDataFolder} $R0
-          StrCpy $R0 "$R0\Mozilla-1de4eec8-1241-4177-a864-e594e8d1fb38\updates\$R1"
-
           ${If} ${FileExists} "$R0\updates\last-update.log"
             Rename "$R0\updates\last-update.log" "$TEMP\moz-update-newest-last-update.log"
           ${EndIf}
@@ -3732,6 +3706,84 @@
   !endif
 !macroend
 
+/**
+ * Create the update directory and sets the permissions correctly
+ *
+ * @param   ROOT_DIR_NAME
+ *          The name of the update directory to be created in the common
+ *          application directory. For example, if ROOT_DIR_NAME is "Mozilla",
+ *          the created directory will be "C:\ProgramData\Mozilla".
+ *
+ * $R0 = Used for checking errors
+ * $R1 = The common application directory path
+ * $R9 = An error message to be returned on the stack
+ */
+!macro CreateUpdateDir ROOT_DIR_NAME
+  Push $R9
+  Push $R0
+  Push $R1
+
+  ; The update directory is in the Program Data directory
+  ; (currently C:\ProgramData).
+  ${GetCommonAppDataFolder} $R1
+  StrCpy $R1 "$R1\${ROOT_DIR_NAME}"
+
+  ClearErrors
+  ${IfNot} ${FileExists} "$R1"
+    CreateDirectory "$R1"
+    ${If} ${Errors}
+      StrCpy $R9 "Unable to create directory: $R1"
+      GoTo end
+    ${EndIf}
+  ${EndIf}
+
+  ; Grant Full Access to the Builtin User group
+  AccessControl::SetOnFile "$R1" "(BU)" "FullAccess"
+  Pop $R0
+  ${If} $R0 == error
+    Pop $R9  ; Get AccessControl's Error Message
+    SetErrors
+    GoTo end
+  ${EndIf}
+
+  ; Grant Full Access to the Builtin Administrator group
+  AccessControl::SetOnFile "$R1" "(BA)" "FullAccess"
+  Pop $R0
+  ${If} $R0 == error
+    Pop $R9  ; Get AccessControl's Error Message
+    SetErrors
+    GoTo end
+  ${EndIf}
+
+  ; Grant Full Access to the SYSTEM user
+  AccessControl::SetOnFile "$R1" "(SY)" "FullAccess"
+  Pop $R0
+  ${If} $R0 == error
+    Pop $R9  ; Get AccessControl's Error Message
+    SetErrors
+    GoTo end
+  ${EndIf}
+
+  ; Remove inherited permissions
+  AccessControl::DisableFileInheritance "$R1"
+  Pop $R0
+  ${If} $R0 == error
+    Pop $R9  ; Get AccessControl's Error Message
+    SetErrors
+    GoTo end
+  ${EndIf}
+
+end:
+  Pop $R1
+  Pop $R0
+  ${If} ${Errors}
+    Exch $R9
+  ${Else}
+    Pop $R9
+  ${EndIf}
+!macroend
+!define CreateUpdateDir "!insertmacro CreateUpdateDir"
+
 /**
  * Deletes shortcuts and Start Menu directories under Programs as specified by
  * the shortcuts log ini file and on Windows 7 unpins TaskBar and Start Menu

toolkit/mozapps/update/BackgroundUpdate.jsm

@@ -55,7 +55,7 @@ Cu.importGlobalProperties(["Glean"]);
 // by storing the installed version number of the task to a pref and comparing
 // that version number to the current version. If they aren't equal, we know
 // that we have to re-register the task.
-const TASK_DEF_CURRENT_VERSION = 3;
+const TASK_DEF_CURRENT_VERSION = 2;
 const TASK_INSTALLED_VERSION_PREF =
   "app.update.background.lastInstalledTaskVersion";
 
@@ -508,41 +508,6 @@ var BackgroundUpdate = {
         } catch (e) {
           log.error(`${SLUG}: Error removing old task: ${e}`);
         }
-        try {
-          // When the update directory was moved, we migrated the old contents
-          // to the new location. This can potentially happen in a background
-          // task. However, we also need to re-register the background task
-          // with the task scheduler in order to update the MOZ_LOG_FILE value
-          // to point to the new location. If the task runs before Firefox has
-          // a chance to re-register the task, the log file may be recreated in
-          // the old location. In practice, this would be unusual, because
-          // MOZ_LOG_FILE will not create the parent directories necessary to
-          // put a log file in the specified location. But just to be safe,
-          // we'll do some cleanup when we re-register the task to make sure
-          // that no log file is hanging around in the old location.
-          let oldUpdateDir = FileUtils.getDir("OldUpdRootD", [], false);
-          let oldLog = oldUpdateDir.clone();
-          oldLog.append("backgroundupdate.moz_log");
-
-          if (oldLog.exists()) {
-            oldLog.remove(false);
-            // We may have created some directories in order to put this log
-            // file in this location. Clean them up if they are empty.
-            // (If we pass false for the recurse parameter, directories with
-            // contents will not be removed)
-            //
-            // Potentially removes "C:\ProgramData\Mozilla\updates\<hash>"
-            oldUpdateDir.remove(false);
-            // Potentially removes "C:\ProgramData\Mozilla\updates"
-            oldUpdateDir.parent.remove(false);
-            // Potentially removes "C:\ProgramData\Mozilla"
-            oldUpdateDir.parent.parent.remove(false);
-          }
-        } catch (ex) {
-          log.warn(
-            `${SLUG}: Ignoring error encountered attempting to remove stale log file: ${ex}`
-          );
-        }
       }
 
       log.info(