Skip to content
Draft
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
16 changes: 16 additions & 0 deletions modules/ensemble/lib/framework/global_script_handler_security.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import 'dart:convert';

/// Coerces [inputs] into a safe JavaScript call argument for embedding in a
/// generated `functionName(<argument>)` snippet.
///
/// Valid JSON literals (including quoted strings from [jsonEncode]) are passed
/// through unchanged. Any other value is wrapped with [jsonEncode] so quotes and
/// parentheses cannot break out of the argument position.
String toSafeJavaScriptCallArgument(String inputs) {
try {
jsonDecode(inputs);
return inputs;
} on FormatException {
return jsonEncode(inputs);
}
}
4 changes: 3 additions & 1 deletion modules/ensemble/lib/screen_controller.dart
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import 'package:ensemble/framework/data_context.dart';
import 'package:ensemble/framework/devmode.dart';
import 'package:ensemble/framework/error_handling.dart';
import 'package:ensemble/framework/event.dart';
import 'package:ensemble/framework/global_script_handler_security.dart';
import 'package:ensemble/framework/scope.dart';
import 'package:ensemble/framework/stub/camera_manager.dart';
import 'package:ensemble/framework/stub/face_camera_manager.dart';
Expand Down Expand Up @@ -111,7 +112,8 @@ class ScreenController {

final library = data[0];
final function = data[1];
final codeBlock = "$function($inputs)";
final safeInputs = toSafeJavaScriptCallArgument(inputs);
final codeBlock = "$function($safeInputs)";
payload = executeGlobalFunction(
Utils.globalAppKey.currentContext!, library, codeBlock);
return payload;
Expand Down
33 changes: 33 additions & 0 deletions modules/ensemble/test/global_script_handler_security_test.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import 'dart:convert';

import 'package:ensemble/framework/global_script_handler_security.dart';
import 'package:flutter_test/flutter_test.dart';

void main() {
group('toSafeJavaScriptCallArgument', () {
test('passes through JSON object literals', () {
const payload = '{"data":{"link":"https://example.com"}}';
expect(toSafeJavaScriptCallArgument(payload), payload);
});

test('passes through JSON-encoded string arguments', () {
const payload = '"hello world"';
expect(toSafeJavaScriptCallArgument(payload), payload);
});

test('wraps raw attacker-controlled strings as JSON string literals', () {
const malicious = '"); alert(1); //';
expect(
toSafeJavaScriptCallArgument(malicious),
jsonEncode(malicious),
);
});

test('neutralizes BLE-style breakout attempts', () {
const malicious = 'x"); evil();//';
final safe = toSafeJavaScriptCallArgument(malicious);
expect(safe, jsonEncode(malicious));
expect(safe, isNot(contains('"); evil();//')));
});
});
}
Loading