-
Notifications
You must be signed in to change notification settings - Fork 3
fix: harden shop payment bridge #668
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.
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
Open
ben-kaufman
wants to merge
6
commits into
master
Choose a base branch
from
fix/shop-origin-and-pin-pay
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
c1c629d
fix: gate shop origin and pin pay
ben-kaufman dc0f3e2
chore: rename changelog fragment
ben-kaufman a23456a
fix: keep btc map shop navigation
ben-kaufman 9c215ea
Merge branch 'master' into fix/shop-origin-and-pin-pay
ovitrif a1a2fa8
fix: harden shop payment bridge
ben-kaufman 05921c3
Merge branch 'master' into fix/shop-origin-and-pin-pay
ben-kaufman File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| import Foundation | ||
|
|
||
| enum ShopOrigin { | ||
| static let rootHost = "bitrefill.com" | ||
| static let paymentOrigin = "https://embed.bitrefill.com" | ||
| private static let defaultHttpsPort = 443 | ||
|
|
||
| static func isAllowedHost(_ host: String?) -> Bool { | ||
| guard var host = host?.lowercased() else { return false } | ||
| host = host.trimmingCharacters(in: CharacterSet(charactersIn: ".")) | ||
| return host == rootHost || host.hasSuffix(".\(rootHost)") | ||
| } | ||
|
|
||
| static func isAllowed(_ url: URL?) -> Bool { | ||
| guard let url else { return false } | ||
| guard url.scheme?.lowercased() == "https" else { return false } | ||
| return isAllowedHost(url.host) | ||
| } | ||
|
|
||
| static func isAllowedMessageSender(isMainFrame: Bool, scheme: String, host: String, port: Int) -> Bool { | ||
| guard let expectedOrigin = URL(string: paymentOrigin), | ||
| let expectedScheme = expectedOrigin.scheme, | ||
| let expectedHost = expectedOrigin.host | ||
| else { | ||
| return false | ||
| } | ||
| return isMainFrame | ||
| && scheme.lowercased() == expectedScheme | ||
| && host.lowercased() == expectedHost | ||
| && (port == 0 || port == defaultHttpsPort) | ||
| } | ||
|
|
||
| static func shouldRestrictNavigation(initialUrl: String) -> Bool { | ||
| isAllowed(URL(string: initialUrl)) | ||
| } | ||
|
|
||
| static func shouldAllowMainFrameNavigation(to url: URL?, initialUrl: String) -> Bool { | ||
| guard shouldRestrictNavigation(initialUrl: initialUrl) else { return true } | ||
| return isAllowed(url) | ||
| } | ||
|
|
||
| static var messageBridgeScript: String { | ||
| """ | ||
| if (!window.__bitkitShopBridgeInstalled) { | ||
| window.__bitkitShopBridgeInstalled = true; | ||
| window.addEventListener('message', function(event) { | ||
| if (event.origin !== '\(paymentOrigin)') return; | ||
| window.webkit.messageHandlers.messageHandler.postMessage(JSON.stringify(event.data)); | ||
| }); | ||
| } | ||
| """ | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| import BitkitCore | ||
| import Foundation | ||
|
|
||
| enum ScanHandlingScope { | ||
| case unrestricted | ||
| case paymentRequests | ||
| } | ||
|
|
||
| enum ShopPaymentRequest { | ||
| static func isSupported(_ data: BitkitCore.Scanner) -> Bool { | ||
| switch data { | ||
| case .onChain, .lightning, .lnurlPay: | ||
| return true | ||
| default: | ||
| return false | ||
| } | ||
| } | ||
| } | ||
|
|
||
| enum ShopPaymentRequestError: LocalizedError { | ||
| case unsupportedRequest | ||
|
|
||
| var errorDescription: String? { | ||
| t("other__scan__error__generic") | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.