Skip to content

[Security] Fix all availability attributes in this framework. #22664

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
rolfbjarne merged 1 commit into from
Apr 24, 2025
Merged

[Security] Fix all availability attributes in this framework. #22664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
60 changes: 4 additions & 56 deletions src/Security/Authorization.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,21 +33,12 @@
using Foundation;
using System;
using System.Runtime.InteropServices;
#if NET
#else
using NativeHandle = System.IntPtr;
#endif

namespace Security {

#if NET
/// <summary>To be added.</summary>
/// <remarks>To be added.</remarks>
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
#else
[MacCatalyst (15,0)]
#endif
// Untyped enum in ObjC
public enum AuthorizationStatus {
/// <summary>To be added.</summary>
Expand Down Expand Up @@ -82,14 +73,10 @@ public enum AuthorizationStatus {
BadAddress = -60033,
}

#if NET
/// <summary>To be added.</summary>
/// <remarks>To be added.</remarks>
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
#else
[MacCatalyst (15,0)]
#endif
// typedef UInt32 AuthorizationFlags;
[Flags]
public enum AuthorizationFlags : int {
Expand All @@ -105,12 +92,8 @@ public enum AuthorizationFlags : int {
DestroyRights = 1 << 3,
/// <summary>To be added.</summary>
PreAuthorize = 1 << 4,
#if NET
[SupportedOSPlatform ("maccatalyst17.0")]
[SupportedOSPlatform ("macos14.0")]
#else
[Mac(14, 0), MacCatalyst(17, 0)]
#endif
SkipInternalAuth = 1 << 9,
NoData = 1 << 20,
}
Expand All @@ -119,14 +102,10 @@ public enum AuthorizationFlags : int {
// For ease of use, we let the user pass the AuthorizationParameters, and we
// create the structure for them with the proper data
//
#if NET
/// <summary>To be added.</summary>
/// <remarks>To be added.</remarks>
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
#else
[MacCatalyst (15,0)]
#endif
public class AuthorizationParameters {
/// <summary>To be added.</summary>
/// <remarks>To be added.</remarks>
Expand All @@ -139,14 +118,10 @@ public class AuthorizationParameters {
public string? IconPath;
}

#if NET
/// <summary>To be added.</summary>
/// <remarks>To be added.</remarks>
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
#else
[MacCatalyst (15,0)]
#endif
public class AuthorizationEnvironment {
/// <summary>To be added.</summary>
/// <remarks>To be added.</remarks>
Expand All @@ -159,12 +134,8 @@ public class AuthorizationEnvironment {
public bool AddToSharedCredentialPool;
}

#if NET
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
#else
[MacCatalyst (15,0)]
#endif
[StructLayout (LayoutKind.Sequential)]
struct AuthorizationItem {
public IntPtr /* AuthorizationString = const char * */ name;
Expand All @@ -173,43 +144,27 @@ struct AuthorizationItem {
public int /* UInt32 */ flags; // zero
}

#if NET
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
#else
[MacCatalyst (15,0)]
#endif
unsafe struct AuthorizationItemSet {
public int /* UInt32 */ count;
public AuthorizationItem* /* AuthorizationItem* */ ptrToAuthorization;
}

#if NET
/// <summary>To be added.</summary>
/// <remarks>To be added.</remarks>
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
#else
[MacCatalyst (15,0)]
#endif
public unsafe class Authorization : DisposableObject {
[DllImport (Constants.SecurityLibrary)]
unsafe extern static int /* OSStatus = int */ AuthorizationCreate (AuthorizationItemSet* rights, AuthorizationItemSet* environment, AuthorizationFlags flags, IntPtr* auth);

#if NET
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[ObsoletedOSPlatform ("macos10.7", "Use the Service Management framework or the launchd-launched helper tool instead.")]
#else
[Deprecated (PlatformName.MacOSX, 10,7)]
#endif
#if NET
[ObsoletedOSPlatform ("maccatalyst", "Use the Service Management framework or the launchd-launched helper tool instead.")]
[ObsoletedOSPlatform ("macos", "Use the Service Management framework or the launchd-launched helper tool instead.")]
[DllImport (Constants.SecurityLibrary)]
extern static int /* OSStatus = int */ AuthorizationExecuteWithPrivileges (IntPtr handle, IntPtr pathToTool, AuthorizationFlags flags, IntPtr args, IntPtr FILEPtr);
#else
[DllImport (Constants.SecurityLibrary)]
extern static int /* OSStatus = int */ AuthorizationExecuteWithPrivileges (IntPtr handle, string pathToTool, AuthorizationFlags flags, string? []? args, IntPtr FILEPtr);
#endif

[DllImport (Constants.SecurityLibrary)]
extern static int /* OSStatus = int */ AuthorizationFree (IntPtr handle, AuthorizationFlags flags);
Expand All @@ -220,7 +175,6 @@ internal Authorization (NativeHandle handle, bool owns)
{
}

#if NET
/// <param name="pathToTool">To be added.</param>
/// <param name="flags">To be added.</param>
/// <param name="args">To be added.</param>
Expand All @@ -229,10 +183,8 @@ internal Authorization (NativeHandle handle, bool owns)
/// <remarks>To be added.</remarks>
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[ObsoletedOSPlatform ("macos10.7", "Use the Service Management framework or the launchd-launched helper tool instead.")]
#else
[Deprecated (PlatformName.MacOSX, 10,7)]
#endif
[ObsoletedOSPlatform ("maccatalyst", "Use the Service Management framework or the launchd-launched helper tool instead.")]
[ObsoletedOSPlatform ("macos", "Use the Service Management framework or the launchd-launched helper tool instead.")]
public int ExecuteWithPrivileges (string pathToTool, AuthorizationFlags flags, string []? args)
{
string? []? arguments = args!;
Expand All @@ -247,15 +199,11 @@ public int ExecuteWithPrivileges (string pathToTool, AuthorizationFlags flags, s
arguments = array;
}
}
#if NET
using var pathToToolStr = new TransientString (pathToTool);
var argsPtr = TransientString.AllocStringArray (arguments);
var retval = AuthorizationExecuteWithPrivileges (Handle, pathToToolStr, flags, argsPtr, IntPtr.Zero);
TransientString.FreeStringArray (argsPtr, args is null ? 0 : args.Length);
return retval;
#else
return AuthorizationExecuteWithPrivileges (Handle, pathToTool, flags, arguments, IntPtr.Zero);
#endif
}

protected override void Dispose (bool disposing)
Expand Down
Loading