Skip to content

Avoid elevation if we will noop in MSI-based operations to adjust the install state #38117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 19, 2024
Merged

Avoid elevation if we will noop in MSI-based operations to adjust the install state #38117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0bce0db
Avoid elevation if we will noop
Forgind Jan 18, 2024
4d4cd59
Optimize mode setting
Forgind Jan 18, 2024
c587d53
Simplify reading InstallStateContents
Forgind Jan 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/Cli/dotnet/commands/dotnet-workload/InstallStateContents.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@ public static InstallStateContents FromString(string contents)
return JsonSerializer.Deserialize<InstallStateContents>(contents, s_options);
}

public static InstallStateContents FromPath(string path)
{
return File.Exists(path) ? FromString(File.ReadAllText(path)) : new InstallStateContents();
}

public override string ToString()
{
return JsonSerializer.Serialize<InstallStateContents>(this, s_options);
Expand Down
6 changes: 3 additions & 3 deletions src/Cli/dotnet/commands/dotnet-workload/install/FileBasedInstaller.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@ public void RemoveManifestsFromInstallState(SdkFeatureBand sdkFeatureBand)

if (File.Exists(path))
{
var installStateContents = File.Exists(path) ? InstallStateContents.FromString(File.ReadAllText(path)) : new InstallStateContents();
var installStateContents = InstallStateContents.FromString(File.ReadAllText(path));
installStateContents.Manifests = null;
File.WriteAllText(path, installStateContents.ToString());
}
Expand All @@ -468,7 +468,7 @@ public void SaveInstallStateManifestVersions(SdkFeatureBand sdkFeatureBand, Dict
{
string path = Path.Combine(WorkloadInstallType.GetInstallStateFolder(_sdkFeatureBand, _dotnetDir), "default.json");
Directory.CreateDirectory(Path.GetDirectoryName(path));
var installStateContents = File.Exists(path) ? InstallStateContents.FromString(File.ReadAllText(path)) : new InstallStateContents();
var installStateContents = InstallStateContents.FromPath(path);
installStateContents.Manifests = manifestContents;
File.WriteAllText(path, installStateContents.ToString());
}
Expand All @@ -477,7 +477,7 @@ public void UpdateInstallMode(SdkFeatureBand sdkFeatureBand, bool newMode)
{
string path = Path.Combine(WorkloadInstallType.GetInstallStateFolder(sdkFeatureBand, _dotnetDir), "default.json");
Directory.CreateDirectory(Path.GetDirectoryName(path));
var installStateContents = File.Exists(path) ? InstallStateContents.FromString(File.ReadAllText(path)) : new InstallStateContents();
var installStateContents = InstallStateContents.FromPath(path);
installStateContents.UseWorkloadSets = newMode;
File.WriteAllText(path, installStateContents.ToString());
}
Expand Down
26 changes: 21 additions & 5 deletions src/Cli/dotnet/commands/dotnet-workload/install/MsiInstallerBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,17 +285,21 @@ protected uint RepairMsi(string productCode, string logFile)
/// <exception cref="InvalidOperationException"></exception>
protected void UpdateInstallMode(SdkFeatureBand sdkFeatureBand, bool newMode)
{
string path = Path.Combine(WorkloadInstallType.GetInstallStateFolder(sdkFeatureBand, DotNetHome), "default.json");
var installStateContents = InstallStateContents.FromPath(path);
if (installStateContents.UseWorkloadSets == newMode)
{
return;
}

Elevate();

if (IsElevated)
{
string path = Path.Combine(WorkloadInstallType.GetInstallStateFolder(sdkFeatureBand, DotNetHome), "default.json");
// Create the parent folder for the state file and set up all required ACLs
SecurityUtils.CreateSecureDirectory(Path.GetDirectoryName(path));
var installStateContents = File.Exists(path) ? InstallStateContents.FromString(File.ReadAllText(path)) : new InstallStateContents();
installStateContents.UseWorkloadSets = newMode;
File.WriteAllText(path, installStateContents.ToString());

SecurityUtils.SecureFile(path);
}
else if (IsClient)
Expand Down Expand Up @@ -537,6 +541,11 @@ protected void UpdateDependent(InstallRequestType requestType, string providerKe
public void RemoveManifestsFromInstallState(SdkFeatureBand sdkFeatureBand)
{
string path = Path.Combine(WorkloadInstallType.GetInstallStateFolder(sdkFeatureBand, DotNetHome), "default.json");
var installStateContents = InstallStateContents.FromPath(path);
if (installStateContents.Manifests == null)
{
return;
}

if (!File.Exists(path))
{
Expand All @@ -550,7 +559,6 @@ public void RemoveManifestsFromInstallState(SdkFeatureBand sdkFeatureBand)
{
if (File.Exists(path))
{
var installStateContents = InstallStateContents.FromString(File.ReadAllText(path));
installStateContents.Manifests = null;
File.WriteAllText(path, installStateContents.ToString());
}
Expand All @@ -570,14 +578,22 @@ public void RemoveManifestsFromInstallState(SdkFeatureBand sdkFeatureBand)
public void SaveInstallStateManifestVersions(SdkFeatureBand sdkFeatureBand, Dictionary<string, string> manifestContents)
{
string path = Path.Combine(WorkloadInstallType.GetInstallStateFolder(sdkFeatureBand, DotNetHome), "default.json");
var installStateContents = InstallStateContents.FromPath(path);
if (installStateContents.Manifests != null && // manifestContents should not be null here
installStateContents.Manifests.Count == manifestContents.Count &&
installStateContents.Manifests.All(m => manifestContents.TryGetValue(m.Key, out var val) && val.Equals(m.Value)))
{
return;
}

Elevate();

if (IsElevated)
{
// Create the parent folder for the state file and set up all required ACLs
SecurityUtils.CreateSecureDirectory(Path.GetDirectoryName(path));

var installStateContents = File.Exists(path) ? InstallStateContents.FromString(File.ReadAllText(path)) : new InstallStateContents();

installStateContents.Manifests = manifestContents;
File.WriteAllText(path, installStateContents.ToString());

Expand Down
4 changes: 2 additions & 2 deletions src/Tests/dotnet-workload-install.Tests/MockPackWorkloadInstaller.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ public void RemoveManifestsFromInstallState(SdkFeatureBand sdkFeatureBand)
string path = Path.Combine(WorkloadInstallType.GetInstallStateFolder(sdkFeatureBand, _dotnetDir), "default.json");
if (File.Exists(path))
{
var installStateContents = File.Exists(path) ? InstallStateContents.FromString(File.ReadAllText(path)) : new InstallStateContents();
var installStateContents = InstallStateContents.FromPath(path);
installStateContents.Manifests = null;
File.WriteAllText(path, installStateContents.ToString());
}
Expand All @@ -180,7 +180,7 @@ public void SaveInstallStateManifestVersions(SdkFeatureBand sdkFeatureBand, Dict
{
string path = Path.Combine(WorkloadInstallType.GetInstallStateFolder(sdkFeatureBand, _dotnetDir), "default.json");
Directory.CreateDirectory(Path.GetDirectoryName(path));
var installStateContents = File.Exists(path) ? InstallStateContents.FromString(File.ReadAllText(path)) : new InstallStateContents();
var installStateContents = InstallStateContents.FromPath(path);
installStateContents.Manifests = manifestContents;
File.WriteAllText(path, installStateContents.ToString());
}
Expand Down