-
Notifications
You must be signed in to change notification settings - Fork 2.4k
Add support for macOS enterprise deployable default settings #1811
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.
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
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
66 changes: 66 additions & 0 deletions
66
src/shared/Core.Tests/Interop/MacOS/MacOSPreferencesTests.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,66 @@ | ||
using System.Collections.Generic; | ||
using System.Threading.Tasks; | ||
using Xunit; | ||
using GitCredentialManager.Interop.MacOS; | ||
using static GitCredentialManager.Tests.TestUtils; | ||
|
||
namespace GitCredentialManager.Tests.Interop.MacOS; | ||
|
||
public class MacOSPreferencesTests | ||
{ | ||
private const string TestAppId = "com.example.gcm-test"; | ||
private const string DefaultsPath = "/usr/bin/defaults"; | ||
|
||
[MacOSFact] | ||
public async Task MacOSPreferences_ReadPreferences() | ||
{ | ||
try | ||
{ | ||
await SetupTestPreferencesAsync(); | ||
|
||
var pref = new MacOSPreferences(TestAppId); | ||
|
||
// Exists | ||
string stringValue = pref.GetString("myString"); | ||
int? intValue = pref.GetInteger("myInt"); | ||
IDictionary<string, string> dictValue = pref.GetDictionary("myDict"); | ||
|
||
Assert.NotNull(stringValue); | ||
Assert.Equal("this is a string", stringValue); | ||
Assert.NotNull(intValue); | ||
Assert.Equal(42, intValue); | ||
Assert.NotNull(dictValue); | ||
Assert.Equal(2, dictValue.Count); | ||
Assert.Equal("value1", dictValue["dict-k1"]); | ||
Assert.Equal("value2", dictValue["dict-k2"]); | ||
|
||
// Does not exist | ||
string missingString = pref.GetString("missingString"); | ||
int? missingInt = pref.GetInteger("missingInt"); | ||
IDictionary<string, string> missingDict = pref.GetDictionary("missingDict"); | ||
|
||
Assert.Null(missingString); | ||
Assert.Null(missingInt); | ||
Assert.Null(missingDict); | ||
} | ||
finally | ||
{ | ||
await CleanupTestPreferencesAsync(); | ||
} | ||
} | ||
|
||
private static async Task SetupTestPreferencesAsync() | ||
{ | ||
// Using the defaults command set up preferences for the test app | ||
await RunCommandAsync(DefaultsPath, $"write {TestAppId} myString \"this is a string\""); | ||
await RunCommandAsync(DefaultsPath, $"write {TestAppId} myInt -int 42"); | ||
await RunCommandAsync(DefaultsPath, $"write {TestAppId} myDict -dict dict-k1 value1 dict-k2 value2"); | ||
} | ||
|
||
private static async Task CleanupTestPreferencesAsync() | ||
{ | ||
// Delete the test app preferences | ||
// defaults delete com.example.gcm-test | ||
await RunCommandAsync(DefaultsPath, $"delete {TestAppId}"); | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,96 @@ | ||
using System; | ||
using System.Collections.Generic; | ||
using GitCredentialManager.Interop.MacOS.Native; | ||
using static GitCredentialManager.Interop.MacOS.Native.CoreFoundation; | ||
|
||
namespace GitCredentialManager.Interop.MacOS; | ||
|
||
public class MacOSPreferences | ||
{ | ||
private readonly string _appId; | ||
|
||
public MacOSPreferences(string appId) | ||
{ | ||
EnsureArgument.NotNull(appId, nameof(appId)); | ||
|
||
_appId = appId; | ||
} | ||
|
||
/// <summary> | ||
/// Return a <see cref="string"/> typed value from the app preferences. | ||
/// </summary> | ||
/// <param name="key">Preference name.</param> | ||
/// <exception cref="InvalidOperationException">Thrown if the preference is not a string.</exception> | ||
/// <returns> | ||
/// <see cref="string"/> or null if the preference with the given key does not exist. | ||
/// </returns> | ||
public string GetString(string key) | ||
{ | ||
return TryGet(key, CFStringToString, out string value) | ||
? value | ||
: null; | ||
} | ||
|
||
/// <summary> | ||
/// Return a <see cref="int"/> typed value from the app preferences. | ||
/// </summary> | ||
/// <param name="key">Preference name.</param> | ||
/// <exception cref="InvalidOperationException">Thrown if the preference is not an integer.</exception> | ||
/// <returns> | ||
/// <see cref="int"/> or null if the preference with the given key does not exist. | ||
/// </returns> | ||
public int? GetInteger(string key) | ||
{ | ||
return TryGet(key, CFNumberToInt32, out int value) | ||
? value | ||
: null; | ||
} | ||
|
||
/// <summary> | ||
/// Return a <see cref="IDictionary{TKey,TValue}"/> typed value from the app preferences. | ||
/// </summary> | ||
/// <param name="key">Preference name.</param> | ||
/// <exception cref="InvalidOperationException">Thrown if the preference is not a dictionary.</exception> | ||
/// <returns> | ||
/// <see cref="IDictionary{TKey,TValue}"/> or null if the preference with the given key does not exist. | ||
/// </returns> | ||
public IDictionary<string, string> GetDictionary(string key) | ||
mjcheetham marked this conversation as resolved.
Show resolved
Hide resolved
|
||
{ | ||
return TryGet(key, CFDictionaryToDictionary, out IDictionary<string, string> value) | ||
? value | ||
: null; | ||
} | ||
|
||
private bool TryGet<T>(string key, Func<IntPtr, T> converter, out T value) | ||
{ | ||
IntPtr cfValue = IntPtr.Zero; | ||
IntPtr keyPtr = IntPtr.Zero; | ||
IntPtr appIdPtr = CreateAppIdPtr(); | ||
|
||
try | ||
{ | ||
keyPtr = CFStringCreateWithCString(IntPtr.Zero, key, CFStringEncoding.kCFStringEncodingUTF8); | ||
cfValue = CFPreferencesCopyAppValue(keyPtr, appIdPtr); | ||
|
||
if (cfValue == IntPtr.Zero) | ||
{ | ||
value = default; | ||
return false; | ||
} | ||
|
||
value = converter(cfValue); | ||
return true; | ||
} | ||
finally | ||
{ | ||
if (cfValue != IntPtr.Zero) CFRelease(cfValue); | ||
if (keyPtr != IntPtr.Zero) CFRelease(keyPtr); | ||
if (appIdPtr != IntPtr.Zero) CFRelease(appIdPtr); | ||
} | ||
} | ||
|
||
private IntPtr CreateAppIdPtr() | ||
{ | ||
return CFStringCreateWithCString(IntPtr.Zero, _appId, CFStringEncoding.kCFStringEncodingUTF8); | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,67 @@ | ||
using System; | ||
using System.Collections.Generic; | ||
|
||
namespace GitCredentialManager.Interop.MacOS | ||
{ | ||
/// <summary> | ||
/// Reads settings from Git configuration, environment variables, and defaults from the system. | ||
/// </summary> | ||
public class MacOSSettings : Settings | ||
{ | ||
private readonly ITrace _trace; | ||
|
||
public MacOSSettings(IEnvironment environment, IGit git, ITrace trace) | ||
: base(environment, git) | ||
{ | ||
EnsureArgument.NotNull(trace, nameof(trace)); | ||
_trace = trace; | ||
|
||
PlatformUtils.EnsureMacOS(); | ||
} | ||
|
||
protected override bool TryGetExternalDefault(string section, string scope, string property, out string value) | ||
{ | ||
value = null; | ||
|
||
try | ||
{ | ||
// Check for app default preferences for our bundle ID. | ||
// Defaults can be deployed system administrators via device management profiles. | ||
var prefs = new MacOSPreferences(Constants.MacOSBundleId); | ||
IDictionary<string, string> dict = prefs.GetDictionary("configuration"); | ||
|
||
if (dict is null) | ||
{ | ||
// No configuration key exists | ||
return false; | ||
} | ||
|
||
// Wrap the raw dictionary in one configured with the Git configuration key comparer. | ||
// This means we can use the same key comparison rules as Git in our configuration plist dict, | ||
// That is, sections and names are insensitive to case, but the scope is case-sensitive. | ||
var config = new Dictionary<string, string>(dict, GitConfigurationKeyComparer.Instance); | ||
|
||
string name = string.IsNullOrWhiteSpace(scope) | ||
? $"{section}.{property}" | ||
: $"{section}.{scope}.{property}"; | ||
|
||
if (!config.TryGetValue(name, out value)) | ||
{ | ||
// No property exists | ||
return false; | ||
} | ||
|
||
_trace.WriteLine($"Default setting found in app preferences: {name}={value}"); | ||
return true; | ||
} | ||
catch (Exception ex) | ||
{ | ||
// Reading defaults is not critical to the operation of the application | ||
// so we can ignore any errors and just log the failure. | ||
_trace.WriteLine("Failed to read default setting from app preferences."); | ||
_trace.WriteException(ex); | ||
return false; | ||
} | ||
} | ||
} | ||
} |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.