Skip to content

Fix potential crash when extracting URI path in Keychain #187

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
rmarinho merged 1 commit into from
Jun 1, 2026
Merged

Fix potential crash when extracting URI path in Keychain #187

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
16 changes: 12 additions & 4 deletions Xamarin.MacDev/Keychain.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -812,7 +812,7 @@ unsafe OSStatus AddInternetPassword (byte [] label, byte [] desc, SecAuthenticat

public unsafe void AddInternetPassword (Uri uri, string username, string password)
{
byte [] path = Encoding.UTF8.GetBytes (string.Join (string.Empty, uri.Segments).Substring (1)); // don't include the leading '/'
byte [] path = GetUriPathBytes (uri);
byte [] passwd = Encoding.UTF8.GetBytes (password);
byte [] host = Encoding.UTF8.GetBytes (uri.Host);
byte [] user = Encoding.UTF8.GetBytes (username);
Expand Down Expand Up @@ -848,9 +848,17 @@ public unsafe void AddInternetPassword (Uri uri, string username, string passwor

static readonly byte [] WebFormPassword = Encoding.UTF8.GetBytes ("Web form password");

// Extracts the URI path without the leading '/', returning an empty array for URIs with no path segments.
static byte [] GetUriPathBytes (Uri uri)
{
var joined = string.Join (string.Empty, uri.Segments);
var path = joined.Length > 0 && joined [0] == '/' ? joined.Substring (1) : joined;
return Encoding.UTF8.GetBytes (path);
}

public unsafe void AddInternetPassword (Uri uri, string password)
{
byte [] path = Encoding.UTF8.GetBytes (string.Join (string.Empty, uri.Segments).Substring (1)); // don't include the leading '/'
byte [] path = GetUriPathBytes (uri);
byte [] user = Encoding.UTF8.GetBytes (Uri.UnescapeDataString (uri.UserInfo));
byte [] passwd = Encoding.UTF8.GetBytes (password);
byte [] host = Encoding.UTF8.GetBytes (uri.Host);
Expand Down Expand Up @@ -920,7 +928,7 @@ static unsafe string GetUsernameFromKeychainItemRef (IntPtr itemRef)

public unsafe Tuple<string, string> FindInternetUserNameAndPassword (Uri uri)
{
byte [] path = Encoding.UTF8.GetBytes (string.Join (string.Empty, uri.Segments).Substring (1)); // don't include the leading '/'
byte [] path = GetUriPathBytes (uri);
byte [] host = Encoding.UTF8.GetBytes (uri.Host);
var auth = GetSecAuthenticationType (uri.Query);
var protocol = GetSecProtocolType (uri.Scheme);
Expand Down Expand Up @@ -968,7 +976,7 @@ public unsafe Tuple<string, string> FindInternetPassword (string serverName = ""

public string FindInternetPassword (Uri uri)
{
byte [] path = Encoding.UTF8.GetBytes (string.Join (string.Empty, uri.Segments).Substring (1)); // don't include the leading '/'
byte [] path = GetUriPathBytes (uri);
byte [] user = Encoding.UTF8.GetBytes (Uri.UnescapeDataString (uri.UserInfo));
byte [] host = Encoding.UTF8.GetBytes (uri.Host);
var auth = GetSecAuthenticationType (uri.Query);
Expand Down
Loading