Repository navigation
Runtime Custom CSS JavaScript and cookie persistence #19
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,47 @@ | ||
| package de.starlightunit.wrapper.session; | ||
|
|
||
| import android.webkit.CookieManager; | ||
|
|
||
| import java.util.Locale; | ||
|
|
||
| public final class CookiePersistencePolicy { | ||
| public static final String MODE_PERSISTENT = "persistent"; | ||
| public static final String MODE_SERVER = "server"; | ||
| public static final String MODE_SESSION = "session"; | ||
|
|
||
| private CookiePersistencePolicy() { | ||
| } | ||
|
|
||
| public static String normalize(String configuredMode) { | ||
| String mode = configuredMode == null | ||
| ? "" | ||
| : configuredMode.trim().toLowerCase(Locale.ROOT); | ||
| switch (mode) { | ||
| case MODE_SERVER: | ||
| case MODE_SESSION: | ||
| case MODE_PERSISTENT: | ||
| return mode; | ||
| case "default": | ||
| case "": | ||
| default: | ||
| // Legacy Quantum builds always persisted trusted-origin session | ||
| // cookies. Keep that behavior unless a profile explicitly opts | ||
| // into server defaults or session-only mode. | ||
| return MODE_PERSISTENT; | ||
| } | ||
| } | ||
|
|
||
| public static boolean usesEncryptedPersistence(String configuredMode) { | ||
| return MODE_PERSISTENT.equals(normalize(configuredMode)); | ||
| } | ||
|
|
||
| public static boolean startsFreshSession(String configuredMode) { | ||
| return MODE_SESSION.equals(normalize(configuredMode)); | ||
| } | ||
|
|
||
| public static void clearForFreshSession() { | ||
| CookieManager cookies = CookieManager.getInstance(); | ||
| cookies.removeAllCookies(null); | ||
|
There was a problem hiding this comment.
When Useful? React with 👍 / 👎. |
||
| cookies.flush(); | ||
| } | ||
| } | ||
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,46 @@ | ||
| package de.starlightunit.wrapper.web; | ||
|
|
||
| import android.webkit.WebView; | ||
|
|
||
| import org.json.JSONObject; | ||
|
|
||
| import de.starlightunit.wrapper.config.AppConfig; | ||
|
|
||
| /** | ||
| * Applies profile-provided CSS and JavaScript only after the caller has | ||
| * confirmed that the current page belongs to the trusted app origin. | ||
| */ | ||
| public final class WebOverrides { | ||
| private static final String STYLE_ELEMENT_ID = "quantum-profile-custom-css"; | ||
|
|
||
| private WebOverrides() { | ||
| } | ||
|
|
||
| public static void apply(WebView webView) { | ||
| String css = AppConfig.CUSTOM_CSS; | ||
| if (css != null && !css.trim().isEmpty()) { | ||
| webView.evaluateJavascript(cssInjectionScript(css), null); | ||
| } | ||
|
|
||
| String javascript = AppConfig.CUSTOM_JAVASCRIPT; | ||
| if (javascript != null && !javascript.trim().isEmpty()) { | ||
| webView.evaluateJavascript(javascriptInjectionScript(javascript), null); | ||
| } | ||
| } | ||
|
|
||
| static String cssInjectionScript(String css) { | ||
| String quotedCss = JSONObject.quote(css == null ? "" : css); | ||
| return "(function(){" | ||
| + "var d=document;" | ||
| + "var s=d.getElementById('" + STYLE_ELEMENT_ID + "');" | ||
| + "if(!s){s=d.createElement('style');s.id='" + STYLE_ELEMENT_ID + "';" | ||
| + "(d.head||d.documentElement).appendChild(s);}" | ||
| + "s.textContent=" + quotedCss + ";" | ||
| + "})();"; | ||
| } | ||
|
|
||
| static String javascriptInjectionScript(String javascript) { | ||
| String source = javascript == null ? "" : javascript; | ||
| return source + "\n//# sourceURL=quantum-profile-custom.js"; | ||
| } | ||
| } |
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,29 @@ | ||
| package de.starlightunit.wrapper.session; | ||
|
|
||
| import org.junit.Test; | ||
|
|
||
| import static org.junit.Assert.assertEquals; | ||
| import static org.junit.Assert.assertFalse; | ||
| import static org.junit.Assert.assertTrue; | ||
|
|
||
| public final class CookiePersistencePolicyTest { | ||
|
|
||
| @Test | ||
| public void persistentIsDefaultAndLegacyDefaultRemainsPersistent() { | ||
| assertEquals("persistent", CookiePersistencePolicy.normalize(null)); | ||
| assertEquals("persistent", CookiePersistencePolicy.normalize("")); | ||
| assertEquals("persistent", CookiePersistencePolicy.normalize("default")); | ||
| assertTrue(CookiePersistencePolicy.usesEncryptedPersistence("persistent")); | ||
| assertTrue(CookiePersistencePolicy.usesEncryptedPersistence("default")); | ||
| } | ||
|
|
||
| @Test | ||
| public void serverAndSessionModesRemainDistinct() { | ||
| assertEquals("server", CookiePersistencePolicy.normalize("server")); | ||
| assertEquals("session", CookiePersistencePolicy.normalize("session")); | ||
| assertFalse(CookiePersistencePolicy.usesEncryptedPersistence("server")); | ||
| assertFalse(CookiePersistencePolicy.usesEncryptedPersistence("session")); | ||
| assertTrue(CookiePersistencePolicy.startsFreshSession("session")); | ||
| assertFalse(CookiePersistencePolicy.startsFreshSession("server")); | ||
| } | ||
| } |
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,30 @@ | ||
| package de.starlightunit.wrapper.web; | ||
|
|
||
| import org.junit.Test; | ||
|
|
||
| import static org.junit.Assert.assertEquals; | ||
| import static org.junit.Assert.assertTrue; | ||
|
|
||
| public final class WebOverridesTest { | ||
|
|
||
| @Test | ||
| public void cssInjectionEscapesContentAndUsesStableStyleElement() { | ||
| String script = WebOverrides.cssInjectionScript("body { color: red; }\n.x { display: block; }"); | ||
| assertTrue(script.contains("quantum-profile-custom-css")); | ||
| assertTrue(script.contains("body { color: red; }\\n.x { display: block; }")); | ||
| assertTrue(script.contains("s.textContent=")); | ||
| } | ||
|
|
||
| @Test | ||
| public void javascriptInjectionPreservesSourceAndAddsDebugSourceName() { | ||
| String source = "window.quantumTest = (window.quantumTest || 0) + 1;"; | ||
| String script = WebOverrides.javascriptInjectionScript(source); | ||
| assertTrue(script.startsWith(source)); | ||
| assertTrue(script.endsWith("//# sourceURL=quantum-profile-custom.js")); | ||
| } | ||
|
|
||
| @Test | ||
| public void nullJavascriptStillProducesValidDebugSource() { | ||
| assertEquals("\n//# sourceURL=quantum-profile-custom.js", WebOverrides.javascriptInjectionScript(null)); | ||
| } | ||
| } |
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.
When Android kills the app in the background and later recreates this Activity, it supplies a non-null
savedInstanceStateeven though a new app process and cookie session have started. Insessionmode this condition therefore skips the fresh-session clear; any server-persistent authentication cookie remains available whilerestoreState()resumes the prior page, defeating session-only behavior after a common process-death restore. Session initialization must distinguish a new process from an in-process Activity recreation rather than relying solely onsavedInstanceState.Useful? React with 👍 / 👎.