Skip to content

Commit d9c86f3

Browse files
committed
Wrap ca_file_name option
1 parent 2c87f35 commit d9c86f3

2 files changed

Lines changed: 67 additions & 69 deletions

File tree

‎examples/WorkerThreads.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ if (isMainThread) {
1717
/* I guess main thread joins by default? */
1818
} else {
1919
/* Here we are inside a worker thread */
20-
const app = uWS./*SSL*/App({
20+
const app = uWS.SSLApp({
2121
key_file_name: 'misc/key.pem',
2222
cert_file_name: 'misc/cert.pem',
2323
passphrase: '1234'

‎src/AppWrapper.h‎

Lines changed: 66 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -256,80 +256,78 @@ template <typename APP>
256256
void uWS_App(const FunctionCallbackInfo<Value> &args) {
257257

258258
Isolate *isolate = args.GetIsolate();
259-
260259
Local<FunctionTemplate> appTemplate = FunctionTemplate::New(isolate);
260+
appTemplate->SetClassName(String::NewFromUtf8(isolate, std::is_same<APP, uWS::SSLApp>::value ? "uWS.SSLApp" : "uWS.App", NewStringType::kNormal).ToLocalChecked());
261+
262+
/* Read the options object if any */
263+
us_socket_context_options_t options = {};
264+
if (args.Length() == 1) {
265+
266+
Local<Object> optionsObject = Local<Object>::Cast(args[0]);
267+
268+
std::string keyFileName;
269+
std::string certFileName;
270+
std::string passphrase;
271+
std::string dhParamsFileName;
272+
std::string caFileName;
273+
274+
/* Key file name */
275+
NativeString keyFileNameValue(isolate, optionsObject->Get(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "key_file_name", NewStringType::kNormal).ToLocalChecked()).ToLocalChecked());
276+
if (keyFileNameValue.isInvalid(args)) {
277+
return;
278+
}
279+
if (keyFileNameValue.getString().length()) {
280+
keyFileName = keyFileNameValue.getString();
281+
options.key_file_name = keyFileName.c_str();
282+
}
261283

262-
APP *app;
263-
264-
/* These won't outlive the function, uSockets will have to copy strings it wants to keep! */
265-
std::string keyFileName;
266-
std::string certFileName;
267-
std::string passphrase;
268-
std::string dhParamsFileName;
269-
270-
/* Name differs based on type */
271-
if (std::is_same<APP, uWS::SSLApp>::value) {
272-
appTemplate->SetClassName(String::NewFromUtf8(isolate, "uWS.SSLApp", NewStringType::kNormal).ToLocalChecked());
273-
274-
/* We fill these below */
275-
us_socket_context_options_t ssl_options = {};
276-
277-
/* Read the options object (SSL options) */
278-
if (args.Length() == 1) {
279-
280-
Local<Object> optionsObject = Local<Object>::Cast(args[0]);
281-
282-
/* Key file name */
283-
NativeString keyFileNameValue(isolate, optionsObject->Get(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "key_file_name", NewStringType::kNormal).ToLocalChecked()).ToLocalChecked());
284-
if (keyFileNameValue.isInvalid(args)) {
285-
return;
286-
}
287-
if (keyFileNameValue.getString().length()) {
288-
keyFileName = keyFileNameValue.getString();
289-
ssl_options.key_file_name = keyFileName.c_str();
290-
}
291-
292-
/* Cert file name */
293-
NativeString certFileNameValue(isolate, optionsObject->Get(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "cert_file_name", NewStringType::kNormal).ToLocalChecked()).ToLocalChecked());
294-
if (certFileNameValue.isInvalid(args)) {
295-
return;
296-
}
297-
if (certFileNameValue.getString().length()) {
298-
certFileName = certFileNameValue.getString();
299-
ssl_options.cert_file_name = certFileName.c_str();
300-
}
301-
302-
/* Passphrase */
303-
NativeString passphraseValue(isolate, optionsObject->Get(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "passphrase", NewStringType::kNormal).ToLocalChecked()).ToLocalChecked());
304-
if (passphraseValue.isInvalid(args)) {
305-
return;
306-
}
307-
if (passphraseValue.getString().length()) {
308-
passphrase = passphraseValue.getString();
309-
ssl_options.passphrase = passphrase.c_str();
310-
}
311-
312-
/* DH params file name */
313-
NativeString dhParamsFileNameValue(isolate, optionsObject->Get(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "dh_params_file_name", NewStringType::kNormal).ToLocalChecked()).ToLocalChecked());
314-
if (dhParamsFileNameValue.isInvalid(args)) {
315-
return;
316-
}
317-
if (dhParamsFileNameValue.getString().length()) {
318-
dhParamsFileName = dhParamsFileNameValue.getString();
319-
ssl_options.dh_params_file_name = dhParamsFileName.c_str();
320-
}
321-
322-
/* ssl_prefer_low_memory_usage */
323-
ssl_options.ssl_prefer_low_memory_usage = BooleanValue(isolate, optionsObject->Get(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "ssl_prefer_low_memory_usage", NewStringType::kNormal).ToLocalChecked()).ToLocalChecked());
284+
/* Cert file name */
285+
NativeString certFileNameValue(isolate, optionsObject->Get(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "cert_file_name", NewStringType::kNormal).ToLocalChecked()).ToLocalChecked());
286+
if (certFileNameValue.isInvalid(args)) {
287+
return;
288+
}
289+
if (certFileNameValue.getString().length()) {
290+
certFileName = certFileNameValue.getString();
291+
options.cert_file_name = certFileName.c_str();
324292
}
325293

326-
/* uSockets should really copy strings it wants to keep */
327-
app = new APP(ssl_options);
328-
} else {
329-
appTemplate->SetClassName(String::NewFromUtf8(isolate, "uWS.App", NewStringType::kNormal).ToLocalChecked());
330-
app = new APP;
294+
/* Passphrase */
295+
NativeString passphraseValue(isolate, optionsObject->Get(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "passphrase", NewStringType::kNormal).ToLocalChecked()).ToLocalChecked());
296+
if (passphraseValue.isInvalid(args)) {
297+
return;
298+
}
299+
if (passphraseValue.getString().length()) {
300+
passphrase = passphraseValue.getString();
301+
options.passphrase = passphrase.c_str();
302+
}
303+
304+
/* DH params file name */
305+
NativeString dhParamsFileNameValue(isolate, optionsObject->Get(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "dh_params_file_name", NewStringType::kNormal).ToLocalChecked()).ToLocalChecked());
306+
if (dhParamsFileNameValue.isInvalid(args)) {
307+
return;
308+
}
309+
if (dhParamsFileNameValue.getString().length()) {
310+
dhParamsFileName = dhParamsFileNameValue.getString();
311+
options.dh_params_file_name = dhParamsFileName.c_str();
312+
}
313+
314+
/* CA file name */
315+
NativeString caFileNameValue(isolate, optionsObject->Get(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "ca_file_name", NewStringType::kNormal).ToLocalChecked()).ToLocalChecked());
316+
if (caFileNameValue.isInvalid(args)) {
317+
return;
318+
}
319+
if (caFileNameValue.getString().length()) {
320+
caFileName = caFileNameValue.getString();
321+
options.ca_file_name = caFileName.c_str();
322+
}
323+
324+
/* ssl_prefer_low_memory_usage */
325+
options.ssl_prefer_low_memory_usage = BooleanValue(isolate, optionsObject->Get(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "ssl_prefer_low_memory_usage", NewStringType::kNormal).ToLocalChecked()).ToLocalChecked());
331326
}
332327

328+
/* uSockets copies strings here */
329+
APP *app = new APP(options);
330+
333331
/* Throw if we failed to construct the app */
334332
if (app->constructorFailed()) {
335333
delete app;

0 commit comments

Comments
 (0)