@exodus/react-native-webview 13.16.0-exodus.3 → 13.16.0-exodus.4

package/android/src/main/java/com/reactnativecommunity/webview/RNCWebChromeClient.java

@@ -157,8 +157,16 @@ public class RNCWebChromeClient extends WebChromeClient implements LifecycleEven
         // Exodus: Build origin string for whitelist check
         final Uri originUri = request.getOrigin();
         final String scheme = originUri.getScheme();
+        final String host = originUri.getHost();
         final int port = originUri.getPort();
-        String origin = scheme + "://" + originUri.getHost();
+
+        // Exodus: Deny permission if host is null (malformed origin)
+        if (host == null) {
+            request.deny();
+            return;
+        }
+
+        String origin = scheme + "://" + host;
 
         if (port > 0 && (("http".equals(scheme) && port != 80) || ("https".equals(scheme) && port != 443))) {
             origin += ":" + port;
@@ -177,17 +185,11 @@ public class RNCWebChromeClient extends WebChromeClient implements LifecycleEven
                     androidPermission = Manifest.permission.CAMERA;
                 }
             } else if(requestedResource.equals(PermissionRequest.RESOURCE_PROTECTED_MEDIA_ID)) {
+                // Exodus: Only grant if allowsProtectedMedia is enabled.
+                // RESOURCE_PROTECTED_MEDIA_ID is not a real Android permission,
+                // so it cannot be passed to checkSelfPermission.
                 if (mAllowsProtectedMedia) {
                   grantedPermissions.add(requestedResource);
-                } else {
-                  /**
-                   * Legacy handling (Kept in case it was working under some conditions (given Android version or something))
-                   *
-                   * Try to ask user to grant permission using Activity.requestPermissions
-                   *
-                   * Find more details here: https://github.com/react-native-webview/react-native-webview/pull/2732
-                   */
-                  androidPermission = PermissionRequest.RESOURCE_PROTECTED_MEDIA_ID;
                 }
             }
             // TODO: RESOURCE_MIDI_SYSEX, RESOURCE_PROTECTED_MEDIA_ID.
@@ -235,7 +237,8 @@ public class RNCWebChromeClient extends WebChromeClient implements LifecycleEven
             requestPermissions(Collections.singletonList(Manifest.permission.ACCESS_FINE_LOCATION));
 
         } else {
-            callback.invoke(origin, true, false);
+            // Exodus: Deny geolocation by default for security
+            callback.invoke(origin, false, false);
         }
     }
 
@@ -319,12 +322,6 @@ public class RNCWebChromeClient extends WebChromeClient implements LifecycleEven
                 shouldAnswerToPermissionRequest = true;
             }
 
-            if (permission.equals(PermissionRequest.RESOURCE_PROTECTED_MEDIA_ID)) {
-                if (granted && grantedPermissions != null) {
-                    grantedPermissions.add(PermissionRequest.RESOURCE_PROTECTED_MEDIA_ID);
-                }
-                shouldAnswerToPermissionRequest = true;
-            }
         }
 
         if (shouldAnswerToPermissionRequest
@@ -404,4 +401,4 @@ public class RNCWebChromeClient extends WebChromeClient implements LifecycleEven
     public void setCameraPermissionOriginWhitelist(Set<String> whitelist) {
       this.cameraPermissionOriginWhitelist = whitelist;
     }
-}
+}

package/android/src/main/java/com/reactnativecommunity/webview/RNCWebViewClient.java

@@ -10,12 +10,10 @@ import android.webkit.HttpAuthHandler;
 import android.webkit.RenderProcessGoneDetail;
 import android.webkit.SslErrorHandler;
 import android.webkit.WebResourceRequest;
-import android.webkit.WebResourceResponse;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
 import androidx.annotation.Nullable;
-import androidx.annotation.RequiresApi;
 import androidx.core.util.Pair;
 
 import com.facebook.common.logging.FLog;
@@ -26,7 +24,6 @@ import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.UIManagerHelper;
 import com.reactnativecommunity.webview.events.SubResourceErrorEvent;
