Adding PKey Auth bypass to interactive auth flows (#2052)

Approved
AzureAD · Sep 24, 2020 · fe6c87c · fe6c87c
1 parent b7f5e13
commit fe6c87c
Showing 1 changed file with 20 additions and 0 deletions.
diff --git a/...icrosoft.Identity.Client/Platforms/Android/EmbeddedWebview/AuthenticationAgentActivity.cs b/...icrosoft.Identity.Client/Platforms/Android/EmbeddedWebview/AuthenticationAgentActivity.cs
@@ -2,13 +2,15 @@
 // Licensed under the MIT License.
 
 using System;
+using System.Collections.Generic;
 using System.Globalization;
 using Android.App;
 using Android.Content;
 using Android.Content.PM;
 using Android.OS;
 using Android.Webkit;
 using Android.Widget;
+using Microsoft.Identity.Client.PlatformsCommon;
 using Microsoft.Identity.Client.Utils;
 
 namespace Microsoft.Identity.Client.Platforms.Android.EmbeddedWebview
@@ -111,6 +113,24 @@ public override bool ShouldOverrideUrlLoading(WebView view, string url)
                     return true;
                 }
 
+                if (url.StartsWith(BrokerConstants.ClientTlsRedirect, StringComparison.OrdinalIgnoreCase))
+                {
+                    string query = uri.Query;
+                    if (query.StartsWith("?", StringComparison.OrdinalIgnoreCase))
+                    {
+                        query = query.Substring(1);
+                    }
+
+                    Dictionary<string, string> keyPair = CoreHelpers.ParseKeyValueList(query, '&', true, false, null);
+                    string responseHeader = DeviceAuthHelper.GetBypassChallengeResponse(keyPair);
+                    Dictionary<string, string> pkeyAuthEmptyResponse = new Dictionary<string, string>();
+                    pkeyAuthEmptyResponse[BrokerConstants.ChallangeResponseHeader] = responseHeader;
+
+                    view.LoadUrl(keyPair["SubmitUrl"], pkeyAuthEmptyResponse);
+
+                    return true;
+                }
+
                 if (!url.Equals(AboutBlankUri, StringComparison.OrdinalIgnoreCase) && 
                     !uri.Scheme.Equals(Uri.UriSchemeHttps, StringComparison.OrdinalIgnoreCase))
                 {