-
Notifications
You must be signed in to change notification settings - Fork 3
fix: grant camera permission based on origin #36
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
Changes from 3 commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22,7 +22,7 @@ | |
| static NSString *const MessageHandlerName = @"ReactNativeWebView"; | ||
| static NSURLCredential* clientAuthenticationCredential; | ||
| static NSDictionary* customCertificatesForHost; | ||
| static NSSet *cameraPermissionWhitelist; | ||
| static NSSet *cameraPermissionOriginWhitelist; | ||
|
|
||
| NSString *const CUSTOM_SELECTOR = @"_CUSTOM_SELECTOR_"; | ||
|
|
||
|
|
@@ -71,7 +71,7 @@ @interface RNCWebView () <WKUIDelegate, WKNavigationDelegate, WKScriptMessageHan | |
| @property (nonatomic, strong) WKUserScript *postMessageScript; | ||
| @property (nonatomic, strong) WKUserScript *atStartScript; | ||
| @property (nonatomic, strong) WKUserScript *atEndScript; | ||
| @property (nonatomic, strong) NSArray<NSString *> *cameraPermissionWhitelist; | ||
| @property (nonatomic, strong) NSArray<NSString *> *cameraPermissionOriginWhitelist; | ||
| @end | ||
|
|
||
| @implementation RNCWebView | ||
|
|
@@ -1056,24 +1056,16 @@ - (void) webView:(WKWebView *)webView | |
| initiatedByFrame:(WKFrameInfo *)frame | ||
| type:(WKMediaCaptureType)type | ||
| decisionHandler:(void (^)(WKPermissionDecision decision))decisionHandler { | ||
| if (![self.cameraPermissionWhitelist containsObject:origin.host]) { | ||
| decisionHandler(WKPermissionDecisionDeny); | ||
| return; | ||
| NSString *originString = [NSString stringWithFormat:@"%@://%@", origin.protocol, origin.host]; | ||
|
|
||
| if (origin.port > 0 && (([origin.protocol isEqualToString:@"http"] && origin.port != 80) || ([origin.protocol isEqualToString:@"https"] && origin.port != 443))) { | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. TODO: test if protocol is normalized, i.e., if
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Does this actually matter? If // Example:
// originString: 'HttPs://camerasite.com'
// cameraPermissionOriginWhitelist: ['https://camerasite.com']
if ([self.cameraPermissionOriginWhitelist containsObject:originString]) { // wouldn't match hence deniedI think it’s fine for this case to result in denial, so there’s no need to normalize the protocol. |
||
| originString = [originString stringByAppendingFormat:@":%ld", (long)origin.port]; | ||
| } | ||
|
|
||
| if (_mediaCapturePermissionGrantType == RNCWebViewPermissionGrantType_GrantIfSameHost_ElsePrompt || _mediaCapturePermissionGrantType == RNCWebViewPermissionGrantType_GrantIfSameHost_ElseDeny) { | ||
| if ([origin.host isEqualToString:webView.URL.host]) { | ||
| decisionHandler(WKPermissionDecisionGrant); | ||
| } else { | ||
| WKPermissionDecision decision = _mediaCapturePermissionGrantType == RNCWebViewPermissionGrantType_GrantIfSameHost_ElsePrompt ? WKPermissionDecisionPrompt : WKPermissionDecisionDeny; | ||
| decisionHandler(decision); | ||
| } | ||
| } else if (_mediaCapturePermissionGrantType == RNCWebViewPermissionGrantType_Deny) { | ||
| decisionHandler(WKPermissionDecisionDeny); | ||
| } else if (_mediaCapturePermissionGrantType == RNCWebViewPermissionGrantType_Grant) { | ||
| if ([self.cameraPermissionOriginWhitelist containsObject:originString]) { | ||
| decisionHandler(WKPermissionDecisionGrant); | ||
| } else { | ||
| decisionHandler(WKPermissionDecisionPrompt); | ||
| decisionHandler(WKPermissionDecisionDeny); | ||
| } | ||
| } | ||
| #endif | ||
|
|
||
Uh oh!
There was an error while loading. Please reload this page.