Upgrader for macOS MVP

GVFS/GVFS.Common/GVFSPlatform.cs

@@ -27,6 +27,8 @@ public GVFSPlatform(UnderConstructionFlags underConstruction)
         public UnderConstructionFlags UnderConstruction { get; }
         public abstract string Name { get; }
 
+        public abstract string GVFSConfigPath { get; }
+
         public static void Register(GVFSPlatform platform)
         {
             if (GVFSPlatform.Instance != null)
@@ -70,6 +72,20 @@ public static void Register(GVFSPlatform platform)
         public abstract bool IsElevated();
         public abstract string GetCurrentUser();
         public abstract string GetUserIdFromLoginSessionId(int sessionId, ITracer tracer);
+
+        /// <summary>
+        /// Get the directory for upgrades that is permissioned to
+        /// require elevated privledes to modify. This can be used for
+        /// data that we don't want normal user accounts to modify.
+        /// </summary>
+        public abstract string GetUpgradeProtectedDataDirectory();
+
+        /// <summary>
+        /// Get the directory for upgrades that is permissioned for
+        /// user accounts to have access to.
+        /// </summary>
+        public abstract string GetUpgradeNonProtectedDataDirectory();
+
         public abstract void ConfigureVisualStudio(string gitBinPath, ITracer tracer);
 
         public abstract bool TryGetGVFSHooksPathAndVersion(out string hooksPaths, out string hooksVersion, out string error);
@@ -117,6 +133,7 @@ public abstract class GVFSPlatformConstants
             public static readonly char PathSeparator = Path.DirectorySeparatorChar;
             public abstract string ExecutableExtension { get; }
             public abstract string InstallerExtension { get; }
+            public abstract bool SupportsInlineUpgrade { get; }
             public abstract string WorkingDirectoryBackingRootPath { get; }
             public abstract string DotGVFSRoot { get; }
 

GVFS/GVFS.Common/GitHubUpgrader.cs

@@ -49,7 +49,7 @@ public GitHubUpgrader(
         {
             this.Config = upgraderConfig;
 
-            string upgradesDirectoryPath = ProductUpgraderInfo.GetUpgradesDirectoryPath();
+            string upgradesDirectoryPath = ProductUpgraderInfo.GetUpgradeBasicDataDirectory();
             this.fileSystem.CreateDirectory(upgradesDirectoryPath);
         }
 

GVFS/GVFS.Common/LocalGVFSConfig.cs

@@ -15,10 +15,7 @@ public class LocalGVFSConfig
 
         public LocalGVFSConfig()
         {
-            string servicePath = GVFSPlatform.Instance.GetDataRootForGVFSComponent(GVFSConstants.Service.ServiceName);
-            string gvfsDirectory = Path.GetDirectoryName(servicePath);
-
-            this.configFile = Path.Combine(gvfsDirectory, FileName);
+            this.configFile = GVFSPlatform.Instance.GVFSConfigPath;
             this.fileSystem = new PhysicalFileSystem();
         }
 

GVFS/GVFS.Common/ProductUpgrader.cs

@@ -20,7 +20,6 @@ namespace GVFS.Common
 
     public abstract class ProductUpgrader : IDisposable
     {
-        public const string ToolsDirectory = "Tools";
         protected readonly Version installedVersion;
         protected readonly ITracer tracer;
         protected readonly PhysicalFileSystem fileSystem;
@@ -170,8 +169,7 @@ public static bool TryCreateUpgrader(
 
         public virtual bool TrySetupToolsDirectory(out string upgraderToolPath, out string error)
         {
-            string rootDirectoryPath = ProductUpgraderInfo.GetUpgradesDirectoryPath();
-            string toolsDirectoryPath = Path.Combine(rootDirectoryPath, ToolsDirectory);
+            string toolsDirectoryPath = ProductUpgraderInfo.GetUpgradeApplicationDirectory();
 
             if (!this.productUpgraderPlatformStrategy.TryPrepareApplicationDirectory(out error))
             {

GVFS/GVFS.Common/ProductUpgraderInfo.Shared.cs

@@ -9,6 +9,7 @@ public partial class ProductUpgraderInfo
         public const string UpgradeDirectoryName = "GVFS.Upgrade";
         public const string LogDirectory = "UpgraderLogs";
         public const string DownloadDirectory = "Downloads";
+        public const string ToolsDirectory = "Tools";
         public const string HighestAvailableVersionFileName = "HighestAvailableVersion";
 
         public static bool IsLocalUpgradeAvailable(ITracer tracer, string gvfsDataRoot)

GVFS/GVFS.Common/ProductUpgraderInfo.cs

@@ -21,19 +21,29 @@ public static string CurrentGVFSVersion()
             return ProcessHelper.GetCurrentProcessVersion();
         }
 
-        public static string GetUpgradesDirectoryPath()
-        {
-            return GVFSPlatform.Instance.GetDataRootForGVFSComponent(UpgradeDirectoryName);
+        public static string GetUpgradeApplicationDirectory()
+        {
+            return Path.Combine(GVFSPlatform.Instance.GetUpgradeProtectedDataDirectory(), ToolsDirectory);
+        }
+
+        public static string GetUpgradeProtectedDataDirectory()
+        {
+            return GVFSPlatform.Instance.GetUpgradeProtectedDataDirectory();
+        }
+
+        public static string GetUpgradeBasicDataDirectory()
+        {
+            return GVFSPlatform.Instance.GetUpgradeNonProtectedDataDirectory();
         }
 
         public static string GetLogDirectoryPath()
         {
-            return Path.Combine(GetUpgradesDirectoryPath(), LogDirectory);
+            return Path.Combine(GetUpgradeBasicDataDirectory(), LogDirectory);
         }
 
         public static string GetAssetDownloadsPath()
         {
-            return Path.Combine(GetUpgradesDirectoryPath(), DownloadDirectory);
+            return Path.Combine(GetUpgradeProtectedDataDirectory(), ProductUpgraderInfo.DownloadDirectory);
         }
 
         public void DeleteAllInstallerDownloads()
@@ -53,7 +63,7 @@ public void DeleteAllInstallerDownloads()
 
         public void RecordHighestAvailableVersion(Version highestAvailableVersion)
         {
-            string highestAvailableVersionFile = GetHighestAvailableVersionFilePath(GetUpgradesDirectoryPath());
+            string highestAvailableVersionFile = GetHighestAvailableVersionFilePath(GetUpgradeBasicDataDirectory());
 
             if (highestAvailableVersion == null)
             {

GVFS/GVFS.Platform.Mac/MacPlatform.cs

@@ -14,7 +14,13 @@ namespace GVFS.Platform.Mac
 {
     public partial class MacPlatform : POSIXPlatform
     {
-        public MacPlatform()
+        private const string UpgradeProtectedDataDirectory = "/usr/local/vfsforgit_upgrader";
+
+        public MacPlatform() : base(
+             underConstruction: new UnderConstructionFlags(
+                supportsGVFSUpgrade: true,
+                supportsGVFSConfig: true,
+                supportsNuGetEncryption: false))
         {
         }
 
@@ -24,6 +30,14 @@ public MacPlatform()
         public override GVFSPlatformConstants Constants { get; } = new MacPlatformConstants();
         public override IPlatformFileSystem FileSystem { get; } = new MacFileSystem();
 
+        public override string GVFSConfigPath
+        {
+            get
+            {
+                return Path.Combine(this.Constants.GVFSBinDirectoryPath, LocalGVFSConfig.FileName);
+            }
+        }
+
         public override string GetOSVersionInformation()
         {
             ProcessResult result = ProcessHelper.Run("sw_vers", args: string.Empty, redirectOutput: true);
@@ -57,6 +71,16 @@ public override FileBasedLock CreateFileBasedLock(
         {
             return new MacFileBasedLock(fileSystem, tracer, lockPath);
         }
+
+        public override string GetUpgradeProtectedDataDirectory()
+        {
+            return UpgradeProtectedDataDirectory;
+        }
+
+        public override string GetUpgradeNonProtectedDataDirectory()
+        {
+            return this.GetDataRootForGVFSComponent(ProductUpgraderInfo.UpgradeDirectoryName);
+        }
 
         public override Dictionary<string, string> GetPhysicalDiskInfo(string path, bool sizeStatsOnly)
         {

GVFS/GVFS.Platform.Mac/MacProductUpgraderPlatformStrategy.cs

@@ -21,8 +21,7 @@ public override bool TryPrepareLogDirectory(out string error)
 
         public override bool TryPrepareApplicationDirectory(out string error)
         {
-            string rootDirectoryPath = ProductUpgraderInfo.GetUpgradesDirectoryPath();
-            string toolsDirectoryPath = Path.Combine(rootDirectoryPath, ProductUpgrader.ToolsDirectory);
+            string toolsDirectoryPath = ProductUpgraderInfo.GetUpgradeApplicationDirectory();
 
             Exception deleteDirectoryException;
             if (this.FileSystem.DirectoryExists(toolsDirectoryPath) &&

GVFS/GVFS.Platform.Mac/ProjFSKext.cs

@@ -30,7 +30,7 @@ public string LogsFolderPath
 
         public bool IsGVFSUpgradeSupported()
         {
-            return false;
+            return true;
         }
 
         public bool IsSupported(string normalizedEnlistmentRootPath, out string warning, out string error)

GVFS/GVFS.Platform.POSIX/POSIXPlatform.cs

@@ -296,6 +296,8 @@ public override HashSet<string> UpgradeBlockingProcesses
             {
                 get { return new HashSet<string>(StringComparer.OrdinalIgnoreCase) { "GVFS.Mount", "git", "wish" }; }
             }
+
+            public override bool SupportsInlineUpgrade { get; } = true;
         }
     }
 }

GVFS/GVFS.Platform.Windows/GVFS.Platform.Windows.csproj

@@ -131,4 +131,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>

GVFS/GVFS.Platform.Windows/WindowsPlatform.cs

@@ -36,6 +36,17 @@ public partial class WindowsPlatform : GVFSPlatform
         public override string Name { get => "Windows"; }
         public override GVFSPlatformConstants Constants { get; } = new WindowsPlatformConstants();
 
+        public override string GVFSConfigPath
+        {
+            get
+            {
+                string servicePath = GVFSPlatform.Instance.GetDataRootForGVFSComponent(GVFSConstants.Service.ServiceName);
+                string gvfsDirectory = Path.GetDirectoryName(servicePath);
+
+                return Path.Combine(gvfsDirectory, LocalGVFSConfig.FileName);
+            }
+        }
+
         public static string GetStringFromRegistry(string key, string valueName)
         {
             object value = GetValueFromRegistry(RegistryHive.LocalMachine, key, valueName);
@@ -326,6 +337,16 @@ public override string GetUserIdFromLoginSessionId(int sessionId, ITracer tracer
             }
         }
 
+        public override string GetUpgradeProtectedDataDirectory()
+        {
+            return this.GetDataRootForGVFSComponent(ProductUpgraderInfo.UpgradeDirectoryName);
+        }
+
+        public override string GetUpgradeNonProtectedDataDirectory()
+        {
+            return this.GetDataRootForGVFSComponent(ProductUpgraderInfo.UpgradeDirectoryName);
+        }
+
         public override Dictionary<string, string> GetPhysicalDiskInfo(string path, bool sizeStatsOnly) => WindowsPhysicalDiskInfo.GetPhysicalDiskInfo(path, sizeStatsOnly);
 
         public override bool IsConsoleOutputRedirectedToFile()
@@ -422,7 +443,9 @@ public override string InstallerExtension
             {
                 get { return ".exe"; }
             }
-
+
+            public override bool SupportsInlineUpgrade { get; } = false;
+
             public override string WorkingDirectoryBackingRootPath
             {
                 get { return GVFSConstants.WorkingDirectoryRootName; }

GVFS/GVFS.Platform.Windows/WindowsProductUpgraderPlatformStrategy.cs

@@ -40,8 +40,7 @@ public override bool TryPrepareLogDirectory(out string error)
 
         public override bool TryPrepareApplicationDirectory(out string error)
         {
-            string rootDirectoryPath = ProductUpgraderInfo.GetUpgradesDirectoryPath();
-            string toolsDirectoryPath = Path.Combine(rootDirectoryPath, ProductUpgrader.ToolsDirectory);
+            string toolsDirectoryPath = ProductUpgraderInfo.GetUpgradeApplicationDirectory();
 
             Exception deleteDirectoryException;
             if (this.FileSystem.DirectoryExists(toolsDirectoryPath) &&

GVFS/GVFS.Service/GVFS.Service.Mac.csproj

@@ -32,6 +32,7 @@
     <Compile Include="IRepoMounter.cs" />
     <Compile Include="IRepoRegistry.cs" />
     <Compile Include="Program.Mac.cs" />
+    <Compile Include="ProductUpgradeTimer.cs" />
     <Compile Include="RepoRegistration.cs" />
     <Compile Include="RepoRegistry.cs" />
   </ItemGroup>

GVFS/GVFS.Service/GVFSService.Mac.cs

@@ -19,6 +19,7 @@ public class GVFSService
         private string serviceName;
         private IRepoRegistry repoRegistry;
         private RequestHandler requestHandler;
+        private ProductUpgradeTimer productUpgradeTimer;
 
         public GVFSService(
             ITracer tracer,
@@ -32,6 +33,7 @@ public GVFSService(
             this.serviceStopped = new ManualResetEvent(false);
             this.serviceThread = new Thread(this.ServiceThreadMain);
             this.requestHandler = new RequestHandler(this.tracer, EtwArea, this.repoRegistry);
+            this.productUpgradeTimer = new ProductUpgradeTimer(tracer);
         }
 
         public void Run()
@@ -51,6 +53,7 @@ public void Run()
                         this.requestHandler.HandleRequest))
                     {
                         this.serviceThread.Start();
+                        this.productUpgradeTimer.Start();
                         this.serviceThread.Join();
                     }
                 }

GVFS/GVFS.Service/GVFSService.Windows.cs

@@ -313,7 +313,7 @@ private void CreateAndConfigureProgramDataDirectories()
             // Create GVFS.Service and GVFS.Upgrade related directories (if they don't already exist)
             Directory.CreateDirectory(serviceDataRootPath, serviceDataRootSecurity);
             Directory.CreateDirectory(this.serviceDataLocation, serviceDataRootSecurity);
-            Directory.CreateDirectory(ProductUpgraderInfo.GetUpgradesDirectoryPath(), serviceDataRootSecurity);
+            Directory.CreateDirectory(ProductUpgraderInfo.GetUpgradeProtectedDataDirectory(), serviceDataRootSecurity);
 
             // Ensure the ACLs are set correctly on any files or directories that were already created (e.g. after upgrading VFS4G)
             Directory.SetAccessControl(serviceDataRootPath, serviceDataRootSecurity);

GVFS/GVFS.Service/ProductUpgradeTimer.cs

@@ -12,11 +12,11 @@ namespace GVFS.Service
     public class ProductUpgradeTimer : IDisposable
     {
         private static readonly TimeSpan TimeInterval = TimeSpan.FromDays(1);
-        private JsonTracer tracer;
+        private ITracer tracer;
         private PhysicalFileSystem fileSystem;
         private Timer timer;
 
-        public ProductUpgradeTimer(JsonTracer tracer)
+        public ProductUpgradeTimer(ITracer tracer)
         {
             this.tracer = tracer;
             this.fileSystem = new PhysicalFileSystem();

GVFS/GVFS.UnitTests.Windows/Windows/Mock/MockProcessLauncher.cs

@@ -32,7 +32,7 @@ public override int ExitCode
             get { return this.exitCode; }
         }
 
-        public override bool TryStart(string path, string args, out Exception exception)
+        public override bool TryStart(string path, string args, bool useShellExecute, out Exception exception)
         {
             this.LaunchPath = path;
             this.IsLaunched = true;

GVFS/GVFS.UnitTests/Common/ProductUpgraderInfoTests.cs

@@ -18,15 +18,17 @@ public class ProductUpgraderInfoTests
     {
         private Mock<PhysicalFileSystem> mockFileSystem;
         private ProductUpgraderInfo productUpgraderInfo;
+
         private string upgradeDirectory;
+
         private string expectedNewVersionExistsFileName = "HighestAvailableVersion";
         private string expectedNewVersionExistsFilePath;
         private MockTracer tracer;
 
         [SetUp]
         public void SetUp()
         {
-            this.upgradeDirectory = GVFSPlatform.Instance.GetDataRootForGVFSComponent(ProductUpgraderInfo.UpgradeDirectoryName);
+            this.upgradeDirectory = ProductUpgraderInfo.GetUpgradeBasicDataDirectory();
             this.expectedNewVersionExistsFilePath = Path.Combine(this.upgradeDirectory, this.expectedNewVersionExistsFileName);
             this.mockFileSystem = new Mock<PhysicalFileSystem>();
 

GVFS/GVFS.UnitTests/Mock/Common/MockPlatform.cs

@@ -29,6 +29,8 @@ public class MockPlatform : GVFSPlatform
 
         public override string Name { get => "Mock"; }
 
+        public override string GVFSConfigPath { get => Path.Combine("mock:", LocalGVFSConfig.FileName); }
+
         public override GVFSPlatformConstants Constants { get; } = new MockPlatformConstants();
 
         public HashSet<int> ActiveProcesses { get; } = new HashSet<int>();
@@ -100,6 +102,16 @@ public override Dictionary<string, string> GetPhysicalDiskInfo(string path, bool
         {
             return new Dictionary<string, string>();
         }
+
+        public override string GetUpgradeProtectedDataDirectory()
+        {
+            return this.GetDataRootForGVFSComponent(ProductUpgraderInfo.UpgradeDirectoryName);
+        }
+
+        public override string GetUpgradeNonProtectedDataDirectory()
+        {
+            return this.GetDataRootForGVFSComponent(ProductUpgraderInfo.UpgradeDirectoryName);
+        }
 
         public override void InitializeEnlistmentACLs(string enlistmentPath)
         {
@@ -216,6 +228,8 @@ public override HashSet<string> UpgradeBlockingProcesses
             {
                 get { return new HashSet<string>(StringComparer.OrdinalIgnoreCase) { "GVFS", "GVFS.Mount", "git", "wish", "bash" }; }
             }
+
+            public override bool SupportsInlineUpgrade { get; } = false;
         }
     }
 }