From 321e296371383fd63131d21c1121e22163ddeb86 Mon Sep 17 00:00:00 2001 From: Joyee Cheung Date: Sun, 16 Dec 2018 03:13:12 +0800 Subject: process: move POSIX credential accessors into node_credentials.cc Expose the POSIX credential accessors through `internalBinding('credentials')` instead of setting them on the process or bootstrapper object from C++ directly. Also moves `SafeGetEnv` from `internalBinding('util')` to `internalBinding('credentials')` since it's closely related to the credentials. In the JS land, instead of wrapping the bindings then writing to the process object directly in main_thread_only.js, return the wrapped functions back to bootstrap/node.js where they get written to the process object conditionally for clarity. Refs: https://github.com/nodejs/node/issues/24961 PR-URL: https://github.com/nodejs/node/pull/25066 Reviewed-By: Anna Henningsen Reviewed-By: James M Snell --- src/node_util.cc | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'src/node_util.cc') diff --git a/src/node_util.cc b/src/node_util.cc index f6ebee895f..f7412d92bc 100644 --- a/src/node_util.cc +++ b/src/node_util.cc @@ -15,7 +15,6 @@ using v8::Integer; using v8::Isolate; using v8::KeyCollectionMode; using v8::Local; -using v8::NewStringType; using v8::Object; using v8::ONLY_CONFIGURABLE; using v8::ONLY_ENUMERABLE; @@ -172,17 +171,6 @@ void WatchdogHasPendingSigint(const FunctionCallbackInfo& args) { args.GetReturnValue().Set(ret); } -void SafeGetenv(const FunctionCallbackInfo& args) { - CHECK(args[0]->IsString()); - Utf8Value strenvtag(args.GetIsolate(), args[0]); - std::string text; - if (!node::SafeGetenv(*strenvtag, &text)) return; - args.GetReturnValue() - .Set(String::NewFromUtf8( - args.GetIsolate(), text.c_str(), - NewStringType::kNormal).ToLocalChecked()); -} - void EnqueueMicrotask(const FunctionCallbackInfo& args) { Environment* env = Environment::GetCurrent(args); Isolate* isolate = env->isolate(); @@ -232,8 +220,6 @@ void Initialize(Local target, env->SetMethodNoSideEffect(target, "watchdogHasPendingSigint", WatchdogHasPendingSigint); - env->SetMethod(target, "safeGetenv", SafeGetenv); - env->SetMethod(target, "enqueueMicrotask", EnqueueMicrotask); Local constants = Object::New(env->isolate()); -- cgit v1.2.1