Skip to content
This repository was archived by the owner on May 1, 2024. It is now read-only.

bug fix in SslCertificateEqualityComparer #76

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/Xamarin.Auth.Android/WebAuthenticatorActivity.cs
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ bool Equals (SslCertificate.DName x, SslCertificate.DName y)
{
if (ReferenceEquals (x, y))
return true;
if (ReferenceEquals (x, y) || ReferenceEquals (null, y))
if (ReferenceEquals (x, null) || ReferenceEquals (null, y))
return false;
return x.GetDName().Equals (y.GetDName());
}
Expand Down
57 changes: 39 additions & 18 deletions src/Xamarin.Auth/WebEx.cs
Original file line number Diff line number Diff line change
Expand Up @@ -69,26 +69,47 @@ public static Task<WebResponse> GetResponseAsync (this WebRequest request)
}

static char[] AmpersandChars = new char[] { '&' };
static char[] EqualsChars = new char[] { '=' };

public static IDictionary<string, string> FormDecode (string encodedString)
{
var inputs = new Dictionary<string, string> ();

if (encodedString.StartsWith ("?") || encodedString.StartsWith ("#")) {
encodedString = encodedString.Substring (1);
}

var parts = encodedString.Split (AmpersandChars);
foreach (var p in parts) {
var kv = p.Split (EqualsChars);
var k = Uri.UnescapeDataString (kv[0]);
var v = kv.Length > 1 ? Uri.UnescapeDataString (kv[1]) : "";
inputs[k] = v;
}

return inputs;
}
{
var inputs = new Dictionary<string, string>();

if (encodedString.Length > 0)
{
char firstChar = encodedString[0];
if (firstChar == '?' || firstChar == '#')
{
encodedString = encodedString.Substring(1);
}

if (encodedString.Length > 0)
{
var parts = encodedString.Split(AmpersandChars, StringSplitOptions.RemoveEmptyEntries);

foreach (var part in parts)
{
var equalsIndex = part.IndexOf('=');

string key;
string value;
if (equalsIndex >= 0)
{
key = Uri.UnescapeDataString(part.Substring(0, equalsIndex));
value = Uri.UnescapeDataString(part.Substring(equalsIndex + 1));
}
else
{
key = Uri.UnescapeDataString(part);
value = string.Empty;
}

inputs[key] = value;
}
}
}

return inputs;
}

public static Dictionary<string, string> JsonDecode (string encodedString)
{
Expand Down