Skip to content

Commit

Permalink
Tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
@bording
bording committed Nov 26, 2024
1 parent f218572 commit d623e3e
Show file tree
Hide file tree
Showing 4 changed files with 53 additions and 30 deletions.
10 changes: 5 additions & 5 deletions LibGit2Sharp.Tests/GlobalSettingsFixture.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,15 +107,15 @@ public void SetExtensions()
public void OwnerValidation()
{
// Assert that owner validation is enabled by default
Assert.True(GlobalSettings.OwnerValidation);
Assert.True(GlobalSettings.GetOwnerValidation());

// Disable owner validation
GlobalSettings.OwnerValidation = false;
Assert.False(GlobalSettings.OwnerValidation);
GlobalSettings.SetOwnerValidation(false);
Assert.False(GlobalSettings.GetOwnerValidation());

// Enable it again
GlobalSettings.OwnerValidation = true;
Assert.True(GlobalSettings.OwnerValidation);
GlobalSettings.SetOwnerValidation(true);
Assert.True(GlobalSettings.GetOwnerValidation());
}
}
}
20 changes: 12 additions & 8 deletions LibGit2Sharp/Core/NativeMethods.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
using System;
using System.IO;
#if NET
using System.Reflection;
#endif
using System.Runtime.CompilerServices;
using System.Runtime.ConstrainedExecution;
using System.Runtime.InteropServices;
Expand Down Expand Up @@ -743,13 +745,10 @@ internal static extern int git_libgit2_opts(int option, uint level,
[MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string path);

// git_libgit2_opts(GIT_OPT_ENABLE_*, int enabled)
// git_libgit2_opts(GIT_OPT_SET_OWNER_VALIDATION, int enabled)
[DllImport(libgit2, CallingConvention = CallingConvention.Cdecl)]
internal static extern int git_libgit2_opts(int option, int enabled);

// git_libgit2_opts(GIT_OPT_GET_*, int *enabled)
[DllImport(libgit2, CallingConvention = CallingConvention.Cdecl)]
internal static extern unsafe int git_libgit2_opts(int option, int* enabled);

// git_libgit2_opts(GIT_OPT_SET_USER_AGENT, const char *path)
[DllImport(libgit2, CallingConvention = CallingConvention.Cdecl)]
internal static extern int git_libgit2_opts(int option,
Expand All @@ -766,6 +765,10 @@ internal static extern int git_libgit2_opts(int option,
// git_libgit2_opts(GIT_OPT_GET_EXTENSIONS, git_strarray *out)
[DllImport(libgit2, CallingConvention = CallingConvention.Cdecl)]
internal static extern int git_libgit2_opts(int option, out GitStrArray extensions);

// git_libgit2_opts(GIT_OPT_GET_OWNER_VALIDATION, int *enabled)
[DllImport(libgit2, CallingConvention = CallingConvention.Cdecl)]
internal static extern unsafe int git_libgit2_opts(int option, int* enabled);
#endregion

#region git_libgit2_opts_osxarm64
Expand All @@ -783,13 +786,10 @@ internal static extern int git_libgit2_opts_osxarm64(int option, IntPtr nop2, In
[MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string path);

// git_libgit2_opts(GIT_OPT_ENABLE_*, int enabled)
// git_libgit2_opts(GIT_OPT_SET_OWNER_VALIDATION, int enabled)
[DllImport(libgit2, CallingConvention = CallingConvention.Cdecl, EntryPoint = "git_libgit2_opts")]
internal static extern int git_libgit2_opts_osxarm64(int option, IntPtr nop2, IntPtr nop3, IntPtr nop4, IntPtr nop5, IntPtr nop6, IntPtr nop7, IntPtr nop8, int enabled);

// git_libgit2_opts(GIT_OPT_GET_*, int enabled)
[DllImport(libgit2, CallingConvention = CallingConvention.Cdecl, EntryPoint = "git_libgit2_opts")]
internal static extern unsafe int git_libgit2_opts_osxarm64(int option, IntPtr nop2, IntPtr nop3, IntPtr nop4, IntPtr nop5, IntPtr nop6, IntPtr nop7, IntPtr nop8, int* enabled);

// git_libgit2_opts(GIT_OPT_SET_USER_AGENT, const char *path)
[DllImport(libgit2, CallingConvention = CallingConvention.Cdecl, EntryPoint = "git_libgit2_opts")]
internal static extern int git_libgit2_opts_osxarm64(int option, IntPtr nop2, IntPtr nop3, IntPtr nop4, IntPtr nop5, IntPtr nop6, IntPtr nop7, IntPtr nop8,
Expand All @@ -806,6 +806,10 @@ internal static extern int git_libgit2_opts_osxarm64(int option, IntPtr nop2, In
// git_libgit2_opts(GIT_OPT_GET_EXTENSIONS, git_strarray *out)
[DllImport(libgit2, CallingConvention = CallingConvention.Cdecl, EntryPoint = "git_libgit2_opts")]
internal static extern int git_libgit2_opts_osxarm64(int option, IntPtr nop2, IntPtr nop3, IntPtr nop4, IntPtr nop5, IntPtr nop6, IntPtr nop7, IntPtr nop8, out GitStrArray extensions);

// git_libgit2_opts(GIT_OPT_GET_OWNER_VALIDATION, int *enabled)
[DllImport(libgit2, CallingConvention = CallingConvention.Cdecl, EntryPoint = "git_libgit2_opts")]
internal static extern unsafe int git_libgit2_opts_osxarm64(int option, IntPtr nop2, IntPtr nop3, IntPtr nop4, IntPtr nop5, IntPtr nop6, IntPtr nop7, IntPtr nop8, int* enabled);
#endregion

[DllImport(libgit2, CallingConvention = CallingConvention.Cdecl)]
Expand Down
19 changes: 15 additions & 4 deletions LibGit2Sharp/Core/Proxy.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3577,13 +3577,20 @@ public static string[] git_libgit2_opts_get_extensions()
/// </summary>
public static unsafe bool git_libgit2_opts_get_owner_validation()
{
// libgit2 expects non-zero value for true
int res, enabled;
int res;
int enabled;

if (isOSXArm64)
{
res = NativeMethods.git_libgit2_opts_osxarm64((int)LibGit2Option.GetOwnerValidation, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero, &enabled);
}
else
{
res = NativeMethods.git_libgit2_opts((int)LibGit2Option.GetOwnerValidation, &enabled);
}

Ensure.ZeroResult(res);

return enabled != 0;
}

Expand All @@ -3593,15 +3600,19 @@ public static unsafe bool git_libgit2_opts_get_owner_validation()
/// <param name="enabled">true to enable owner validation, false otherwise</param>
public static void git_libgit2_opts_set_owner_validation(bool enabled)
{
// libgit2 expects non-zero value for true
int res;

if (isOSXArm64)
{
res = NativeMethods.git_libgit2_opts_osxarm64((int)LibGit2Option.SetOwnerValidation, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero, enabled ? 1 : 0);
}
else
{
res = NativeMethods.git_libgit2_opts((int)LibGit2Option.SetOwnerValidation, enabled ? 1 : 0);
}

Ensure.ZeroResult(res);
}

#endregion

#region git_worktree_
Expand Down
34 changes: 21 additions & 13 deletions LibGit2Sharp/GlobalSettings.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,19 +204,6 @@ public static string NativeLibraryPath
}
}

/// <summary>
/// Controls the status of repository directory owner validation.
/// </summary>
/// <remarks>
/// By default, repository directories must be owned by the current user to be opened. This can be disabled by setting this property to false.
/// Note that disabling this can lead to security vulnerabilities (see CVE-2022-24765).
/// </remarks>
public static bool OwnerValidation
{
get => Proxy.git_libgit2_opts_get_owner_validation();
set => Proxy.git_libgit2_opts_set_owner_validation(value);
}

internal static string GetAndLockNativeLibraryPath()
{
nativeLibraryPathLocked = true;
Expand Down Expand Up @@ -430,5 +417,26 @@ public static string GetUserAgent()
{
return Proxy.git_libgit2_opts_get_user_agent();
}

/// <summary>
/// Gets the owner validation setting for repository directories.
/// </summary>
/// <returns></returns>
public static bool GetOwnerValidation()
{
return Proxy.git_libgit2_opts_get_owner_validation();
}

/// <summary>
/// Sets whether repository directories should be owned by the current user. The default is to validate ownership.
/// </summary>
/// <remarks>
/// Disabling owner validation can lead to security vulnerabilities (see CVE-2022-24765).
/// </remarks>
/// <param name="enabled">true to enable owner validation; otherwise, false.</param>
public static void SetOwnerValidation(bool enabled)
{
Proxy.git_libgit2_opts_set_owner_validation(enabled);
}
}
}

0 comments on commit d623e3e

Please sign in to comment.