fix(android): Validate url from Android platform

Author: jdnichollsc

CHANGELOG.md

@@ -22,6 +22,10 @@ in case of vulnerabilities.
 
 ## [Unreleased]
 
+## [3.6.1] - 2021-06-27
+
+- Add try catch block to `CustomTabs` logic to validate the url.
+
 ## [3.6.0] - 2021-06-25
 
 ### Added
@@ -187,7 +191,8 @@ Missing tags for previous versions 🤷‍♂
 - Fix `EventBusException` on **Android** by [@Almouro](https://github.com/Almouro) ([9cf4cbb](https://github.com/proyecto26/react-native-inappbrowser/commit/9cf4cbb58d55c8b534dabac6791e6a2a5428253f)).
 
 
-[Unreleased]: https://github.com/proyecto26/react-native-inappbrowser/compare/v3.6.0...HEAD
+[Unreleased]: https://github.com/proyecto26/react-native-inappbrowser/compare/v3.6.1...HEAD
+[3.6.1]: https://github.com/proyecto26/react-native-inappbrowser/compare/v3.6.0...v3.6.1
 [3.6.0]: https://github.com/proyecto26/react-native-inappbrowser/compare/v3.5.1...v3.6.0
 [3.5.1]: https://github.com/proyecto26/react-native-inappbrowser/compare/v3.5.0...v3.5.1
 [3.5.0]: https://github.com/proyecto26/react-native-inappbrowser/compare/v3.4.0...v3.5.0

android/src/main/java/com/proyecto26/inappbrowser/ChromeTabsDismissedEvent.java

@@ -3,9 +3,11 @@
 public class ChromeTabsDismissedEvent {
   public final String message;
   public final String resultType;
+  public final Boolean isError;
 
-  public ChromeTabsDismissedEvent(String message, String resultType) {
+  public ChromeTabsDismissedEvent(String message, String resultType, Boolean isError) {
     this.message = message;
     this.resultType = resultType;
+    this.isError = isError;
   }
 }

android/src/main/java/com/proyecto26/inappbrowser/ChromeTabsManagerActivity.java

@@ -39,20 +39,26 @@ private static Intent createBaseIntent(Context context) {
 
   @Override
   protected void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
+    try {
+      super.onCreate(savedInstanceState);
 
-    // This activity gets opened in 2 different ways. If the extra KEY_BROWSER_INTENT is present we
-    // start that intent and if it is not it means this activity was started with FLAG_ACTIVITY_CLEAR_TOP
-    // in order to close the intent that was started previously so we just close this.
-    if (getIntent().hasExtra(KEY_BROWSER_INTENT)
-      && (savedInstanceState == null || savedInstanceState.getString(BROWSER_RESULT_TYPE) == null)
-    ) {
-      Intent browserIntent = getIntent().getParcelableExtra(KEY_BROWSER_INTENT);
-      browserIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-      startActivity(browserIntent);
-      resultType = DEFAULT_RESULT_TYPE;
-    } else {
+      // This activity gets opened in 2 different ways. If the extra KEY_BROWSER_INTENT is present we
+      // start that intent and if it is not it means this activity was started with FLAG_ACTIVITY_CLEAR_TOP
+      // in order to close the intent that was started previously so we just close this.
+      if (getIntent().hasExtra(KEY_BROWSER_INTENT)
+        && (savedInstanceState == null || savedInstanceState.getString(BROWSER_RESULT_TYPE) == null)
+      ) {
+        Intent browserIntent = getIntent().getParcelableExtra(KEY_BROWSER_INTENT);
+        browserIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        startActivity(browserIntent);
+        resultType = DEFAULT_RESULT_TYPE;
+      } else {
+        finish();
+      }
+    } catch (Exception e) {
+      EventBus.getDefault().post(new ChromeTabsDismissedEvent("Unable to open url.", "cancel", true));
       finish();
+      e.printStackTrace();
     }
   }
 
@@ -76,10 +82,10 @@ protected void onDestroy() {
     if (resultType != null) {
       switch (resultType) {
         case "cancel":
-          EventBus.getDefault().post(new ChromeTabsDismissedEvent("chrome tabs activity closed", resultType));
+          EventBus.getDefault().post(new ChromeTabsDismissedEvent("chrome tabs activity closed", resultType, false));
           break;
         default:
-          EventBus.getDefault().post(new ChromeTabsDismissedEvent("chrome tabs activity destroyed", DEFAULT_RESULT_TYPE));
+          EventBus.getDefault().post(new ChromeTabsDismissedEvent("chrome tabs activity destroyed", DEFAULT_RESULT_TYPE, false));
           break;
       }
       resultType = null;

android/src/main/java/com/proyecto26/inappbrowser/RNInAppBrowser.java

@@ -238,9 +238,13 @@ public void onEvent(ChromeTabsDismissedEvent event) {
       throw new AssertionError();
     }
 
-    WritableMap result = Arguments.createMap();
-    result.putString("type", event.resultType);
-    mOpenBrowserPromise.resolve(result);
+    if (event.isError) {
+      mOpenBrowserPromise.reject(ERROR_CODE, event.message);
+    } else {
+      WritableMap result = Arguments.createMap();
+      result.putString("type", event.resultType);
+      mOpenBrowserPromise.resolve(result);
+    }
     mOpenBrowserPromise = null;
   }
 

example/.gitignore

@@ -57,3 +57,5 @@ buck-out/
 
 # CocoaPods
 /ios/Pods/
+
+yarn.lock

example/App.js

@@ -37,7 +37,7 @@ export default class App extends Component<ComponentState> {
     super(props);
 
     this.state = {
-      url: 'https://www.proyecto26.com',
+      url: 'https://reactnative.dev',
       statusBarStyle: 'dark-content',
     };
   }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-inappbrowser-reborn",
-  "version": "3.6.0",
+  "version": "3.6.1",
   "description": "InAppBrowser for React Native",
   "main": "index.js",
   "scripts": {