tls: include invalid method name in thrown error

sam-github · targos · commit 6ca027032009 · 2019-04-27T11:36:08.000+02:00
When an invalid TLS method name error is thrown, include the invalid name in the error message. PR-URL: #27390 Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Brian White <mscdex@mscdex.net> Reviewed-By: James M Snell <jasnell@gmail.com>
diff --git a/src/node_crypto.cc b/src/node_crypto.cc
@@ -627,7 +627,8 @@ void SecureContext::Init(const FunctionCallbackInfo<Value>& args) {
       max_version = TLS1_2_VERSION;
       method = TLS_client_method();
     } else {
-      THROW_ERR_TLS_INVALID_PROTOCOL_METHOD(env, "Unknown method");
+      const std::string msg("Unknown method: ");
+      THROW_ERR_TLS_INVALID_PROTOCOL_METHOD(env, (msg + * sslmethod).c_str());
       return;
     }
   }
diff --git a/test/parallel/test-tls-no-sslv23.js b/test/parallel/test-tls-no-sslv23.js
@@ -8,7 +8,10 @@ const tls = require('tls');
 
 assert.throws(function() {
   tls.createSecureContext({ secureProtocol: 'blargh' });
-}, /Unknown method/);
+}, {
+  code: 'ERR_TLS_INVALID_PROTOCOL_METHOD',
+  message: 'Unknown method: blargh',
+});
 
 const errMessageSSLv2 = /SSLv2 methods disabled/;
 

Original file line number	Diff line number	Diff line change
`@@ -627,7 +627,8 @@ void SecureContext::Init(const FunctionCallbackInfo<Value>& args) {`
`627`	`627`	`max_version = TLS1_2_VERSION;`
`628`	`628`	`method = TLS_client_method();`
`629`	`629`	`} else {`
`630`		`- THROW_ERR_TLS_INVALID_PROTOCOL_METHOD(env, "Unknown method");`
	`630`	`+ const std::string msg("Unknown method: ");`
	`631`	`+ THROW_ERR_TLS_INVALID_PROTOCOL_METHOD(env, (msg + * sslmethod).c_str());`
`631`	`632`	`return;`
`632`	`633`	`}`
`633`	`634`	`}`