status-im
/
react-native
mirror of https://github.com/status-im/react-native.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Move URL escaping to Inspector layer 

Reviewed By: Hypuk

Differential Revision: D5967544

fbshipit-source-id: d741e6324aff7583778cb13c862505b61ca02a3d
This commit is contained in:
Paco Estevez Garcia 2017-10-04 03:32:14 -07:00 committed by Facebook Github Bot
parent eae4fe810f
commit ef2e29f54c
4 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
React/CxxBridge/RCTCxxBridge.mm
View File

@ -328,13 +328,14 @@ struct RCTInstanceCallback : public InstanceCallback {
BOOL useCustomJSC = BOOL useCustomJSC =
[self.delegate respondsToSelector:@selector(shouldBridgeUseCustomJSC:)] && [self.delegate respondsToSelector:@selector(shouldBridgeUseCustomJSC:)] &&
[self.delegate shouldBridgeUseCustomJSC:self]; [self.delegate shouldBridgeUseCustomJSC:self];
NSString *escapedDeviceName = [[[UIDevice currentDevice] name] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]; // We use the name of the device and the app for debugging & metrics
NSString *escapedAppName = [[[NSBundle mainBundle] bundleIdentifier] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]; NSString *deviceName = [[UIDevice currentDevice] name];
NSString *appName = [[NSBundle mainBundle] bundleIdentifier];
// The arg is a cache dir. It's not used with standard JSC. // The arg is a cache dir. It's not used with standard JSC.
executorFactory.reset(new JSCExecutorFactory(folly::dynamic::object executorFactory.reset(new JSCExecutorFactory(folly::dynamic::object
("OwnerIdentity", "ReactNative") ("OwnerIdentity", "ReactNative")
("AppIdentity", [(escapedAppName ?: @"unknown") UTF8String]) ("AppIdentity", [(appName ?: @"unknown") UTF8String])
("DeviceIdentity", [(escapedDeviceName ?: @"unknown") UTF8String]) ("DeviceIdentity", [(deviceName ?: @"unknown") UTF8String])
("UseCustomJSC", (bool)useCustomJSC) ("UseCustomJSC", (bool)useCustomJSC)
#if RCT_PROFILE #if RCT_PROFILE
("StartSamplingProfilerOnInit", (bool)self.devSettings.startSamplingProfilerOnLaunch) ("StartSamplingProfilerOnInit", (bool)self.devSettings.startSamplingProfilerOnLaunch)

6
ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java
View File

@ -6,7 +6,6 @@ import static com.facebook.react.modules.systeminfo.AndroidInfoHelpers.getFriend
import android.app.Activity; import android.app.Activity;
import android.app.Application; import android.app.Application;
import android.net.Uri;
import android.os.Build; import android.os.Build;
import com.facebook.infer.annotation.Assertions; import com.facebook.infer.annotation.Assertions;
import com.facebook.react.bridge.JSBundleLoader; import com.facebook.react.bridge.JSBundleLoader;
@ -266,8 +265,9 @@ public class ReactInstanceManagerBuilder {
mUIImplementationProvider = new UIImplementationProvider(); mUIImplementationProvider = new UIImplementationProvider();
} }
String appName = Uri.encode(mApplication.getPackageName()); // We use the name of the device and the app for debugging & metrics
String deviceName = Uri.encode(getFriendlyDeviceName()); String appName = mApplication.getPackageName();
String deviceName = getFriendlyDeviceName();
return new ReactInstanceManager( return new ReactInstanceManager(
mApplication, mApplication,

2
ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/AndroidInfoHelpers.java
View File

@ -31,7 +31,7 @@ public class AndroidInfoHelpers {
return getServerIpAddress(INSPECTOR_PROXY_PORT); return getServerIpAddress(INSPECTOR_PROXY_PORT);
} }
// FIXME(festevezga): This method is duplicated in an internal module. Any changes should be applied to both. // WARNING(festevezga): This RN helper method has been copied to another FB-only target. Any changes should be applied to both.
public static String getFriendlyDeviceName() { public static String getFriendlyDeviceName() {
if (isRunningOnGenymotion()) { if (isRunningOnGenymotion()) {
// Genymotion already has a friendly name by default // Genymotion already has a friendly name by default

10
ReactCommon/cxxreact/JSCExecutor.cpp
View File

@ -17,6 +17,7 @@
#include <folly/Exception.h> #include <folly/Exception.h>
#include <folly/json.h> #include <folly/json.h>
#include <folly/Memory.h> #include <folly/Memory.h>
#include <folly/String.h>
#include <glog/logging.h> #include <glog/logging.h>
#include <jschelpers/InspectorInterfaces.h> #include <jschelpers/InspectorInterfaces.h>
#include <jschelpers/JSCHelpers.h> #include <jschelpers/JSCHelpers.h>
@ -295,10 +296,13 @@ namespace facebook {
#endif //defined(__ANDROID__) #endif //defined(__ANDROID__)
} }
std::string escapedOwner = folly::uriEscape<std::string>(owner, folly::UriEscapeMode::QUERY);
std::string escapedApp = folly::uriEscape<std::string>(app, folly::UriEscapeMode::QUERY);
std::string escapedDevice = folly::uriEscape<std::string>(device, folly::UriEscapeMode::QUERY);
std::string msg = folly::to<std::string>( std::string msg = folly::to<std::string>(
"GET /autoattach?title=", owner, "GET /autoattach?title=", escapedOwner,
"&app=" , app, "&app=" , escapedApp,
"&device=" , device, "&device=" , escapedDevice,
" HTTP/1.1\r\n\r\n"); " HTTP/1.1\r\n\r\n");
auto send_resp = ::send(socket_desc, msg.c_str(), msg.length(), 0); auto send_resp = ::send(socket_desc, msg.c_str(), msg.length(), 0);
if (send_resp < 0) { if (send_resp < 0) {