Skip to content
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

Check for auth origin before checking for host origin #64

Merged
merged 3 commits into from
Feb 16, 2024
Merged

Check for auth origin before checking for host origin #64

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ba5c674
:bug: Check for auth origin before checking for host origin
steelbrain Dec 5, 2023
b75972e
Merge branch 'main' into steelbrain/fix-auth-origin-check
khmyznikov Feb 16, 2024
6ad7187
Update WebView.swift
khmyznikov Feb 16, 2024
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
94 changes: 47 additions & 47 deletions Microsoft.PWABuilder.IOS.Web/Resources/ios-project-src/pwa-shell/WebView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import SafariServices


func createWebView(container: UIView, WKSMH: WKScriptMessageHandler, WKND: WKNavigationDelegate, NSO: NSObject, VC: ViewController) -> WKWebView{

let config = WKWebViewConfiguration()
let userContentController = WKUserContentController()

Expand All @@ -14,15 +14,15 @@ func createWebView(container: UIView, WKSMH: WKScriptMessageHandler, WKND: WKNav
userContentController.add(WKSMH, name: "push-permission-request")
userContentController.add(WKSMH, name: "push-permission-state")
config.userContentController = userContentController

if #available(iOS 14, *) {
config.limitsNavigationsToAppBoundDomains = true;

}
config.preferences.javaScriptCanOpenWindowsAutomatically = true
config.allowsInlineMediaPlayback = true
config.preferences.setValue(true, forKey: "standalone")

let webView = WKWebView(frame: calcWebviewFrame(webviewView: container, toolbarView: nil), configuration: config)
setCustomCookie(webView: webView)
webView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
Expand All @@ -31,7 +31,7 @@ func createWebView(container: UIView, WKSMH: WKScriptMessageHandler, WKND: WKNav
webView.scrollView.bounces = false;
webView.allowsBackForwardNavigationGestures = true
webView.configuration.applicationNameForUserAgent = "Safari/604.1" // See https://github.com/pwa-builder/pwabuilder-ios/issues/30
webView.customUserAgent = "Mozilla/5.0 (iPhone; CPU iPhone OS 15_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.0 Mobile/15E148 Safari/604.1";
webView.customUserAgent = "Mozilla/5.0 (iPhone; CPU iPhone OS 15_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.0 Mobile/15E148 Safari/604.1";
webView.scrollView.contentInsetAdjustmentBehavior = .never
webView.addObserver(NSO, forKeyPath: #keyPath(WKWebView.estimatedProgress), options: NSKeyValueObservingOptions.new, context: nil)

Expand Down Expand Up @@ -72,7 +72,7 @@ func calcWebviewFrame(webviewView: UIView, toolbarView: UIToolbar?) -> CGRect{
let winScene = UIApplication.shared.connectedScenes.first
let windowScene = winScene as! UIWindowScene
var statusBarHeight = windowScene.statusBarManager?.statusBarFrame.height ?? 0

switch displayMode {
case "fullscreen":
#if targetEnvironment(macCatalyst)
Expand Down Expand Up @@ -107,6 +107,17 @@ extension ViewController: WKUIDelegate {
}
if let requestUrl = navigationAction.request.url{
if let requestHost = requestUrl.host {
// NOTE: Match auth origin first, because host origin may be a subset of auth origin and may therefore always match
let matchingAuthOrigin = authOrigins.first(where: { requestHost.range(of: $0) != nil })
if (matchingAuthOrigin != nil) {
decisionHandler(.allow)
if (toolbarView.isHidden) {
toolbarView.isHidden = false
webView.frame = calcWebviewFrame(webviewView: webviewView, toolbarView: toolbarView)
}
return
}

let matchingHostOrigin = allowedOrigins.first(where: { requestHost.range(of: $0) != nil })
if (matchingHostOrigin != nil) {
// Open in main webview
Expand All @@ -115,42 +126,31 @@ extension ViewController: WKUIDelegate {
toolbarView.isHidden = true
webView.frame = calcWebviewFrame(webviewView: webviewView, toolbarView: nil)
}

return
}
if (navigationAction.navigationType == .other &&
navigationAction.value(forKey: "syntheticClickType") as! Int == 0 &&
(navigationAction.targetFrame != nil) &&
// no error here, fake warning
(navigationAction.sourceFrame != nil)
) {
decisionHandler(.allow)
return
}
else {
decisionHandler(.cancel)
}


if ["http", "https"].contains(requestUrl.scheme?.lowercased() ?? "") {
// Can open with SFSafariViewController
let safariViewController = SFSafariViewController(url: requestUrl)
self.present(safariViewController, animated: true, completion: nil)
} else {
let matchingAuthOrigin = authOrigins.first(where: { requestHost.range(of: $0) != nil })
if (matchingAuthOrigin != nil) {
decisionHandler(.allow)
if (toolbarView.isHidden) {
toolbarView.isHidden = false
webView.frame = calcWebviewFrame(webviewView: webviewView, toolbarView: toolbarView)
}
return
}
else {
if (navigationAction.navigationType == .other &&
navigationAction.value(forKey: "syntheticClickType") as! Int == 0 &&
(navigationAction.targetFrame != nil)
) {
decisionHandler(.allow)
return
}
else {
decisionHandler(.cancel)
}
// Scheme is not supported or no scheme is given, use openURL
if (UIApplication.shared.canOpenURL(requestUrl)) {
UIApplication.shared.open(requestUrl)
}


if ["http", "https"].contains(requestUrl.scheme?.lowercased() ?? "") {
// Can open with SFSafariViewController
let safariViewController = SFSafariViewController(url: requestUrl)
self.present(safariViewController, animated: true, completion: nil)
} else {
// Scheme is not supported or no scheme is given, use openURL
if (UIApplication.shared.canOpenURL(requestUrl)) {
UIApplication.shared.open(requestUrl)
}
}

}
} else {
decisionHandler(.cancel)
Expand All @@ -164,14 +164,14 @@ extension ViewController: WKUIDelegate {
else {
decisionHandler(.cancel)
}

}
// Handle javascript: `window.alert(message: String)`
func webView(_ webView: WKWebView,
runJavaScriptAlertPanelWithMessage message: String,
initiatedByFrame frame: WKFrameInfo,
completionHandler: @escaping () -> Void) {

// Set the message as the UIAlertController message
let alert = UIAlertController(
title: nil,
Expand Down Expand Up @@ -205,7 +205,7 @@ extension ViewController: WKUIDelegate {
message: message,
preferredStyle: .alert
)

// Add a confirmation action “Cancel”
let cancelAction = UIAlertAction(
title: "Cancel",
Expand All @@ -215,7 +215,7 @@ extension ViewController: WKUIDelegate {
completionHandler(false)
}
)

// Add a confirmation action “OK”
let okAction = UIAlertAction(
title: "OK",
Expand Down Expand Up @@ -244,7 +244,7 @@ extension ViewController: WKUIDelegate {
message: prompt,
preferredStyle: .alert
)

// Add a confirmation action “Cancel”
let cancelAction = UIAlertAction(
title: "Cancel",
Expand All @@ -254,7 +254,7 @@ extension ViewController: WKUIDelegate {
completionHandler(nil)
}
)

// Add a confirmation action “OK”
let okAction = UIAlertAction(
title: "OK",
Expand All @@ -266,7 +266,7 @@ extension ViewController: WKUIDelegate {
}
}
)

alert.addTextField { textField in
textField.placeholder = defaultText
}
Expand Down
Loading