tls: do not confuse session and session ID

sam-github · targos · commit f6b2ea8bb982 · 2019-01-01T14:38:17.000+01:00
session ID was named session in C++ and key in JS, Name them after what they are, as the 'newSession' event docs do. PR-URL: #25153 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Tobias Nießen <tniessen@tnie.de> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
diff --git a/lib/_tls_wrap.js b/lib/_tls_wrap.js
@@ -212,7 +212,7 @@ function requestOCSPDone(socket) {
 }
 
 
-function onnewsession(key, session) {
+function onnewsession(sessionId, session) {
   const owner = this[owner_symbol];
 
   if (!owner.server)
@@ -236,7 +236,7 @@ function onnewsession(key, session) {
   };
 
   owner._newSessionPending = true;
-  if (!owner.server.emit('newSession', key, session, done))
+  if (!owner.server.emit('newSession', sessionId, session, done))
     done();
 }
 
diff --git a/src/node_crypto.cc b/src/node_crypto.cc
@@ -1483,20 +1483,20 @@ int SSLWrap<Base>::NewSessionCallback(SSL* s, SSL_SESSION* sess) {
     return 0;
 
   // Serialize session
-  Local<Object> buff = Buffer::New(env, size).ToLocalChecked();
-  unsigned char* serialized = reinterpret_cast<unsigned char*>(
-      Buffer::Data(buff));
-  memset(serialized, 0, size);
-  i2d_SSL_SESSION(sess, &serialized);
+  Local<Object> session = Buffer::New(env, size).ToLocalChecked();
+  unsigned char* session_data = reinterpret_cast<unsigned char*>(
+      Buffer::Data(session));
+  memset(session_data, 0, size);
+  i2d_SSL_SESSION(sess, &session_data);
 
   unsigned int session_id_length;
-  const unsigned char* session_id = SSL_SESSION_get_id(sess,
-                                                       &session_id_length);
-  Local<Object> session = Buffer::Copy(
+  const unsigned char* session_id_data = SSL_SESSION_get_id(sess,
+                                                            &session_id_length);
+  Local<Object> session_id = Buffer::Copy(
       env,
-      reinterpret_cast<const char*>(session_id),
+      reinterpret_cast<const char*>(session_id_data),
       session_id_length).ToLocalChecked();
-  Local<Value> argv[] = { session, buff };
+  Local<Value> argv[] = { session_id, session };
   w->new_session_wait_ = true;
   w->MakeCallback(env->onnewsession_string(), arraysize(argv), argv);
 

Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ function requestOCSPDone(socket) {`
`212`	`212`	`}`
`213`	`213`
`214`	`214`
`215`		`-function onnewsession(key, session) {`
	`215`	`+function onnewsession(sessionId, session) {`
`216`	`216`	`const owner = this[owner_symbol];`
`217`	`217`
`218`	`218`	`if (!owner.server)`
`@@ -236,7 +236,7 @@ function onnewsession(key, session) {`
`236`	`236`	`};`
`237`	`237`
`238`	`238`	`owner._newSessionPending = true;`
`239`		`- if (!owner.server.emit('newSession', key, session, done))`
	`239`	`+ if (!owner.server.emit('newSession', sessionId, session, done))`
`240`	`240`	`done();`
`241`	`241`	`}`
`242`	`242`