Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changeset/quote-injected-object-json.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@phantom/react-native-webview": patch
---

Quote `injectedJavaScriptObject` JSON as a JavaScript string on Android and
Apple platforms. This preserves nested JSON and control characters while
preventing template-literal interpolation from executing injected code.
2 changes: 2 additions & 0 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -107,4 +107,6 @@ dependencies {
implementation 'com.facebook.react:react-native:+'
implementation "org.jetbrains.kotlin:kotlin-stdlib:${safeExtGet('kotlinVersion')}"
implementation "androidx.webkit:webkit:${safeExtGet('webkitVersion')}"

testImplementation "junit:junit:4.13.2"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
package com.reactnativecommunity.webview;

final class RNCJavaScriptString {
private static final char[] HEX = "0123456789abcdef".toCharArray();

private RNCJavaScriptString() {}

static String quote(String value) {
if (value == null) {
return "null";
}

StringBuilder quoted = new StringBuilder(value.length() + 2);
quoted.append('"');
for (int index = 0; index < value.length(); index += 1) {
char character = value.charAt(index);
switch (character) {
case '"':
quoted.append("\\\"");
break;
case '\\':
quoted.append("\\\\");
break;
case '\b':
quoted.append("\\b");
break;
case '\f':
quoted.append("\\f");
break;
case '\n':
quoted.append("\\n");
break;
case '\r':
quoted.append("\\r");
break;
case '\t':
quoted.append("\\t");
break;
default:
if (character <= 0x1f || character == '\u2028' || character == '\u2029') {
appendUnicodeEscape(quoted, character);
} else {
quoted.append(character);
}
}
}
return quoted.append('"').toString();
}

private static void appendUnicodeEscape(StringBuilder output, char character) {
output.append("\\u");
output.append(HEX[(character >> 12) & 0xf]);
output.append(HEX[(character >> 8) & 0xf]);
output.append(HEX[(character >> 4) & 0xf]);
output.append(HEX[character & 0xf]);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -303,9 +303,10 @@ public void onPostMessage(@NonNull WebView view, @NonNull WebMessageCompat messa

private void injectJavascriptObject() {
if (getSettings().getJavaScriptEnabled()) {
String objectJson = RNCJavaScriptString.quote(injectedJavaScriptObject);
String js = "(function(){\n" +
" window." + JAVASCRIPT_INTERFACE + " = window." + JAVASCRIPT_INTERFACE + " || {};\n" +
" window." + JAVASCRIPT_INTERFACE + ".injectedObjectJson = function () { return " + (injectedJavaScriptObject == null ? null : ("`" + injectedJavaScriptObject + "`")) + "; };\n" +
" window." + JAVASCRIPT_INTERFACE + ".injectedObjectJson = function () { return " + objectJson + "; };\n" +
"})();";
evaluateJavascriptWithFallback(js);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package com.reactnativecommunity.webview;

import static org.junit.Assert.assertEquals;

import org.junit.Test;

public class RNCJavaScriptStringTest {
@Test
public void quotesTemplateLiteralInjectionCharacters() {
assertEquals(
"\"`${alert(1)}`;globalThis.pwned=true;//\"",
RNCJavaScriptString.quote("`${alert(1)}`;globalThis.pwned=true;//")
);
}

@Test
public void preservesNestedJsonEscapes() {
assertEquals(
"\"{\\\"state\\\":\\\"{\\\\\\\"key\\\\\\\":\\\\\\\"value\\\\\\\"}\\\"}\"",
RNCJavaScriptString.quote("{\"state\":\"{\\\"key\\\":\\\"value\\\"}\"}")
);
}

@Test
public void escapesControlAndLineSeparatorCharacters() {
assertEquals(
"\"line\\nnext\\tvalue\\u0000\\u2028\\u2029\"",
RNCJavaScriptString.quote("line\nnext\tvalue\u0000\u2028\u2029")
);
}

@Test
public void returnsJavaScriptNullForNull() {
assertEquals("null", RNCJavaScriptString.quote(null));
}
}
27 changes: 25 additions & 2 deletions apple/RNCWebViewImpl.m
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,28 @@

NSString *const CUSTOM_SELECTOR = @"_CUSTOM_SELECTOR_";

static NSString *RNCJavaScriptStringLiteral(NSString *value)
{
if (value == nil) {
return @"null";
}

NSError *error = nil;
NSData *serialized = [NSJSONSerialization dataWithJSONObject:@[value] options:0 error:&error];
if (serialized == nil || error != nil) {
return @"null";
}

NSString *arrayLiteral = [[NSString alloc] initWithData:serialized encoding:NSUTF8StringEncoding];
if (arrayLiteral.length < 2) {
return @"null";
}

NSString *quoted = [arrayLiteral substringWithRange:NSMakeRange(1, arrayLiteral.length - 2)];
quoted = [quoted stringByReplacingOccurrencesOfString:@"\u2028" withString:@"\\u2028"];
return [quoted stringByReplacingOccurrencesOfString:@"\u2029" withString:@"\\u2029"];
}

#if TARGET_OS_IOS
// runtime trick to remove WKWebView keyboard default toolbar
// see: http://stackoverflow.com/questions/19033292/ios-7-uiwebview-keyboard-issue/19042279#19042279
Expand Down Expand Up @@ -1778,15 +1800,16 @@ - (void)setInjectedJavaScript:(NSString *)source {
- (void)setInjectedJavaScriptObject:(NSString *)source
{
_injectedJavaScriptObject = source;
NSString *objectJson = RNCJavaScriptStringLiteral(source);
self.injectedObjectJsonScript = [
[WKUserScript alloc]
initWithSource: [
NSString
stringWithFormat:
@"window.%@ = window.%@ || {};"
"window.%@.injectedObjectJson = function () {"
" return `%@`;"
"};", MessageHandlerName, MessageHandlerName, MessageHandlerName, source
" return %@;"
"};", MessageHandlerName, MessageHandlerName, MessageHandlerName, objectJson
]
injectionTime:WKUserScriptInjectionTimeAtDocumentStart
/* TODO: For a separate (minor) PR: use logic like this (as react-native-wkwebview does) so that messaging can be used in all frames if desired.
Expand Down
Loading