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

Fix handling external schemes in address bar #493

Merged
merged 9 commits into from
Apr 1, 2022
Merged

Fix handling external schemes in address bar #493

Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9c991d4
Fix handling external schemes in address bar
ayoy Mar 31, 2022
56f1cb1
Always allow user entered URLs
ayoy Mar 31, 2022
f2b6532
Fix comments
ayoy Mar 31, 2022
f633951
Attempt to fix a bug when external URL is searched for
ayoy Mar 31, 2022
38872ba
Skip calling decisionHandler only for external scheme permissions
ayoy Apr 1, 2022
bfee91b
Add a unit test for external scheme permissions query
ayoy Apr 1, 2022
01c3e5e
Refactor PermissionModel.queryAuthorization(for:domain:url:decisionHa…
ayoy Apr 1, 2022
6484a90
Merge branch 'develop' into dominik/external-schemes-in-address-bar
ayoy Apr 1, 2022
e47ee40
Clear Tab permissions on didEndDisplaying
ayoy Apr 1, 2022
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
17 changes: 9 additions & 8 deletions DuckDuckGo/Browser Tab/Model/Tab.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -849,15 +849,16 @@ extension Tab: WKNavigationDelegate {
return .download(navigationAction, using: webView)

} else if url.isExternalSchemeLink {
// ignore <iframe src="custom://url"> but allow via address bar
guard navigationAction.sourceFrame.isMainFrame,
// ignore 2nd+ external scheme navigation not initiated by user
!self.externalSchemeOpenedPerPageLoad || navigationAction.isUserInitiated
else { return .cancel }

self.externalSchemeOpenedPerPageLoad = true
// always allow user entered URLs
if !userEnteredUrl {
// allow external links via address bar, but ignore <iframe src="custom://url">
guard navigationAction.sourceFrame.isMainFrame,
!self.externalSchemeOpenedPerPageLoad || navigationAction.isUserInitiated
else { return .cancel }

self.externalSchemeOpenedPerPageLoad = true
}
self.delegate?.tab(self, requestedOpenExternalURL: url, forUserEnteredURL: userEnteredUrl)

return .cancel
}

Expand Down