-import com.reactnativecommunity.webview.events.TopHttpErrorEvent;
 import com.reactnativecommunity.webview.events.TopLoadingErrorEvent;
 import com.reactnativecommunity.webview.events.TopLoadingFinishEvent;
 import com.reactnativecommunity.webview.events.TopLoadingStartEvent;
@@ -256,24 +253,6 @@ public class RNCWebViewClient extends WebViewClient {
         UIManagerHelper.getEventDispatcherForReactTag((ReactContext) webView.getContext(), reactTag).dispatchEvent(new TopLoadingErrorEvent(reactTag, eventData));
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.M)
-    @Override
-    public void onReceivedHttpError(
-            WebView webView,
-            WebResourceRequest request,
-            WebResourceResponse errorResponse) {
-        super.onReceivedHttpError(webView, request, errorResponse);
-
-        if (request.isForMainFrame()) {
-            WritableMap eventData = createWebViewEvent(webView, request.getUrl().toString());
-            eventData.putInt("statusCode", errorResponse.getStatusCode());
-            eventData.putString("description", errorResponse.getReasonPhrase());
-
-            int reactTag = RNCWebViewWrapper.getReactTagFromWebView(webView);
-            UIManagerHelper.getEventDispatcherForReactTag((ReactContext) webView.getContext(), reactTag).dispatchEvent(new TopHttpErrorEvent(reactTag, eventData));
-        }
-    }
-
     @TargetApi(Build.VERSION_CODES.O)
     @Override
     public boolean onRenderProcessGone(WebView webView, RenderProcessGoneDetail detail) {

package/android/src/main/java/com/reactnativecommunity/webview/RNCWebViewManagerImpl.kt

@@ -48,7 +48,6 @@ class RNCWebViewManagerImpl(private val newArch: Boolean = false) {
     private var mPendingSource: ReadableMap? = null
 
     private var mUserAgent: String? = null
-    private var mUserAgentWithApplicationName: String? = null
     private val HTML_ENCODING = "UTF-8"
     private val HTML_MIME_TYPE = "text/html"
     private val HTTP_METHOD_POST = "POST"
@@ -84,6 +83,8 @@ class RNCWebViewManagerImpl(private val newArch: Boolean = false) {
         settings.allowFileAccessFromFileURLs = false
         settings.allowUniversalAccessFromFileURLs = false
         settings.mixedContentMode = WebSettings.MIXED_CONTENT_NEVER_ALLOW
+        // Exodus: Force javaScriptCanOpenWindowsAutomatically = false for security
+        settings.javaScriptCanOpenWindowsAutomatically = false
 
         // Fixes broken full-screen modals/galleries due to body height being 0.
         webView.layoutParams = ViewGroup.LayoutParams(
@@ -114,7 +115,9 @@ class RNCWebViewManagerImpl(private val newArch: Boolean = false) {
                 urlObj = URL(url)
                 val baseUrl = urlObj.protocol + "://" + urlObj.host
                 val cookie = CookieManager.getInstance().getCookie(baseUrl)
-                request.addRequestHeader("Cookie", cookie)
+                if (cookie != null) {
+                    request.addRequestHeader("Cookie", cookie)
+                }
             } catch (e: MalformedURLException) {
                 Log.w(TAG, "Error getting cookie for DownloadManager", e)
             }
@@ -230,28 +233,12 @@ class RNCWebViewManagerImpl(private val newArch: Boolean = false) {
         setUserAgentString(viewWrapper)
     }
 
-    fun setApplicationNameForUserAgent(viewWrapper: RNCWebViewWrapper, applicationName: String?) {
-        when {
-            applicationName != null -> {
-                val defaultUserAgent = WebSettings.getDefaultUserAgent(viewWrapper.webView.context)
-                mUserAgentWithApplicationName = "$defaultUserAgent $applicationName"
-            }
-            else -> {
-                mUserAgentWithApplicationName = null
-            }
-        }
-        setUserAgentString(viewWrapper)
-    }
-
     private fun setUserAgentString(viewWrapper: RNCWebViewWrapper) {
         val view = viewWrapper.webView
         when {
             mUserAgent != null -> {
                 view.settings.userAgentString = mUserAgent
             }
-            mUserAgentWithApplicationName != null -> {
-                view.settings.userAgentString = mUserAgentWithApplicationName
-            }
             else -> {
                 view.settings.userAgentString = WebSettings.getDefaultUserAgent(view.context)
             }
@@ -289,7 +276,6 @@ class RNCWebViewManagerImpl(private val newArch: Boolean = false) {
     val COMMAND_RELOAD = 3
     val COMMAND_STOP_LOADING = 4
     val COMMAND_POST_MESSAGE = 5
-    val COMMAND_INJECT_JAVASCRIPT = 6
     val COMMAND_LOAD_URL = 7
     val COMMAND_FOCUS = 8
 
@@ -305,7 +291,6 @@ class RNCWebViewManagerImpl(private val newArch: Boolean = false) {
         .put("reload", COMMAND_RELOAD)
         .put("stopLoading", COMMAND_STOP_LOADING)
         .put("postMessage", COMMAND_POST_MESSAGE)
-        .put("injectJavaScript", COMMAND_INJECT_JAVASCRIPT)
         .put("loadUrl", COMMAND_LOAD_URL)
         .put("requestFocus", COMMAND_FOCUS)
         .put("clearFormData", COMMAND_CLEAR_FORM_DATA)
@@ -340,7 +325,6 @@ class RNCWebViewManagerImpl(private val newArch: Boolean = false) {
         } catch (e: JSONException) {
           throw RuntimeException(e)
         }
-        "injectJavaScript" -> webView.evaluateJavascriptWithFallback(args.getString(0))
         "loadUrl" -> {
           val url = args?.getString(0) ?: throw RuntimeException("Arguments for loading an url are null!")
           webView.progressChangedFilter.setWaitingForCommandLoadUrl(false)
@@ -367,10 +351,6 @@ class RNCWebViewManagerImpl(private val newArch: Boolean = false) {
         }
     }
 
-    fun setAllowUniversalAccessFromFileURLs(viewWrapper: RNCWebViewWrapper, allow: Boolean) {
-        viewWrapper.webView.settings.allowUniversalAccessFromFileURLs = allow
-    }
-
     private fun getDownloadingMessageOrDefault(): String? {
         return mDownloadingMessage ?: DEFAULT_DOWNLOADING_MESSAGE
     }
@@ -499,26 +479,11 @@ class RNCWebViewManagerImpl(private val newArch: Boolean = false) {
         view.injectedJSBeforeContentLoaded = value
     }
 
-    fun setInjectedJavaScriptForMainFrameOnly(viewWrapper: RNCWebViewWrapper, value: Boolean) {
-        val view = viewWrapper.webView
-        view.injectedJavaScriptForMainFrameOnly = value
-    }
-
-    fun setInjectedJavaScriptBeforeContentLoadedForMainFrameOnly(viewWrapper: RNCWebViewWrapper, value: Boolean) {
-        val view = viewWrapper.webView
-        view.injectedJavaScriptBeforeContentLoadedForMainFrameOnly = value
-    }
-
     fun setInjectedJavaScriptObject(viewWrapper: RNCWebViewWrapper, value: String?) {
         val view = viewWrapper.webView
         view.setInjectedJavaScriptObject(value)
     }
 
-    fun setJavaScriptCanOpenWindowsAutomatically(viewWrapper: RNCWebViewWrapper, value: Boolean) {
-        val view = viewWrapper.webView
-        view.settings.javaScriptCanOpenWindowsAutomatically = value
-    }
-
     fun setShowsVerticalScrollIndicator(viewWrapper: RNCWebViewWrapper, value: Boolean) {
         val view = viewWrapper.webView
         view.isVerticalScrollBarEnabled = value
@@ -549,16 +514,6 @@ class RNCWebViewManagerImpl(private val newArch: Boolean = false) {
         view.settings.javaScriptEnabled = enabled
     }
 
-    fun setAllowFileAccess(viewWrapper: RNCWebViewWrapper, allowFileAccess: Boolean) {
-        val view = viewWrapper.webView
-        view.settings.allowFileAccess = allowFileAccess;
-    }
-
-    fun setAllowFileAccessFromFileURLs(viewWrapper: RNCWebViewWrapper, value: Boolean) {
-        val view = viewWrapper.webView
-        view.settings.allowFileAccessFromFileURLs = value;
-    }
-
     fun setAllowsFullscreenVideo(viewWrapper: RNCWebViewWrapper, value: Boolean) {
         val view = viewWrapper.webView
         mAllowsFullscreenVideo = value

package/android/src/newarch/com/reactnativecommunity/webview/RNCWebViewManager.java

@@ -16,7 +16,6 @@ import com.facebook.react.viewmanagers.RNCWebViewManagerInterface;
 import com.facebook.react.views.scroll.ScrollEventType;
 import com.reactnativecommunity.webview.events.TopCustomMenuSelectionEvent;
 import com.reactnativecommunity.webview.events.SubResourceErrorEvent;
-import com.reactnativecommunity.webview.events.TopHttpErrorEvent;
 import com.reactnativecommunity.webview.events.TopLoadingErrorEvent;
 import com.reactnativecommunity.webview.events.TopLoadingFinishEvent;
 import com.reactnativecommunity.webview.events.TopLoadingProgressEvent;
@@ -63,25 +62,6 @@ public class RNCWebViewManager extends ViewGroupManager<RNCWebViewWrapper>
         return mRNCWebViewManagerImpl.createViewInstance(context);
     }
 
-    @Override
-    @ReactProp(name = "allowFileAccess")
-    public void setAllowFileAccess(RNCWebViewWrapper view, boolean value) {
-        mRNCWebViewManagerImpl.setAllowFileAccess(view, value);
-    }
-
-    @Override
-    @ReactProp(name = "allowFileAccessFromFileURLs")
-    public void setAllowFileAccessFromFileURLs(RNCWebViewWrapper view, boolean value) {
-        mRNCWebViewManagerImpl.setAllowFileAccessFromFileURLs(view, value);
-
-    }
-
-    @Override
-    @ReactProp(name = "allowUniversalAccessFromFileURLs")
-    public void setAllowUniversalAccessFromFileURLs(RNCWebViewWrapper view, boolean value) {
-        mRNCWebViewManagerImpl.setAllowUniversalAccessFromFileURLs(view, value);
-    }
-
     @Override
     @ReactProp(name = "allowsFullscreenVideo")
     public void setAllowsFullscreenVideo(RNCWebViewWrapper view, boolean value) {
@@ -100,12 +80,6 @@ public class RNCWebViewManager extends ViewGroupManager<RNCWebViewWrapper>
         mRNCWebViewManagerImpl.setAndroidLayerType(view, value);
     }
 
-    @Override
-    @ReactProp(name = "applicationNameForUserAgent")
-    public void setApplicationNameForUserAgent(RNCWebViewWrapper view, @Nullable String value) {
-        mRNCWebViewManagerImpl.setApplicationNameForUserAgent(view, value);
-    }
-
     @Override
     @ReactProp(name = "basicAuthCredential")
     public void setBasicAuthCredential(RNCWebViewWrapper view, @Nullable ReadableMap value) {
@@ -172,31 +146,11 @@ public class RNCWebViewManager extends ViewGroupManager<RNCWebViewWrapper>
         mRNCWebViewManagerImpl.setInjectedJavaScriptBeforeContentLoaded(view, value);
     }
 
-    @Override
-    @ReactProp(name = "injectedJavaScriptForMainFrameOnly")
-    public void setInjectedJavaScriptForMainFrameOnly(RNCWebViewWrapper view, boolean value) {
-        mRNCWebViewManagerImpl.setInjectedJavaScriptForMainFrameOnly(view, value);
-
-    }
-
-    @Override
-    @ReactProp(name = "injectedJavaScriptBeforeContentLoadedForMainFrameOnly")
-    public void setInjectedJavaScriptBeforeContentLoadedForMainFrameOnly(RNCWebViewWrapper view, boolean value) {
-        mRNCWebViewManagerImpl.setInjectedJavaScriptBeforeContentLoadedForMainFrameOnly(view, value);
-
-    }
-
     @ReactProp(name = "injectedJavaScriptObject")
     public void setInjectedJavaScriptObject(RNCWebViewWrapper view, @Nullable String value) {
         mRNCWebViewManagerImpl.setInjectedJavaScriptObject(view, value);
     }
 
-    @Override
-    @ReactProp(name = "javaScriptCanOpenWindowsAutomatically")
-    public void setJavaScriptCanOpenWindowsAutomatically(RNCWebViewWrapper view, boolean value) {
-        mRNCWebViewManagerImpl.setJavaScriptCanOpenWindowsAutomatically(view, value);
-    }
-
     @ReactProp(name = "javaScriptEnabled")
     public void setJavaScriptEnabled(RNCWebViewWrapper view, boolean enabled) {
         mRNCWebViewManagerImpl.setJavaScriptEnabled(view, enabled);
@@ -357,9 +311,6 @@ public class RNCWebViewManager extends ViewGroupManager<RNCWebViewWrapper>
     @Override
     public void setAllowsPictureInPictureMediaPlayback(RNCWebViewWrapper view, boolean value) {}
 
-    @Override
-    public void setAllowsAirPlayForMediaPlayback(RNCWebViewWrapper view, boolean value) {}
-
     @Override
     public void setAllowsLinkPreview(RNCWebViewWrapper view, boolean value) {}
 
@@ -426,9 +377,6 @@ public class RNCWebViewManager extends ViewGroupManager<RNCWebViewWrapper>
     @Override
     public void setTextInteractionEnabled(RNCWebViewWrapper view, boolean value) {}
 
-    @Override
-    public void setHasOnFileDownload(RNCWebViewWrapper view, boolean value) {}
-
     @Override
     public void setMediaCapturePermissionGrantType(RNCWebViewWrapper view, @Nullable String value) {}
 
@@ -462,11 +410,6 @@ public class RNCWebViewManager extends ViewGroupManager<RNCWebViewWrapper>
     view.getWebView().stopLoading();
   }
 
-  @Override
-  public void injectJavaScript(RNCWebViewWrapper view, String javascript) {
-      view.getWebView().evaluateJavascriptWithFallback(javascript);
-  }
-
   @Override
   public void requestFocus(RNCWebViewWrapper view) {
       view.requestFocus();
@@ -538,7 +481,6 @@ public class RNCWebViewManager extends ViewGroupManager<RNCWebViewWrapper>
         export.put(TopLoadingProgressEvent.EVENT_NAME, MapBuilder.of("registrationName", "onLoadingProgress"));
         export.put(TopShouldStartLoadWithRequestEvent.EVENT_NAME, MapBuilder.of("registrationName", "onShouldStartLoadWithRequest"));
         export.put(ScrollEventType.getJSEventName(ScrollEventType.SCROLL), MapBuilder.of("registrationName", "onScroll"));
-        export.put(TopHttpErrorEvent.EVENT_NAME, MapBuilder.of("registrationName", "onHttpError"));
         export.put(TopRenderProcessGoneEvent.EVENT_NAME, MapBuilder.of("registrationName", "onRenderProcessGone"));
         export.put(TopCustomMenuSelectionEvent.EVENT_NAME, MapBuilder.of("registrationName", "onCustomMenuSelection"));
         export.put(TopOpenWindowEvent.EVENT_NAME, MapBuilder.of("registrationName", "onOpenWindow"));

package/android/src/oldarch/com/reactnativecommunity/webview/RNCWebViewManager.java

@@ -12,7 +12,6 @@ import com.facebook.react.uimanager.annotations.ReactProp;
 import com.facebook.react.views.scroll.ScrollEventType;
 import com.reactnativecommunity.webview.events.TopCustomMenuSelectionEvent;
 import com.reactnativecommunity.webview.events.SubResourceErrorEvent;
-import com.reactnativecommunity.webview.events.TopHttpErrorEvent;
 import com.reactnativecommunity.webview.events.TopLoadingErrorEvent;
 import com.reactnativecommunity.webview.events.TopLoadingFinishEvent;
 import com.reactnativecommunity.webview.events.TopLoadingProgressEvent;
@@ -46,22 +45,6 @@ public class RNCWebViewManager extends ViewGroupManager<RNCWebViewWrapper> {
       return mRNCWebViewManagerImpl.createViewInstance(context, view);
     }
 
-    @ReactProp(name = "allowFileAccess")
-    public void setAllowFileAccess(RNCWebViewWrapper view, boolean value) {
-        mRNCWebViewManagerImpl.setAllowFileAccess(view, value);
-    }
-
-    @ReactProp(name = "allowFileAccessFromFileURLs")
-    public void setAllowFileAccessFromFileURLs(RNCWebViewWrapper view, boolean value) {
-        mRNCWebViewManagerImpl.setAllowFileAccessFromFileURLs(view, value);
-
-    }
-
-    @ReactProp(name = "allowUniversalAccessFromFileURLs")
-    public void setAllowUniversalAccessFromFileURLs(RNCWebViewWrapper view, boolean value) {
-        mRNCWebViewManagerImpl.setAllowUniversalAccessFromFileURLs(view, value);
-    }
-
     @ReactProp(name = "allowsFullscreenVideo")
     public void setAllowsFullscreenVideo(RNCWebViewWrapper view, boolean value) {
         mRNCWebViewManagerImpl.setAllowsFullscreenVideo(view, value);
@@ -77,11 +60,6 @@ public class RNCWebViewManager extends ViewGroupManager<RNCWebViewWrapper> {
         mRNCWebViewManagerImpl.setAndroidLayerType(view, value);
     }
 
-    @ReactProp(name = "applicationNameForUserAgent")
-    public void setApplicationNameForUserAgent(RNCWebViewWrapper view, @Nullable String value) {
-        mRNCWebViewManagerImpl.setApplicationNameForUserAgent(view, value);
-    }
-
     @ReactProp(name = "basicAuthCredential")
     public void setBasicAuthCredential(RNCWebViewWrapper view, @Nullable ReadableMap value) {
         mRNCWebViewManagerImpl.setBasicAuthCredential(view, value);
@@ -137,28 +115,11 @@ public class RNCWebViewManager extends ViewGroupManager<RNCWebViewWrapper> {
         mRNCWebViewManagerImpl.setInjectedJavaScriptBeforeContentLoaded(view, value);
     }
 
-    @ReactProp(name = "injectedJavaScriptForMainFrameOnly")
-    public void setInjectedJavaScriptForMainFrameOnly(RNCWebViewWrapper view, boolean value) {
-        mRNCWebViewManagerImpl.setInjectedJavaScriptForMainFrameOnly(view, value);
-
-    }
-
-    @ReactProp(name = "injectedJavaScriptBeforeContentLoadedForMainFrameOnly")
-    public void setInjectedJavaScriptBeforeContentLoadedForMainFrameOnly(RNCWebViewWrapper view, boolean value) {
-        mRNCWebViewManagerImpl.setInjectedJavaScriptBeforeContentLoadedForMainFrameOnly(view, value);
-
-    }
-
     @ReactProp(name = "injectedJavaScriptObject")
     public void setInjectedJavaScriptObject(RNCWebViewWrapper view, @Nullable String value) {
         mRNCWebViewManagerImpl.setInjectedJavaScriptObject(view, value);
     }
 
-    @ReactProp(name = "javaScriptCanOpenWindowsAutomatically")
-    public void setJavaScriptCanOpenWindowsAutomatically(RNCWebViewWrapper view, boolean value) {
-        mRNCWebViewManagerImpl.setJavaScriptCanOpenWindowsAutomatically(view, value);
-    }
-
     @ReactProp(name = "javaScriptEnabled")
     public void setJavaScriptEnabled(RNCWebViewWrapper view, boolean enabled) {
         mRNCWebViewManagerImpl.setJavaScriptEnabled(view, enabled);
@@ -308,7 +269,6 @@ public class RNCWebViewManager extends ViewGroupManager<RNCWebViewWrapper> {
         export.put(TopLoadingProgressEvent.EVENT_NAME, MapBuilder.of("registrationName", "onLoadingProgress"));
         export.put(TopShouldStartLoadWithRequestEvent.EVENT_NAME, MapBuilder.of("registrationName", "onShouldStartLoadWithRequest"));
         export.put(ScrollEventType.getJSEventName(ScrollEventType.SCROLL), MapBuilder.of("registrationName", "onScroll"));
-        export.put(TopHttpErrorEvent.EVENT_NAME, MapBuilder.of("registrationName", "onHttpError"));
         export.put(TopRenderProcessGoneEvent.EVENT_NAME, MapBuilder.of("registrationName", "onRenderProcessGone"));
         export.put(TopCustomMenuSelectionEvent.EVENT_NAME, MapBuilder.of("registrationName", "onCustomMenuSelection"));
         export.put(TopOpenWindowEvent.EVENT_NAME, MapBuilder.of("registrationName", "onOpenWindow"));

package/apple/RNCWebView.mm

@@ -272,17 +272,11 @@ auto stringToOnLoadingFinishNavigationTypeEnum(std::string value) {
     REMAP_WEBVIEW_PROP(scrollEnabled)
     REMAP_WEBVIEW_STRING_PROP(injectedJavaScript)
     REMAP_WEBVIEW_STRING_PROP(injectedJavaScriptBeforeContentLoaded)
-    REMAP_WEBVIEW_PROP(injectedJavaScriptForMainFrameOnly)
-    REMAP_WEBVIEW_PROP(injectedJavaScriptBeforeContentLoadedForMainFrameOnly)
     REMAP_WEBVIEW_STRING_PROP(injectedJavaScriptObject)
     REMAP_WEBVIEW_PROP(javaScriptEnabled)
-    REMAP_WEBVIEW_PROP(javaScriptCanOpenWindowsAutomatically)
-    REMAP_WEBVIEW_PROP(allowFileAccessFromFileURLs)
-    REMAP_WEBVIEW_PROP(allowUniversalAccessFromFileURLs)
     REMAP_WEBVIEW_PROP(allowsInlineMediaPlayback)
     REMAP_WEBVIEW_PROP(allowsPictureInPictureMediaPlayback)
     REMAP_WEBVIEW_PROP(webviewDebuggingEnabled)
-    REMAP_WEBVIEW_PROP(allowsAirPlayForMediaPlayback)
     REMAP_WEBVIEW_PROP(mediaPlaybackRequiresUserAction)
     REMAP_WEBVIEW_PROP(automaticallyAdjustContentInsets)
     REMAP_WEBVIEW_PROP(autoManageStatusBarEnabled)
@@ -290,10 +284,8 @@ auto stringToOnLoadingFinishNavigationTypeEnum(std::string value) {
     REMAP_WEBVIEW_PROP(allowsBackForwardNavigationGestures)
     REMAP_WEBVIEW_PROP(incognito)
     REMAP_WEBVIEW_PROP(pagingEnabled)
-    REMAP_WEBVIEW_STRING_PROP(applicationNameForUserAgent)
     REMAP_WEBVIEW_PROP(cacheEnabled)
     REMAP_WEBVIEW_PROP(allowsLinkPreview)
-    REMAP_WEBVIEW_STRING_PROP(allowingReadAccessToURL)
     REMAP_WEBVIEW_PROP(messagingEnabled)
     #if !TARGET_OS_OSX
     REMAP_WEBVIEW_PROP(fraudulentWebsiteWarningEnabled)

package/apple/RNCWebViewDecisionManager.m

@@ -33,6 +33,23 @@
         }
 
         [self.decisionHandlers setObject:[decisionHandler copy] forKey:@(lockIdentifier)];
+
+        // Exodus: Deny-by-default timeout
+        // If JS doesn't respond within 500ms, deny the navigation for security.
+        // setResult:forLockIdentifier: removes the handler, so this is a no-op
+        // if JS responded in time.
+        NSInteger capturedIdentifier = lockIdentifier;
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(500 * NSEC_PER_MSEC)), dispatch_get_main_queue(), ^{
+            @synchronized (self) {
+                DecisionBlock pendingHandler = [self.decisionHandlers objectForKey:@(capturedIdentifier)];
+                if (pendingHandler != nil) {
+                    RCTLogWarn(@"Navigation decision timeout for lock %ld, denying by default", (long)capturedIdentifier);
+                    pendingHandler(NO);
+                    [self.decisionHandlers removeObjectForKey:@(capturedIdentifier)];
+                }
+            }
+        });
+
         return lockIdentifier;
     }
 }

package/apple/RNCWebViewImpl.h

@@ -53,13 +53,11 @@ shouldStartLoadForRequest:(NSMutableDictionary<NSString *, id> *)request
 #endif // !TARGET_OS_OSX
 
 
-@property (nonatomic, copy) RCTDirectEventBlock onFileDownload;
 @property (nonatomic, copy) RCTDirectEventBlock onLoadingStart;
 @property (nonatomic, copy) RCTDirectEventBlock onLoadingFinish;
 @property (nonatomic, copy) RCTDirectEventBlock onLoadingError;
 @property (nonatomic, copy) RCTDirectEventBlock onLoadingProgress;
 @property (nonatomic, copy) RCTDirectEventBlock onShouldStartLoadWithRequest;
-@property (nonatomic, copy) RCTDirectEventBlock onHttpError;
 @property (nonatomic, copy) RCTDirectEventBlock onMessage;
 @property (nonatomic, copy) RCTDirectEventBlock onScroll;
 @property (nonatomic, copy) RCTDirectEventBlock onContentProcessDidTerminate;
@@ -71,8 +69,6 @@ shouldStartLoadForRequest:(NSMutableDictionary<NSString *, id> *)request
 @property (nonatomic, assign) BOOL messagingEnabled;
 @property (nonatomic, copy) NSString * _Nullable injectedJavaScript;
 @property (nonatomic, copy) NSString * _Nullable injectedJavaScriptBeforeContentLoaded;
-@property (nonatomic, assign) BOOL injectedJavaScriptForMainFrameOnly;
-@property (nonatomic, assign) BOOL injectedJavaScriptBeforeContentLoadedForMainFrameOnly;
 @property (nonatomic, copy) NSString * _Nullable injectedJavaScriptObject;
 @property (nonatomic, assign) BOOL scrollEnabled;
 @property (nonatomic, assign) BOOL sharedCookiesEnabled;
@@ -82,7 +78,6 @@ shouldStartLoadForRequest:(NSMutableDictionary<NSString *, id> *)request
 @property (nonatomic, assign) BOOL allowsInlineMediaPlayback;
 @property (nonatomic, assign) BOOL allowsPictureInPictureMediaPlayback;
 @property (nonatomic, assign) BOOL webviewDebuggingEnabled;
-@property (nonatomic, assign) BOOL allowsAirPlayForMediaPlayback;
 @property (nonatomic, assign) BOOL bounces;
 @property (nonatomic, assign) BOOL mediaPlaybackRequiresUserAction;
 @property (nonatomic, assign) UIEdgeInsets contentInset;
@@ -93,19 +88,14 @@ shouldStartLoadForRequest:(NSMutableDictionary<NSString *, id> *)request
 @property (nonatomic, assign) BOOL incognito;
 @property (nonatomic, assign) BOOL useSharedProcessPool;
 @property (nonatomic, copy) NSString * _Nullable userAgent;
-@property (nonatomic, copy) NSString * _Nullable applicationNameForUserAgent;
 @property (nonatomic, assign) BOOL cacheEnabled;
 @property (nonatomic, assign) BOOL javaScriptEnabled;
-@property (nonatomic, assign) BOOL javaScriptCanOpenWindowsAutomatically;
-@property (nonatomic, assign) BOOL allowFileAccessFromFileURLs;
-@property (nonatomic, assign) BOOL allowUniversalAccessFromFileURLs;
 @property (nonatomic, assign) BOOL allowsLinkPreview;
 @property (nonatomic, assign) BOOL showsHorizontalScrollIndicator;
 @property (nonatomic, assign) BOOL showsVerticalScrollIndicator;
 @property (nonatomic, copy) NSString * _Nullable indicatorStyle;
 @property (nonatomic, assign) BOOL directionalLockEnabled;
 @property (nonatomic, assign) BOOL ignoreSilentHardwareSwitch;
-@property (nonatomic, copy) NSString * _Nullable allowingReadAccessToURL;
 @property (nonatomic, copy) NSDictionary * _Nullable basicAuthCredential;
 @property (nonatomic, assign) BOOL pullToRefreshEnabled;
 @property (nonatomic, assign) BOOL refreshControlLightMode;