fix(webview): authenticationMethod NSURLAuthenticationMethodClientCer…

…tificate not handled correctly (#13352)
tidev · Apr 1, 2022 · edfd037 · edfd037
1 parent 498b596
commit edfd037
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/iphone/Classes/TiUIWebView.m b/iphone/Classes/TiUIWebView.m
@@ -880,10 +880,13 @@ - (void)webView:(WKWebView *)webView didReceiveAuthenticationChallenge:(NSURLAut
       completionHandler(NSURLSessionAuthChallengeCancelAuthenticationChallenge, nil);
     }
     // HTTPS in general
-  } else if ([authenticationMethod isEqualToString:NSURLAuthenticationMethodServerTrust]) {
+  } else if ([authenticationMethod isEqualToString:NSURLAuthenticationMethodServerTrust]
+      || [authenticationMethod isEqualToString:NSURLAuthenticationMethodClientCertificate]) {
     completionHandler(NSURLSessionAuthChallengePerformDefaultHandling, nil);
     // Default: Reject authentication challenge
   } else {
+    // Not sure why not let the DefaultHandling handle this but at least warn in the log because of canceled challenge
+    NSLog(@"[WARN] Ti.UI.WebView canceled unknown authentication challenge with method %@", authenticationMethod);
     completionHandler(NSURLSessionAuthChallengeCancelAuthenticationChallenge, nil);
   }
 }

diff --git a/tests/Resources/ti.ui.webview.test.js b/tests/Resources/ti.ui.webview.test.js
@@ -950,4 +950,24 @@ describe('Titanium.UI.WebView', function () {
 			win.open();
 		});
 	});
+
+	it('url with clientCertChallenge', function (finish) {
+		const url = 'https://device.login.microsoftonline.com';
+
+		win = Ti.UI.createWindow();
+		const webView = Ti.UI.createWebView({
+			url: url
+		});
+
+		webView.addEventListener('error', function () {
+			finish(new Error('clientCertChallenge must be handled correctly.'));
+		});
+
+		webView.addEventListener('load', function () {
+			finish();
+		});
+
+		win.add(webView);
+		win.open();
+	});
 });