chore: sync plus with upstream main (upstream-preferred conflicts) #130
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <manifest xmlns:android="http://schemas.android.com/apk/res/android"> | ||
|
|
||
| <application> | ||
| <activity | ||
| android:name="com.getcapacitor.android.TestHostActivity" | ||
| android:theme="@style/AppTheme.NoActionBar" | ||
| android:exported="false" /> | ||
| </application> | ||
| </manifest> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,115 @@ | ||
| package com.getcapacitor.android; | ||
|
|
||
| import static org.junit.Assert.assertFalse; | ||
| import static org.junit.Assert.assertNotNull; | ||
| import static org.junit.Assert.assertNull; | ||
| import static org.junit.Assert.assertTrue; | ||
|
|
||
| import android.net.Uri; | ||
| import android.webkit.WebResourceRequest; | ||
| import androidx.test.core.app.ActivityScenario; | ||
| import androidx.test.ext.junit.runners.AndroidJUnit4; | ||
| import com.getcapacitor.Bridge; | ||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
| import org.junit.Test; | ||
| import org.junit.runner.RunWith; | ||
|
|
||
| /** | ||
| * The proxy path shares the app's host and scheme, so the host/scheme guard alone would let it | ||
| * load in the WebView. | ||
| */ | ||
| @RunWith(AndroidJUnit4.class) | ||
| public class HttpInterceptorNavigationTest { | ||
|
|
||
| private static final String INTERCEPTOR_URL = | ||
| "https://localhost" + Bridge.CAPACITOR_HTTP_INTERCEPTOR_START + "?u=https://example.com/payload.html"; | ||
| private static final String IN_APP_URL = "https://localhost/index.html"; | ||
| private static final String EXTERNAL_URL = "https://example.com/"; | ||
|
|
||
| /** A plugin registered by the test host returns "allow" for the proxy path; it must not win. */ | ||
| @Test | ||
| public void blocksNavigationToInterceptorPath() { | ||
| try (ActivityScenario<TestHostActivity> scenario = ActivityScenario.launch(TestHostActivity.class)) { | ||
| scenario.onActivity((activity) -> { | ||
| Bridge bridge = activity.getBridge(); | ||
| assertNotNull(bridge); | ||
| assertTrue("interceptor navigation must be blocked", bridge.launchIntent(Uri.parse(INTERCEPTOR_URL))); | ||
| assertFalse("in-app navigation must stay in the WebView", bridge.launchIntent(Uri.parse(IN_APP_URL))); | ||
| assertTrue("external navigation must leave the WebView", bridge.launchIntent(Uri.parse(EXTERNAL_URL))); | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| /** An iframe looks like a fetch to isForMainFrame(), so subframe documents must be refused too. */ | ||
| @Test | ||
| public void refusesProxyForDocumentRequests() { | ||
| try (ActivityScenario<TestHostActivity> scenario = ActivityScenario.launch(TestHostActivity.class)) { | ||
| scenario.onActivity((activity) -> { | ||
| Bridge bridge = activity.getBridge(); | ||
| assertNotNull(bridge); | ||
| // Without this the proxy refuses everything and the assertions below prove nothing. | ||
| assertTrue( | ||
| "CapacitorHttp must be enabled for this test to mean anything", | ||
| bridge.getConfig().getPluginConfiguration("CapacitorHttp").getBoolean("enabled", false) | ||
| ); | ||
|
|
||
| Map<String, String> navHeaders = new HashMap<>(); | ||
| navHeaders.put("Accept", "text/html,application/xhtml+xml"); | ||
| navHeaders.put("Upgrade-Insecure-Requests", "1"); | ||
|
|
||
| assertNull( | ||
| "main frame document must be refused", | ||
| bridge.getLocalServer().shouldInterceptRequest(new FakeRequest(INTERCEPTOR_URL, true, navHeaders)) | ||
| ); | ||
| assertNull( | ||
| "iframe document must be refused", | ||
| bridge.getLocalServer().shouldInterceptRequest(new FakeRequest(INTERCEPTOR_URL, false, navHeaders)) | ||
| ); | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| private static class FakeRequest implements WebResourceRequest { | ||
|
|
||
| private final Uri url; | ||
| private final boolean mainFrame; | ||
| private final Map<String, String> headers; | ||
|
|
||
| FakeRequest(String url, boolean mainFrame, Map<String, String> headers) { | ||
| this.url = Uri.parse(url); | ||
| this.mainFrame = mainFrame; | ||
| this.headers = headers; | ||
| } | ||
|
|
||
| @Override | ||
| public Uri getUrl() { | ||
| return url; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isForMainFrame() { | ||
| return mainFrame; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isRedirect() { | ||
| return false; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean hasGesture() { | ||
| return false; | ||
| } | ||
|
|
||
| @Override | ||
| public String getMethod() { | ||
| return "GET"; | ||
| } | ||
|
|
||
| @Override | ||
| public Map<String, String> getRequestHeaders() { | ||
| return headers; | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| package com.getcapacitor.android; | ||
|
|
||
| import android.net.Uri; | ||
| import com.getcapacitor.Bridge; | ||
| import com.getcapacitor.Plugin; | ||
| import com.getcapacitor.annotation.CapacitorPlugin; | ||
|
|
||
| /** A plugin that tries to allow the proxy path. The navigation guard must ignore it. */ | ||
| @CapacitorPlugin(name = "InterceptorAllowingPlugin") | ||
| public class InterceptorAllowingPlugin extends Plugin { | ||
|
|
||
| @Override | ||
| public Boolean shouldOverrideLoad(Uri url) { | ||
| String path = url.getPath(); | ||
| if (path != null && path.startsWith(Bridge.CAPACITOR_HTTP_INTERCEPTOR_START)) { | ||
| return false; // "allow this navigation" | ||
| } | ||
| return null; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| package com.getcapacitor.android; | ||
|
|
||
| import com.getcapacitor.BridgeActivity; | ||
| import com.getcapacitor.CapConfig; | ||
| import org.json.JSONException; | ||
| import org.json.JSONObject; | ||
|
|
||
| /** | ||
| * Host for instrumented tests. CapacitorHttp is on so the proxy is reachable, and a plugin that | ||
| * tries to allow the proxy path is registered so tests can prove the guard still wins. | ||
| */ | ||
| public class TestHostActivity extends BridgeActivity { | ||
|
|
||
| @Override | ||
| protected void load() { | ||
| registerPlugin(InterceptorAllowingPlugin.class); | ||
|
|
||
| try { | ||
| JSONObject plugins = new JSONObject("{\"CapacitorHttp\":{\"enabled\":true}}"); | ||
| config = new CapConfig.Builder(this).setPluginsConfiguration(plugins).create(); | ||
| } catch (JSONException e) { | ||
| throw new IllegalStateException("bad test plugin config", e); | ||
| } | ||
|
|
||
| super.load(); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
P3: The merge removed the fork's own 8.5.1 and 8.5.2 release entries from the changelog top and replaced them with the upstream 8.5.1 entry. Those Cap-go entries documented plus-exclusive changes (the CI fixes in #109 and #110) that have no upstream equivalent, so after this merge a reader checking what the fork published in 8.5.1/8.5.2 finds nothing. This follows from the upstream-preferred strategy, but confirm the silent drop of plus-only release documentation is intended; if not, keep the Cap-go 8.5.1/8.5.2 sections alongside the upstream one.
Prompt for AI agents