rogalikkkkkk
/
iosWebViewFix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added iosShouldAllowDeprecatedTLS iOS-specific WebView event

This commit is contained in:
Lorenzo Pichilli 2021-02-10 02:32:05 +01:00
parent 2aab462702
commit 2cd0948620
10 changed files with 141 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -11,7 +11,7 @@
- Added `contentWorld` argument to `evaluateJavascript` WebView method
- Added `isDirectionalLockEnabled`, `mediaType`, `pageZoom`, `limitsNavigationsToAppBoundDomains`, `useOnNavigationResponse` iOS-specific WebView options
- Added `handlesURLScheme`, `createPdf`, `createWebArchiveData` iOS-specific WebView methods
- Added `iosOnNavigationResponse` iOS-specific WebView events
- Added `iosOnNavigationResponse` and `iosShouldAllowDeprecatedTLS` iOS-specific WebView events
- Added `iosAnimated` optional argument to `zoomBy` WebView method
- Added `screenshotConfiguration` optional argument to `takeScreenshot` WebView method
- Added `scriptHtmlTagAttributes` optional argument to `injectJavascriptFileFromUrl` WebView method
@ -50,6 +50,7 @@
- Added `callAsyncJavaScript` name to the list of javaScriptHandlerForbiddenNames
- Changed `zoomBy` WebView method signature
- Moved `saveWebArchive` WebView method from Android-specific to cross-platform
- Renamed `HttpAuthChallenge` to `URLAuthenticationChallenge`
## 4.0.0+4

2
README.md
View File

@ -719,6 +719,8 @@ Event names that starts with `android` or `ios` are events platform-specific.
* `androidOnReceivedLoginRequest`: Event fired when a request to automatically log in the user has been processed (available only on Android).
* `iosOnWebContentProcessDidTerminate`: Invoked when the web view's web content process is terminated (available only on iOS).
* `iosOnDidReceiveServerRedirectForProvisionalNavigation`: Called when a web view receives a server redirect (available only on iOS).
* `iosOnNavigationResponse`: Called when a web view asks for permission to navigate to new content after the response to the navigation request is known (available only on iOS).
* `iosShouldAllowDeprecatedTLS`: Called when a web view asks whether to continue with a connection that uses a deprecated version of TLS (v1.0 and v1.1) (available only on iOS).
### `ContextMenu` class

2
example/ios/Runner/Info.plist
View File

@ -28,6 +28,8 @@
<true/>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>
<true/>
<key>NSAllowsLocalNetworking</key>
<true/>
</dict>

44
ios/Classes/InAppWebView.swift
View File

