[TIMOB-26165] iOS: Fix requiring a JSON file with single quotes

iphone/Classes/KrollBridge.m

@@ -887,22 +887,20 @@ - (NSString *)loadFile:(NSString *)path
 
 - (KrollWrapper *)loadJavascriptObject:(NSString *)data fromFile:(NSString *)filename withContext:(KrollContext *)kroll
 {
-  // We could cheat and just do "module.exports = %data%", but that wouldn't validate that the passed in content was JSON
-  // and may open a security hole.
-
-  // TODO It'd be good to try and handle things more gracefully if the JSON is "bad"/malformed
-
-  // Take JSON and turn into JS program that assigns module.exports to the parsed JSON
-  // 1. trim leading and trailing newlines and whitespace from JSON file
-  data = [data stringByTrimmingCharactersInSet:[NSCharacterSet newlineCharacterSet]];
-  // 2. Escape single quotes
-  data = [data stringByReplacingOccurrencesOfString:@"'" withString:@"\'"];
-  // 3. assign module.exports as JSON.parse call on the JSON
-  data = [@"module.exports = JSON.parse('" stringByAppendingString:data];
-  // 4. Replace newlines with "' +\n'"
-  data = [data stringByReplacingOccurrencesOfString:@"\n" withString:@"' +\n'"];
-  // 5. close the JSON string and end the JSON.parse call
-  data = [data stringByAppendingString:@"');"];
+  NSError *jsonParseError = nil;
+  NSError *jsonStringifyError = nil;
+
+  // 1. Parse JSON
+  __unused NSDictionary *parsedJSON = [TiUtils jsonParse:data error:&jsonParseError];
+
+  // 2. Validate parsed JSON
+  if (jsonParseError != nil) {
+    DebugLog(@"[ERROR] Unable to parse JSON input!");
+    return nil;
+  }
+
+  // 3. Assign valid JSON to module.exports
+  data = [NSString stringWithFormat:@"module.exports = %@;", data];
 
   return [self loadJavascriptText:data fromFile:filename withContext:kroll];
 }

tests/Resources/ti.require.addontest.js

@@ -0,0 +1,19 @@
+/*
+ * Appcelerator Titanium Mobile
+ * Copyright (c) 2011-Present by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Apache Public License
+ * Please see the LICENSE included with this distribution for details.
+ */
+/* eslint-env mocha */
+/* global Ti */
+/* eslint no-unused-expressions: "off" */
+'use strict';
+var should = require('./utilities/assertions');
+
+describe('require()', function () {
+	it('JSON-based require() with single-quotes', function () {
+		var amber = require('./json_files/amber');
+		should(amber).have.property('sdk');
+		should(amber.sdk).be.eql('7.4.0.v20180627024922');
+	});
+});