fix: grant camera permission base on origin for android

ExodusMovement · Feb 20, 2025 · 2598a37 · 2598a37
1 parent 948b911
commit 2598a37
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 18 deletions.
diff --git a/android/src/main/java/com/reactnativecommunity/webview/RNCWebViewManager.java b/android/src/main/java/com/reactnativecommunity/webview/RNCWebViewManager.java
@@ -226,14 +226,14 @@ private String getLackPermissionToDownloadMessage() {
     return  mDownloadingMessage == null ? DEFAULT_LACK_PERMISSION_TO_DOWNLOAD_MESSAGE : mLackPermissionToDownloadMessage;
   }
 
-  @ReactProp(name = "cameraPermissionWhitelist")
-  public void setCameraPermissionWhitelist(RNCWebView webView, ReadableArray whitelist) {
+  @ReactProp(name = "cameraPermissionOriginWhitelist")
+  public void setCameraPermissionOriginWhitelist(RNCWebView webView, ReadableArray whitelist) {
     Set<String> whitelistSet = new HashSet<>();
     for (int i = 0; i < whitelist.size(); i++) {
       whitelistSet.add(whitelist.getString(i));
     }
 
-    mWebChromeClient.setCameraPermissionWhitelist(whitelistSet);
+    mWebChromeClient.setCameraPermissionOriginWhitelist(whitelistSet);
   }
 
   @ReactProp(name = "javaScriptEnabled")
@@ -1002,15 +1002,15 @@ protected static class RNCWebChromeClient extends WebChromeClient implements Lif
 
     // True if protected media should be allowed, false otherwise
     protected boolean mAllowsProtectedMedia = false;
-    private Set<String> cameraPermissionWhitelist = new HashSet<>();
+    private Set<String> cameraPermissionOriginWhitelist = new HashSet<>();
 
     public RNCWebChromeClient(ReactContext reactContext, WebView webView) {
       this.mReactContext = reactContext;
       this.mWebView = webView;
     }
 
-    public void setCameraPermissionWhitelist(Set<String> whitelist) {
-      this.cameraPermissionWhitelist = whitelist;
+    public void setCameraPermissionOriginWhitelist(Set<String> whitelist) {
+      this.cameraPermissionOriginWhitelist = whitelist;
     }
 
     @Override
@@ -1074,21 +1074,19 @@ public void onPermissionRequest(final PermissionRequest request) {
       grantedPermissions = new ArrayList<>();
 
       ArrayList<String> requestedAndroidPermissions = new ArrayList<>();
-      String originUrl = request.getOrigin().toString();
-      String originHost;
-
-      try {
-        URL url = new URL(originUrl);
-        originHost = url.getHost();
-      } catch (MalformedURLException e) {
-        request.deny();
-        return;
+      final Uri originUri = request.getOrigin();
+      final String scheme = originUri.getScheme();
+      final int port = originUri.getPort();
+      String origin = scheme + "://" + port;
+
+      if (port > 0 && ((scheme == "http" && port != 80) || (scheme == "https" && port != 443))) {
+        origin += ":" + port;
       }
 
       for (String requestedResource : request.getResources()) {
         String androidPermission = null;
 
-        if (this.cameraPermissionWhitelist.contains(originHost)) {
+        if (this.cameraPermissionOriginWhitelist.contains(origin)) {
           if (requestedResource.equals(PermissionRequest.RESOURCE_VIDEO_CAPTURE)) {
             androidPermission = Manifest.permission.CAMERA;
           } else if (requestedResource.equals(PermissionRequest.RESOURCE_AUDIO_CAPTURE)) {

diff --git a/src/WebView.android.tsx b/src/WebView.android.tsx
@@ -67,7 +67,6 @@ const WebViewComponent = forwardRef<{}, AndroidWebViewProps>((props, ref) => {
     scalesPageToFit = true,
     saveFormDataDisabled = false,
     cacheEnabled = true,
-    cameraPermissionWhitelist = [],
     androidHardwareAccelerationDisabled = false,
     androidLayerType = "none",
     originWhitelist = defaultOriginWhitelist,
@@ -208,7 +207,6 @@ const WebViewComponent = forwardRef<{}, AndroidWebViewProps>((props, ref) => {
   const webView = <NativeWebView
     key="webViewKey"
     {...otherProps}
-    cameraPermissionWhitelist={removeHttpsFromOrigins(cameraPermissionWhitelist)}
     messagingEnabled={typeof onMessageProp === 'function'}
     messagingModuleName={messagingModuleName}