@ -3106,6 +3106,39 @@ public class InAppWebView: WKWebView, UIScrollViewDelegate, WKUIDelegate, WKNavi
return windowWebView
}
public func webView(_ webView: WKWebView,
authenticationChallenge challenge: URLAuthenticationChallenge,
shouldAllowDeprecatedTLS decisionHandler: @escaping (Bool) -> Void) {
shouldAllowDeprecatedTLS(challenge: challenge, result: {(result) -> Void in
if result is FlutterError {
print((result as! FlutterError).message ?? "")
}
else if (result as? NSObject) == FlutterMethodNotImplemented {
decisionHandler(false)
}
else {
var response: [String: Any]
if let r = result {
response = r as! [String: Any]
var action = response["action"] as? Int
action = action != nil ? action : 0;
switch action {
case 0:
decisionHandler(false)
break
case 1:
decisionHandler(true)
break
default:
decisionHandler(false)
}
return;
}
decisionHandler(false)
}
})
}
public func webViewDidClose(_ webView: WKWebView) {
let arguments: [String: Any?] = [:]
channel?.invokeMethod("onCloseWindow", arguments: arguments)
@ -3396,6 +3429,17 @@ public class InAppWebView: WKWebView, UIScrollViewDelegate, WKUIDelegate, WKNavi
channel?.invokeMethod("onReceivedClientCertRequest", arguments: arguments, result: result)
}
public func shouldAllowDeprecatedTLS(challenge: URLAuthenticationChallenge, result: FlutterResult?) {
let arguments: [String: Any?] = [
"host": challenge.protectionSpace.host,
"protocol": challenge.protectionSpace.protocol,
"realm": challenge.protectionSpace.realm,
"port": challenge.protectionSpace.port,
"previousFailureCount": challenge.previousFailureCount
]
channel?.invokeMethod("shouldAllowDeprecatedTLS", arguments: arguments, result: result)
}
public func onJsAlert(frame: WKFrameInfo, message: String, result: FlutterResult?) {
let arguments: [String: Any?] = [
"url": frame.request.url?.absoluteString,

8
lib/src/headless_in_app_webview.dart
View File

@ -78,6 +78,7 @@ class HeadlessInAppWebView implements WebView {
this.iosOnWebContentProcessDidTerminate,
this.iosOnDidReceiveServerRedirectForProvisionalNavigation,
this.iosOnNavigationResponse,
this.iosShouldAllowDeprecatedTLS,
this.initialUrl,
this.initialFile,
this.initialData,
@ -196,6 +197,11 @@ class HeadlessInAppWebView implements WebView {
IOSNavigationResponse navigationResponse)?
iosOnNavigationResponse;
@override
final Future<IOSShouldAllowDeprecatedTLSAction?> Function(InAppWebViewController controller,
URLAuthenticationChallenge challenge)?
iosShouldAllowDeprecatedTLS;
@override
final Future<AjaxRequestAction> Function(
InAppWebViewController controller, AjaxRequest ajaxRequest)?
@ -293,7 +299,7 @@ class HeadlessInAppWebView implements WebView {
@override
final Future<HttpAuthResponse?> Function(
InAppWebViewController controller, HttpAuthChallenge challenge)?
InAppWebViewController controller, URLAuthenticationChallenge challenge)?
onReceivedHttpAuthRequest;
@override

14
lib/src/in_app_browser.dart
View File

@ -418,13 +418,13 @@ class InAppBrowser {
///Event fired when the WebView received an HTTP authentication request. The default behavior is to cancel the request.
///
///[challenge] contains data about host, port, protocol, realm, etc. as specified in the [HttpAuthChallenge].
///[challenge] contains data about host, port, protocol, realm, etc. as specified in the [URLAuthenticationChallenge].
///
///**Official Android API**: https://developer.android.com/reference/android/webkit/WebViewClient#onReceivedHttpAuthRequest(android.webkit.WebView,%20android.webkit.HttpAuthHandler,%20java.lang.String,%20java.lang.String)
///
///**Official iOS API**: https://developer.apple.com/documentation/webkit/wknavigationdelegate/1455638-webview
Future<HttpAuthResponse?>? onReceivedHttpAuthRequest(
HttpAuthChallenge challenge) {}
URLAuthenticationChallenge challenge) {}
///Event fired when the WebView need to perform server trust authentication (certificate validation).
///The host application must return either [ServerTrustAuthResponse] instance with [ServerTrustAuthResponseAction.CANCEL] or [ServerTrustAuthResponseAction.PROCEED].
@ -763,6 +763,16 @@ class InAppBrowser {
Future<IOSNavigationResponseAction?>?
iosOnNavigationResponse(IOSNavigationResponse navigationResponse) {}
///Called when a web view asks whether to continue with a connection that uses a deprecated version of TLS (v1.0 and v1.1).
///
///[challenge] represents the authentication challenge.
///
///**NOTE**: available only on iOS 14.0+.
///
///**Official iOS API**: https://developer.apple.com/documentation/webkit/wknavigationdelegate/3601237-webview
Future<IOSShouldAllowDeprecatedTLSAction?>?
iosShouldAllowDeprecatedTLS(URLAuthenticationChallenge challenge) {}
void throwIsAlreadyOpened({String message = ''}) {
if (this.isOpened()) {
throw Exception([

8
lib/src/in_app_webview.dart
View File

@ -90,6 +90,7 @@ class InAppWebView extends StatefulWidget implements WebView {
this.iosOnWebContentProcessDidTerminate,
this.iosOnDidReceiveServerRedirectForProvisionalNavigation,
this.iosOnNavigationResponse,
this.iosShouldAllowDeprecatedTLS,
this.gestureRecognizers,
}) : super(key: key);
@ -157,6 +158,11 @@ class InAppWebView extends StatefulWidget implements WebView {
IOSNavigationResponse navigationResponse)?
iosOnNavigationResponse;
@override
final Future<IOSShouldAllowDeprecatedTLSAction?> Function(InAppWebViewController controller,
URLAuthenticationChallenge challenge)?
iosShouldAllowDeprecatedTLS;
@override
final Future<AjaxRequestAction> Function(
InAppWebViewController controller, AjaxRequest ajaxRequest)?
@ -263,7 +269,7 @@ class InAppWebView extends StatefulWidget implements WebView {
@override
final Future<HttpAuthResponse?> Function(
InAppWebViewController controller, HttpAuthChallenge challenge)?
InAppWebViewController controller, URLAuthenticationChallenge challenge)?
onReceivedHttpAuthRequest;
@override

23
lib/src/in_app_webview_controller.dart
View File

@ -489,7 +489,7 @@ class InAppWebViewController {
int previousFailureCount = call.arguments["previousFailureCount"];
var protectionSpace = ProtectionSpace(
host: host, protocol: protocol, realm: realm, port: port);
var challenge = HttpAuthChallenge(
var challenge = URLAuthenticationChallenge(
previousFailureCount: previousFailureCount,
protectionSpace: protectionSpace);
if (_webview != null && _webview!.onReceivedHttpAuthRequest != null)
@ -675,6 +675,27 @@ class InAppWebViewController {
.iosOnNavigationResponse(iosOnNavigationResponse))
?.toMap();
break;
case "shouldAllowDeprecatedTLS":
String host = call.arguments["host"];
String protocol = call.arguments["protocol"];
String? realm = call.arguments["realm"];
int? port = call.arguments["port"];
int previousFailureCount = call.arguments["previousFailureCount"];
var protectionSpace = ProtectionSpace(
host: host, protocol: protocol, realm: realm, port: port);
var challenge = URLAuthenticationChallenge(
previousFailureCount: previousFailureCount,
protectionSpace: protectionSpace);
if (_webview != null && _webview!.iosShouldAllowDeprecatedTLS != null)
return (await _webview!.iosShouldAllowDeprecatedTLS!(
this, challenge))
?.toMap();
else if (_inAppBrowser != null)
return (await _inAppBrowser!
.iosShouldAllowDeprecatedTLS(challenge))
?.toMap();
break;
case "onLongPressHitTestResult":
Map<dynamic, dynamic>? hitTestResultMap =
call.arguments["hitTestResult"];

31
lib/src/types.dart
View File

@ -995,14 +995,14 @@ class HttpAuthResponse {
///Class that represents the challenge of the [WebView.onReceivedHttpAuthRequest] event.
///It provides all the information about the challenge.
class HttpAuthChallenge {
class URLAuthenticationChallenge {
///A count of previous failed authentication attempts.
int previousFailureCount;
///The protection space requiring authentication.
ProtectionSpace? protectionSpace;
HttpAuthChallenge(
URLAuthenticationChallenge(
{required this.previousFailureCount, required this.protectionSpace});
Map<String, dynamic> toMap() {
@ -5532,3 +5532,30 @@ class IOSNavigationResponseAction {
};
}
}
///Class that is used by [WebView.iosShouldAllowDeprecatedTLS] event.
///It represents the policy to pass back to the decision handler.
class IOSShouldAllowDeprecatedTLSAction {
final int _value;
const IOSShouldAllowDeprecatedTLSAction._internal(this._value);
int toValue() => _value;
///Cancel the navigation.
static const CANCEL = const IOSShouldAllowDeprecatedTLSAction._internal(0);
///Allow the navigation to continue.
static const ALLOW = const IOSShouldAllowDeprecatedTLSAction._internal(1);
bool operator ==(value) => value == _value;
@override
int get hashCode => _value.hashCode;
Map<String, dynamic> toMap() {
return {
"action": _value,
};
}
}

16
lib/src/webview.dart
View File

@ -218,13 +218,13 @@ abstract class WebView {
///Event fired when the WebView received an HTTP authentication request. The default behavior is to cancel the request.
///
///[challenge] contains data about host, port, protocol, realm, etc. as specified in the [HttpAuthChallenge].
///[challenge] contains data about host, port, protocol, realm, etc. as specified in the [URLAuthenticationChallenge].
///
///**Official Android API**: https://developer.android.com/reference/android/webkit/WebViewClient#onReceivedHttpAuthRequest(android.webkit.WebView,%20android.webkit.HttpAuthHandler,%20java.lang.String,%20java.lang.String)
///
///**Official iOS API**: https://developer.apple.com/documentation/webkit/wknavigationdelegate/1455638-webview
final Future<HttpAuthResponse?> Function(
InAppWebViewController controller, HttpAuthChallenge challenge)?
InAppWebViewController controller, URLAuthenticationChallenge challenge)?
onReceivedHttpAuthRequest;
///Event fired when the WebView need to perform server trust authentication (certificate validation).
@ -615,6 +615,17 @@ abstract class WebView {
IOSNavigationResponse navigationResponse)?
iosOnNavigationResponse;
///Called when a web view asks whether to continue with a connection that uses a deprecated version of TLS (v1.0 and v1.1).
///
///[challenge] represents the authentication challenge.
///
///**NOTE**: available only on iOS 14.0+.
///
///**Official iOS API**: https://developer.apple.com/documentation/webkit/wknavigationdelegate/3601237-webview
final Future<IOSShouldAllowDeprecatedTLSAction?> Function(InAppWebViewController controller,
URLAuthenticationChallenge challenge)?
iosShouldAllowDeprecatedTLS;
///Initial url that will be loaded.
final String? initialUrl;
@ -692,6 +703,7 @@ abstract class WebView {
this.iosOnWebContentProcessDidTerminate,
this.iosOnDidReceiveServerRedirectForProvisionalNavigation,
this.iosOnNavigationResponse,
this.iosShouldAllowDeprecatedTLS,
this.initialUrl,
this.initialFile,
this.initialData,