Add missing `options` argument to createSecurePair. #25109

socketpair · 2015-05-05T07:47:21Z

Also helps in implementation of #6204, where some ptions passed to
createSecurePair and ignored before this patch.

These options are very helpful if someone wants to pass
options.servername or options.SNICallback to securepair.

Allow wrapping TLSSocket inside another TLSSocket, emulate it using SecurePair in legacy APIs. fix #6204

indutny · 2015-05-07T05:00:24Z

Great! May I ask you to add a test to not let this slip away again?

socketpair · 2015-05-16T19:29:00Z

Tests sems valid, but does not work...another bug is blocking my test...:

@indutny need your help. Да, удобнее по-русски, кстати.

=== release test-tls-securepair-fiftharg ===                    
Path: pummel/test-tls-securepair-fiftharg
node: ../src/async-wrap-inl.h:98: v8::Handle<v8::Value> node::AsyncWrap::MakeCallback(v8::Handle<v8::String>, int, v8::Handle<v8::Value>*): Assertion `cb_v->IsFunction()' failed.
Command: out/Release/node ********/node/test/pummel/test-tls-securepair-fiftharg.js

Exactly the same is reproduced with code

pair = tls.createSecurePair(...);
pair.ssl.setSNICallback(function() {});

but pair.ssl is undocumented (and should not be documented, as I think).

Also, seems not reproducible in nodejs 0.10. Also maybe that: #7691 ?

`onselect` is set on the `sniObject_` not on the `Connection` instance. See: nodejs/node-v0.x-archive#25109

indutny · 2015-05-17T13:12:41Z

@socketpair there is a bug that should be fixed by nodejs/node#1720

indutny · 2015-05-17T13:15:14Z

cc @misterdjules please backport this if it sounds good to you! ;)

indutny · 2015-05-17T14:48:38Z

Btw, why put this test into pummel folder?

socketpair · 2015-05-17T15:50:10Z

I don't know. I just see some tests about tls in that folder, and put my test in same folder. I can change PR if you say what to fix.

indutny · 2015-05-17T15:53:05Z

I'd go with test/simple ;) Btw, you could probably try to rebase your branch on top of nodejs/node#1720 to include the fix commit in this PR, and to make sure that it builds correctly.

`onselect` is set on the `sniObject_` not on the `Connection` instance. See: #25109

socketpair · 2015-05-27T18:07:35Z

I have cherry-picked commit from IOjs that fixed bug in C++

socketpair · 2015-05-27T18:10:06Z

I have moved test from pummel to simple dir

socketpair · 2015-05-27T18:45:03Z

Now all tests passed! yay! Please merge!

socketpair · 2015-05-27T18:45:36Z

doc/api/tls.markdown

@@ -582,6 +582,8 @@ and the cleartext one is used as a replacement for the initial encrypted stream.
   automatically reject clients with invalid certificates. Only applies to
   servers with `requestCert` enabled.

+ - `options`: An object with common SSL options. See [new tls.TLSSocket][].


not sure if markdown syntax (link) is correct here

socketpair · 2015-05-29T14:55:47Z

How to speedup merging? who is responsible?

indutny · 2015-06-03T11:07:18Z

test/simple/test-tls-securepair-fiftharg.js

+
+    // captured trafic from browser's request to https://www.google.com
+    var ssl_hello_with_SNI = new Buffer([
+        22,3,1,2,0,1,0,1,252,3,3,123,36,32,232,194,245,125,208,188,197,238,164,123,101,37,21,189,4,223,219,197,179,76,


Sorry, but we use 80 column limit everywhere. I may only suggest to convert this to hex and split it before it gets to 80 column. It will be much more compact this way.

indutny · 2015-06-03T11:07:36Z

Sorry for delay! Just one minor nit, otherwise LGTM!

Also helps in implementation of #6204, where some options passed to createSecurePair and ignored before this patch. These options are very helpful if someone wants to pass options.servername or options.SNICallback to securepair.

socketpair · 2015-06-03T13:25:26Z

Hex encoding takess too much space. Just reformat decimal representation.

`onselect` is set on the `sniObject_` not on the `Connection` instance. See: nodejs/node-v0.x-archive#25109 PR-URL: nodejs#1720 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>

`onselect` is set on the `sniObject_` not on the `Connection` instance. See: nodejs/node-v0.x-archive#25109 PR-URL: #1720 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>

indutny · 2015-07-22T21:02:34Z

@socketpair what do you think about reopening this PR for io.js master branch? I have just landed that fix commit that your PR depended upon. ;)

socketpair · 2015-07-23T07:55:14Z

I'm confused about everything, and forgot what is happening... :( There are nodejs, iojs and two patches in both projects.

I want all fixes to be in both projects. What I should do so?

indutny · 2015-07-23T07:59:43Z

@socketpair it can't go into v0.12, and so the next release of node is io.js :) I would suggest to open PR for io.js master ;)

indutny · 2015-07-24T17:16:29Z

Don't forget to cc me there ;)

jasnell · 2015-08-16T01:02:20Z

@socketpair .. just to reiterate what @indutny said. This is not going to be able to land here. The right thing to do here would be to open a new PR against master on http://github.com/nodejs/node in order to get this landed.

socketpair · 2015-08-19T14:28:58Z

@jasnell thanks for detailed explanation what should be done.
@indutny CC to you :)

nodejs/node#2441

Should I close this pull request ?

jasnell · 2015-08-19T14:50:53Z

@socketpair .. no problem. I'll go ahead and close the PR here. Thanks!

Nodejs-Jenkins added pr master labels May 5, 2015

socketpair referenced this pull request May 5, 2015

tls: wrap tls inside tls using legacy API

42acbf8

Allow wrapping TLSSocket inside another TLSSocket, emulate it using SecurePair in legacy APIs. fix #6204

indutny added a commit to indutny/io.js that referenced this pull request May 17, 2015

crypto: fix legacy SNICallback

79d647d

`onselect` is set on the `sniObject_` not on the `Connection` instance. See: nodejs/node-v0.x-archive#25109

indutny mentioned this pull request May 17, 2015

crypto: fix legacy SNICallback nodejs/node#1720

Closed

crypto: fix legacy SNICallback

7979ef6

`onselect` is set on the `sniObject_` not on the `Connection` instance. See: #25109

socketpair reviewed May 27, 2015
View reviewed changes

indutny reviewed Jun 3, 2015
View reviewed changes

Add missing options argument to createSecurePair

e68f5a9

Also helps in implementation of #6204, where some options passed to createSecurePair and ignored before this patch. These options are very helpful if someone wants to pass options.servername or options.SNICallback to securepair.

indutny added a commit to nodejs/node that referenced this pull request Jul 22, 2015

crypto: fix legacy SNICallback

eb35968

`onselect` is set on the `sniObject_` not on the `Connection` instance. See: nodejs/node-v0.x-archive#25109 PR-URL: #1720 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>

jasnell closed this Aug 19, 2015

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add missing `options` argument to createSecurePair. #25109

Add missing `options` argument to createSecurePair. #25109

socketpair commented May 5, 2015

indutny commented May 7, 2015

socketpair commented May 16, 2015

indutny commented May 17, 2015

indutny commented May 17, 2015

indutny commented May 17, 2015

socketpair commented May 17, 2015

indutny commented May 17, 2015

socketpair commented May 27, 2015

socketpair commented May 27, 2015

socketpair commented May 27, 2015

socketpair May 27, 2015

socketpair commented May 29, 2015

indutny Jun 3, 2015

socketpair Jun 3, 2015

indutny commented Jun 3, 2015

socketpair commented Jun 3, 2015

indutny commented Jul 22, 2015

socketpair commented Jul 23, 2015

indutny commented Jul 23, 2015

indutny commented Jul 24, 2015

jasnell commented Aug 16, 2015

socketpair commented Aug 19, 2015

jasnell commented Aug 19, 2015

Add missing options argument to createSecurePair. #25109

Add missing options argument to createSecurePair. #25109

Conversation

socketpair commented May 5, 2015

indutny commented May 7, 2015

socketpair commented May 16, 2015

indutny commented May 17, 2015

indutny commented May 17, 2015

indutny commented May 17, 2015

socketpair commented May 17, 2015

indutny commented May 17, 2015

socketpair commented May 27, 2015

socketpair commented May 27, 2015

socketpair commented May 27, 2015

socketpair May 27, 2015

Choose a reason for hiding this comment

socketpair commented May 29, 2015

indutny Jun 3, 2015

Choose a reason for hiding this comment

socketpair Jun 3, 2015

Choose a reason for hiding this comment

indutny commented Jun 3, 2015

socketpair commented Jun 3, 2015

indutny commented Jul 22, 2015

socketpair commented Jul 23, 2015

indutny commented Jul 23, 2015

indutny commented Jul 24, 2015

jasnell commented Aug 16, 2015

socketpair commented Aug 19, 2015

jasnell commented Aug 19, 2015

Add missing `options` argument to createSecurePair. #25109

Add missing `options` argument to createSecurePair. #25109