Merge pull request #19570 from wordpress-mobile/issue/19501-limit-details-navigation

🤖 Prevent navigation outside the domain details webview

Author: antonis

WordPress/src/main/AndroidManifest.xml

@@ -804,7 +804,7 @@
             android:theme="@style/WordPress.NoActionBar" />
 
         <activity
-            android:name=".ui.domains.management.DomainManagementDetailsActivity"
+            android:name=".ui.domains.management.details.DomainManagementDetailsActivity"
             android:theme="@style/WordPress.NoActionBar" />
         <activity
             android:name=".ui.domains.management.purchasedomain.PurchaseDomainActivity"

WordPress/src/main/java/org/wordpress/android/ui/blaze/blazecampaigns/campaigndetail/CampaignDetailWebViewNavigationDelegate.kt

@@ -1,29 +1,14 @@
 package org.wordpress.android.ui.blaze.blazecampaigns.campaigndetail
 
-import android.net.Uri
+import org.wordpress.android.ui.utils.AbstractAllowedUrlsWebViewNavigationDelegate
 
-object CampaignDetailWebViewNavigationDelegate {
-    private val allowedUrls = listOf(
+object CampaignDetailWebViewNavigationDelegate : AbstractAllowedUrlsWebViewNavigationDelegate() {
+    override val allowedUrls = listOf(
         UrlMatcher(
             "wordpress.com".toRegex(),
             listOf(
                 "/advertising/campaigns/\\d+/[a-zA-Z0-9.-]+\$".toRegex()
             )
         )
     )
-
-    fun canNavigateTo(url: Url) = allowedUrls.any { it.matches(url) }
-
-    data class UrlMatcher(
-        private val host: Regex,
-        private val paths: List<Regex>
-    ) {
-        private fun matchesHost(url: Url) = url.host.matches(host)
-        private fun matchesPath(url: Url) = paths.any { url.path.matches(it) }
-        fun matches(url: Url) = matchesHost(url) && matchesPath(url)
-    }
-
-    data class Url(val host: String, val path: String)
-
-    fun Uri.toUrl() = Url(host.orEmpty(), path.orEmpty())
 }

WordPress/src/main/java/org/wordpress/android/ui/domains/DomainRegistrationCheckoutWebViewNavigationDelegate.kt

@@ -1,10 +1,11 @@
 package org.wordpress.android.ui.domains
 
-import android.net.Uri
+import org.wordpress.android.ui.utils.AbstractAllowedUrlsWebViewNavigationDelegate
 
-object DomainRegistrationCheckoutWebViewNavigationDelegate {
+object DomainRegistrationCheckoutWebViewNavigationDelegate : AbstractAllowedUrlsWebViewNavigationDelegate() {
     private val optionalLanguagePath = "(?:/(?:\\w{2}-)?\\w{2})?".toRegex()
-    private val allowedUrls = listOf(
+
+    override val allowedUrls = listOf(
         UrlMatcher(
             ".*wordpress.com".toRegex(),
             listOf(
@@ -17,19 +18,4 @@ object DomainRegistrationCheckoutWebViewNavigationDelegate {
             )
         )
     )
-
-    fun canNavigateTo(url: Url) = allowedUrls.any { it.matches(url) }
-
-    data class UrlMatcher(
-        private val host: Regex,
-        private val paths: List<Regex>
-    ) {
-        private fun matchesHost(url: Url) = url.host.matches(host)
-        private fun matchesPath(url: Url) = paths.any { url.path.matches(it) }
-        fun matches(url: Url) = matchesHost(url) && matchesPath(url)
-    }
-
-    data class Url(val host: String, val path: String)
-
-    fun Uri.toUrl() = Url(host.orEmpty(), path.orEmpty())
 }

WordPress/src/main/java/org/wordpress/android/ui/domains/management/DomainManagementActivity.kt

@@ -10,6 +10,7 @@ import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import org.wordpress.android.ui.ActivityLauncher
+import org.wordpress.android.ui.domains.management.details.DomainManagementDetailsActivity
 import org.wordpress.android.util.extensions.setContent
 
 @AndroidEntryPoint

…ement/DomainManagementDetailsActivity.kt …tails/DomainManagementDetailsActivity.ktWordPress/src/main/java/org/wordpress/android/ui/domains/management/DomainManagementDetailsActivity.kt renamed to WordPress/src/main/java/org/wordpress/android/ui/domains/management/details/DomainManagementDetailsActivity.kt WordPress/src/main/java/org/wordpress/android/ui/domains/management/DomainManagementDetailsActivity.kt renamed to WordPress/src/main/java/org/wordpress/android/ui/domains/management/details/DomainManagementDetailsActivity.kt

@@ -1,12 +1,14 @@
-package org.wordpress.android.ui.domains.management
+package org.wordpress.android.ui.domains.management.details
 
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.view.Menu
+import org.wordpress.android.ui.ActivityLauncher
 import org.wordpress.android.ui.WPWebViewActivity
 
-class DomainManagementDetailsActivity : WPWebViewActivity() {
+class DomainManagementDetailsActivity : WPWebViewActivity(),
+    DomainManagementDetailsWebViewClient.DomainManagementWebViewClientListener {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         toggleNavbarVisibility(false)
@@ -17,6 +19,12 @@ class DomainManagementDetailsActivity : WPWebViewActivity() {
         return true
     }
 
+    override fun createWebViewClient(allowedURL: List<String>?) = DomainManagementDetailsWebViewClient(this)
+
+    override fun onRedirectToExternalBrowser(url: String) {
+        ActivityLauncher.openUrlExternal(this, url)
+    }
+
     companion object {
         fun createIntent(context: Context, domainDetailUrl: String): Intent =
             Intent(context, DomainManagementDetailsActivity::class.java).apply {

WordPress/src/main/java/org/wordpress/android/ui/domains/management/details/DomainManagementDetailsWebViewClient.kt

@@ -0,0 +1,22 @@
+package org.wordpress.android.ui.domains.management.details
+
+import android.webkit.WebResourceRequest
+import android.webkit.WebView
+import org.wordpress.android.ui.domains.management.details.DomainManagementDetailsWebViewNavigationDelegate.toUrl
+import org.wordpress.android.util.ErrorManagedWebViewClient
+
+class DomainManagementDetailsWebViewClient(
+    private val listener: DomainManagementWebViewClientListener
+) : ErrorManagedWebViewClient(listener) {
+    private val navigationDelegate = DomainManagementDetailsWebViewNavigationDelegate
+
+    interface DomainManagementWebViewClientListener : ErrorManagedWebViewClientListener {
+        fun onRedirectToExternalBrowser(url: String)
+    }
+
+    override fun shouldOverrideUrlLoading(view: WebView, request: WebResourceRequest) : Boolean {
+        if (navigationDelegate.canNavigateTo(request.url.toUrl())) return false
+        listener.onRedirectToExternalBrowser(request.url.toString())
+        return true
+    }
+}

WordPress/src/main/java/org/wordpress/android/ui/domains/management/details/DomainManagementDetailsWebViewNavigationDelegate.kt

@@ -0,0 +1,12 @@
+package org.wordpress.android.ui.domains.management.details
+
+import org.wordpress.android.ui.utils.AbstractAllowedUrlsWebViewNavigationDelegate
+
+object DomainManagementDetailsWebViewNavigationDelegate: AbstractAllowedUrlsWebViewNavigationDelegate() {
+    override val allowedUrls = listOf(
+        UrlMatcher(
+            "wordpress.com".toRegex(),
+            listOf("/domains.*".toRegex())
+        )
+    )
+}

WordPress/src/main/java/org/wordpress/android/ui/utils/AbstractAllowedUrlsWebViewNavigationDelegate.kt

@@ -0,0 +1,22 @@
+package org.wordpress.android.ui.utils
+
+import android.net.Uri
+
+abstract class AbstractAllowedUrlsWebViewNavigationDelegate {
+    abstract val allowedUrls: List<UrlMatcher>
+
+    fun canNavigateTo(url: Url) = allowedUrls.any { it.matches(url) }
+
+    data class UrlMatcher(
+        private val host: Regex,
+        private val paths: List<Regex>
+    ) {
+        private fun matchesHost(url: Url) = url.host.matches(host)
+        private fun matchesPath(url: Url) = paths.any { url.path.matches(it) }
+        fun matches(url: Url) = matchesHost(url) && matchesPath(url)
+    }
+
+    data class Url(val host: String, val path: String)
+
+    fun Uri.toUrl() = Url(host.orEmpty(), path.orEmpty())
+}

WordPress/src/test/java/org/wordpress/android/ui/blaze/blazecampaigns/CampaignDetailWebViewNavigationDelegateTest.kt

@@ -5,7 +5,7 @@ import org.assertj.core.api.Assertions.assertThat
 import org.junit.Test
 import org.wordpress.android.BaseUnitTest
 import org.wordpress.android.ui.blaze.blazecampaigns.campaigndetail.CampaignDetailWebViewNavigationDelegate
-import org.wordpress.android.ui.blaze.blazecampaigns.campaigndetail.CampaignDetailWebViewNavigationDelegate.Url
+import org.wordpress.android.ui.utils.AbstractAllowedUrlsWebViewNavigationDelegate.Url
 
 @ExperimentalCoroutinesApi
 class CampaignDetailWebViewNavigationDelegateTest : BaseUnitTest() {

WordPress/src/test/java/org/wordpress/android/ui/domains/DomainRegistrationCheckoutWebViewNavigationDelegateTest.kt

@@ -4,7 +4,7 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Test
 import org.wordpress.android.BaseUnitTest
-import org.wordpress.android.ui.domains.DomainRegistrationCheckoutWebViewNavigationDelegate.Url
+import org.wordpress.android.ui.utils.AbstractAllowedUrlsWebViewNavigationDelegate.Url
 
 @ExperimentalCoroutinesApi
 class DomainRegistrationCheckoutWebViewNavigationDelegateTest : BaseUnitTest() {