fix(tls.connect) fix SNI on tls sockets and also servername (mongodb) #2934

cirospaciari · 2023-05-17T22:19:48Z

Depends on Jarred-Sumner/uSockets#4 and Jarred-Sumner/uWebSockets#11

Fix: #2922
Fix: #2355
Fix: #1991
Fix: #2737
Fix: #2485
Fix: #313 (fastify will at least start after this)
Fix: #2955

github-actions · 2023-05-17T22:55:17Z

❌ @cirospaciari 25 files with test failures on linux-x64:

test/bundler/api.test.ts
test/bundler/bundler_browser.test.ts
test/bundler/bundler_edgecase.test.ts
test/bundler/bundler_jsx.test.ts
test/bundler/bundler_naming.test.ts
test/bundler/bundler_plugin.test.ts
test/bundler/esbuild/dce.test.ts
test/bundler/esbuild/default.test.ts
test/bundler/esbuild/extra.test.ts
test/bundler/esbuild/importstar.test.ts
test/bundler/esbuild/loader.test.ts
test/bundler/esbuild/packagejson.test.ts
test/bundler/esbuild/splitting.test.ts
test/bundler/esbuild/ts.test.ts
test/bundler/esbuild/tsconfig.test.ts
test/cli/hot/hot.test.ts
test/cli/run/preload-test.test.js
test/cli/run/run-cjs.test.ts
test/js/bun/plugin/plugins.test.ts
test/js/bun/resolve/png/test-png-import.test.js
test/js/bun/test/preload-test.test.js
test/js/bun/test/snapshot-tests/snapshots/more-snapshots/different-directory.test.ts
test/js/bun/test/snapshot-tests/snapshots/more.test.ts
test/js/node/child_process/child_process-node.test.js
test/transpiler/transpiler.test.js

View test output

^{#595288473add07fb95ed7d7c09fe76ea47d6247c}

github-actions · 2023-05-17T22:55:19Z

❌ @cirospaciari 25 files with test failures on linux-x64-baseline:

test/bundler/api.test.ts
test/bundler/bundler_browser.test.ts
test/bundler/bundler_edgecase.test.ts
test/bundler/bundler_jsx.test.ts
test/bundler/bundler_naming.test.ts
test/bundler/bundler_plugin.test.ts
test/bundler/esbuild/dce.test.ts
test/bundler/esbuild/default.test.ts
test/bundler/esbuild/extra.test.ts
test/bundler/esbuild/importstar.test.ts
test/bundler/esbuild/loader.test.ts
test/bundler/esbuild/packagejson.test.ts
test/bundler/esbuild/splitting.test.ts
test/bundler/esbuild/ts.test.ts
test/bundler/esbuild/tsconfig.test.ts
test/cli/hot/hot.test.ts
test/cli/run/preload-test.test.js
test/cli/run/run-cjs.test.ts
test/js/bun/plugin/plugins.test.ts
test/js/bun/resolve/png/test-png-import.test.js
test/js/bun/test/preload-test.test.js
test/js/bun/test/snapshot-tests/snapshots/more-snapshots/different-directory.test.ts
test/js/bun/test/snapshot-tests/snapshots/more.test.ts
test/js/node/child_process/child_process-node.test.js
test/transpiler/transpiler.test.js

View test output

^{#687ea435cde2b086dfb3ed99c0c4fa399fd7ab29}

github-actions · 2023-05-17T23:11:54Z

❌ @cirospaciari 26 files with test failures on bun-darwin-x64-baseline:

test/bundler/api.test.ts
test/bundler/bundler_browser.test.ts
test/bundler/bundler_edgecase.test.ts
test/bundler/bundler_jsx.test.ts
test/bundler/bundler_naming.test.ts
test/bundler/bundler_plugin.test.ts
test/bundler/esbuild/dce.test.ts
test/bundler/esbuild/default.test.ts
test/bundler/esbuild/extra.test.ts
test/bundler/esbuild/importstar.test.ts
test/bundler/esbuild/loader.test.ts
test/bundler/esbuild/packagejson.test.ts
test/bundler/esbuild/splitting.test.ts
test/bundler/esbuild/ts.test.ts
test/bundler/esbuild/tsconfig.test.ts
test/cli/run/preload-test.test.js
test/cli/run/run-cjs.test.ts
test/js/bun/plugin/plugins.test.ts
test/js/bun/resolve/png/test-png-import.test.js
test/js/bun/sqlite/sqlite.test.js
test/js/bun/test/preload-test.test.js
test/js/bun/test/snapshot-tests/snapshots/more-snapshots/different-directory.test.ts
test/js/bun/test/snapshot-tests/snapshots/more.test.ts
test/js/third_party/socket.io/socket.io.test.ts
test/js/web/timers/setTimeout.test.js
test/transpiler/transpiler.test.js

View test output

^{#687ea435cde2b086dfb3ed99c0c4fa399fd7ab29}

Jarred-Sumner · 2023-05-18T23:58:26Z

lets merge once macOS tests run

Jarred-Sumner · 2023-05-19T03:25:34Z

macOS x64 test is timing out

github-actions · 2023-05-19T17:56:58Z

✅ prettier errors have been resolved. Thank you.

^{#687ea435cde2b086dfb3ed99c0c4fa399fd7ab29}

src/bun.js/api/bun/socket.zig

src/bun.js/ws.exports.js

src/bun.js/api/server.zig

Jarred-Sumner · 2023-05-20T03:54:30Z

src/bun.js/api/server.zig

+    fn init(comptime fieldname: []const u8, js_obj: JSC.JSValue, global: *JSC.JSGlobalObject, exception: JSC.C.ExceptionRef) ?BlobFileContentResult {
+        if (JSC.WebCore.Body.Value.fromJS(global, js_obj)) |body| {
+            if (body == .Blob and body.Blob.store != null and body.Blob.store.?.data == .file) {
+                const pathlike = body.Blob.store.?.data.file.pathlike;


This entire function should be removed and replaced with a version of readFile easier to call from Zig, like writeFileWithPathBuffer.

bun/src/bun.js/node/node_fs.zig

Lines 3290 to 3428 in 1973975

pub fn readFile(this: *NodeFS, args: Arguments.ReadFile, comptime flavor: Flavor) Maybe(Return.ReadFile) {

var path: [:0]const u8 = undefined;

switch (comptime flavor) {

.sync => {

const fd = switch (args.path) {

.path => brk: {

path = args.path.path.sliceZ(&this.sync_error_buf);

break :brk switch (Syscall.open(

path,

os.O.RDONLY | os.O.NOCTTY,

0,

)) {

.err => |err| return .{

.err = err.withPath(if (args.path == .path) args.path.path.slice() else ""),

},

.result => |fd_| fd_,

};

},

.fd => |_fd| _fd,

};

defer {

if (args.path == .path)

_ = Syscall.close(fd);

}

const stat_ = switch (Syscall.fstat(fd)) {

.err => |err| return .{

.err = err,

},

.result => |stat_| stat_,

};

// Only used in DOMFormData

if (args.offset > 0) {

std.os.lseek_SET(fd, args.offset) catch {};

}

// For certain files, the size might be 0 but the file might still have contents.

const size = @intCast(

u64,

@max(

@min(

stat_.size,

@intCast(

@TypeOf(stat_.size),

// Only used in DOMFormData

args.max_size orelse std.math.maxInt(

JSC.WebCore.Blob.SizeType,

),

),

),

0,

),

);

var buf = std.ArrayList(u8).init(bun.default_allocator);

buf.ensureTotalCapacityPrecise(size + 16) catch unreachable;

buf.expandToCapacity();

var total: usize = 0;

while (total < size) {

switch (Syscall.read(fd, buf.items.ptr[total..buf.capacity])) {

.err => |err| return .{

.err = err,

},

.result => |amt| {

total += amt;

// There are cases where stat()'s size is wrong or out of date

if (total > size and amt != 0) {

buf.ensureUnusedCapacity(8096) catch unreachable;

buf.expandToCapacity();

continue;

}

if (amt == 0) {

break;

}

},

}

} else {

// https://github.com/oven-sh/bun/issues/1220

while (true) {

switch (Syscall.read(fd, buf.items.ptr[total..buf.capacity])) {

.err => |err| return .{

.err = err,

},

.result => |amt| {

total += amt;

// There are cases where stat()'s size is wrong or out of date

if (total > size and amt != 0) {

buf.ensureUnusedCapacity(8096) catch unreachable;

buf.expandToCapacity();

continue;

}

if (amt == 0) {

break;

}

},

}

}

}

buf.items.len = total;

if (total == 0) {

buf.deinit();

return switch (args.encoding) {

.buffer => .{

.result = .{

.buffer = Buffer.empty,

},

},

else => .{

.result = .{

.string = "",

},

},

};

}

return switch (args.encoding) {

.buffer => .{

.result = .{

.buffer = Buffer.fromBytes(buf.items, bun.default_allocator, .Uint8Array),

},

},

else => .{

.result = .{

.string = buf.items,

},

},

};

},

else => {},

}

return Maybe(Return.ReadFile).todo;

}

done on 5d28303 fixed throw on 52daa77

src/bun.js/api/server.zig

Jarred-Sumner · 2023-05-21T16:49:47Z

src/bun.js/node/node_fs.zig

+                        } else {
+                            break :brk .{
+                                .result = .{
+                                    .null_terminated = buf.toOwnedSliceSentinel(0) catch unreachable,


It’s fine for now but keep in mind that .toOwnedSlice potentially reallocates the array

Jarred-Sumner · 2023-05-21T16:51:05Z

Thank you

cirospaciari force-pushed the ciro/patch-tls branch 3 times, most recently from 49b350a to 3e36c2b Compare May 18, 2023 22:28

cirospaciari marked this pull request as ready for review May 18, 2023 22:28

cirospaciari requested a review from Jarred-Sumner May 18, 2023 22:28

cirospaciari marked this pull request as draft May 19, 2023 13:16

cirospaciari force-pushed the ciro/patch-tls branch from 0dcb4c1 to f4d944b Compare May 19, 2023 14:25

cirospaciari force-pushed the ciro/patch-tls branch from a20492a to b31b286 Compare May 19, 2023 18:00

Jarred-Sumner marked this pull request as ready for review May 19, 2023 18:41

cirospaciari force-pushed the ciro/patch-tls branch from 3138bf2 to afcc5d5 Compare May 19, 2023 20:56

Jarred-Sumner reviewed May 19, 2023

View reviewed changes

src/bun.js/api/bun/socket.zig Outdated Show resolved Hide resolved

Jarred-Sumner reviewed May 19, 2023

View reviewed changes

src/bun.js/ws.exports.js Outdated Show resolved Hide resolved

cirospaciari added 12 commits May 19, 2023 23:22

fixes SNI on tls sockets and also servername

00a71e1

💅

023488d

💅

5ea4671

add support for https and wss

0854cc3

fix bun types

f2be6ee

support Bun.file on ca, key and cert

580994d

💅

2ddc97e

add setTimeout (makes fastify run)

e47364e

fix httpVersion

7843562

fix WebSocketServer and add listen event

aec341a

fix ws exports and http listening

b289456

fix default import

d6bbf66

cirospaciari added 18 commits May 19, 2023 23:22

bump uws

6889198

add nodebuffer compatibility

af1795f

fix drain and allow more passing tests to run

e177e84

fix enqueud messages

e4b1529

default to arraybuffer

6ccc261

fix constructor binaryType

e92ba51

fmt

89ad195

fixup

1e5d28a

skip some tests

0ccb274

skip more

6b4ce2b

skip fault tests

6a9a402

reuse encoder instance

1de58c1

fix handshake WS Client

fdce916

temporary revert handshake fix

a523466

fix handshake

5e8d323

disable all socket.io test temp

a1360ea

fixup

f583bb2

add back socket.io tests

8e91569

cirospaciari force-pushed the ciro/patch-tls branch from 8f72995 to 8e91569 Compare May 20, 2023 02:23

Jarred-Sumner reviewed May 20, 2023

View reviewed changes

src/bun.js/api/server.zig Outdated Show resolved Hide resolved

Jarred-Sumner reviewed May 20, 2023

View reviewed changes

src/bun.js/api/server.zig Outdated Show resolved Hide resolved

Jarred-Sumner reviewed May 20, 2023

View reviewed changes

src/bun.js/api/server.zig Outdated Show resolved Hide resolved

cirospaciari added 3 commits May 20, 2023 15:12

use node_fs to read cert, ca and key on server.zig

5d28303

throw the error returned by NodeFS

52daa77

💅

5f89f71

Jarred-Sumner reviewed May 21, 2023

View reviewed changes

Jarred-Sumner merged commit 3870f67 into main May 21, 2023
15 of 22 checks passed

Jarred-Sumner deleted the ciro/patch-tls branch May 21, 2023 16:50

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(tls.connect) fix SNI on tls sockets and also servername (mongodb) #2934

fix(tls.connect) fix SNI on tls sockets and also servername (mongodb) #2934

cirospaciari commented May 17, 2023 •

edited

Loading

github-actions bot commented May 17, 2023 •

edited

Loading

github-actions bot commented May 17, 2023 •

edited

Loading

github-actions bot commented May 17, 2023 •

edited

Loading

Jarred-Sumner commented May 18, 2023

Jarred-Sumner commented May 19, 2023

github-actions bot commented May 19, 2023 •

edited

Loading

Jarred-Sumner May 20, 2023

cirospaciari May 20, 2023 •

edited

Loading

Jarred-Sumner May 21, 2023

Jarred-Sumner commented May 21, 2023

	pub fn readFile(this: *NodeFS, args: Arguments.ReadFile, comptime flavor: Flavor) Maybe(Return.ReadFile) {
	var path: [:0]const u8 = undefined;
	switch (comptime flavor) {
	.sync => {
	const fd = switch (args.path) {
	.path => brk: {
	path = args.path.path.sliceZ(&this.sync_error_buf);
	break :brk switch (Syscall.open(
	path,
	os.O.RDONLY \| os.O.NOCTTY,
	0,
	)) {
	.err => \|err\| return .{
	.err = err.withPath(if (args.path == .path) args.path.path.slice() else ""),
	},
	.result => \|fd_\| fd_,
	};
	},
	.fd => \|_fd\| _fd,
	};

	defer {
	if (args.path == .path)
	_ = Syscall.close(fd);
	}

	const stat_ = switch (Syscall.fstat(fd)) {
	.err => \|err\| return .{
	.err = err,
	},
	.result => \|stat_\| stat_,
	};

	// Only used in DOMFormData
	if (args.offset > 0) {
	std.os.lseek_SET(fd, args.offset) catch {};
	}

	// For certain files, the size might be 0 but the file might still have contents.
	const size = @intCast(
	u64,
	@max(
	@min(
	stat_.size,
	@intCast(
	@TypeOf(stat_.size),
	// Only used in DOMFormData
	args.max_size orelse std.math.maxInt(
	JSC.WebCore.Blob.SizeType,
	),
	),
	),
	0,
	),
	);

	var buf = std.ArrayList(u8).init(bun.default_allocator);
	buf.ensureTotalCapacityPrecise(size + 16) catch unreachable;
	buf.expandToCapacity();
	var total: usize = 0;

	while (total < size) {
	switch (Syscall.read(fd, buf.items.ptr[total..buf.capacity])) {
	.err => \|err\| return .{
	.err = err,
	},
	.result => \|amt\| {
	total += amt;
	// There are cases where stat()'s size is wrong or out of date
	if (total > size and amt != 0) {
	buf.ensureUnusedCapacity(8096) catch unreachable;
	buf.expandToCapacity();
	continue;
	}

	if (amt == 0) {
	break;
	}
	},
	}
	} else {
	// https://github.com/oven-sh/bun/issues/1220
	while (true) {
	switch (Syscall.read(fd, buf.items.ptr[total..buf.capacity])) {
	.err => \|err\| return .{
	.err = err,
	},
	.result => \|amt\| {
	total += amt;
	// There are cases where stat()'s size is wrong or out of date
	if (total > size and amt != 0) {
	buf.ensureUnusedCapacity(8096) catch unreachable;
	buf.expandToCapacity();
	continue;
	}

	if (amt == 0) {
	break;
	}
	},
	}
	}
	}

	buf.items.len = total;
	if (total == 0) {
	buf.deinit();
	return switch (args.encoding) {
	.buffer => .{
	.result = .{
	.buffer = Buffer.empty,
	},
	},
	else => .{
	.result = .{
	.string = "",
	},
	},
	};
	}

	return switch (args.encoding) {
	.buffer => .{
	.result = .{
	.buffer = Buffer.fromBytes(buf.items, bun.default_allocator, .Uint8Array),
	},
	},
	else => .{
	.result = .{
	.string = buf.items,
	},
	},
	};
	},
	else => {},
	}

	return Maybe(Return.ReadFile).todo;
	}

fix(tls.connect) fix SNI on tls sockets and also servername (mongodb) #2934

fix(tls.connect) fix SNI on tls sockets and also servername (mongodb) #2934

Conversation

cirospaciari commented May 17, 2023 • edited Loading

github-actions bot commented May 17, 2023 • edited Loading

github-actions bot commented May 17, 2023 • edited Loading

github-actions bot commented May 17, 2023 • edited Loading

Jarred-Sumner commented May 18, 2023

Jarred-Sumner commented May 19, 2023

github-actions bot commented May 19, 2023 • edited Loading

Jarred-Sumner May 20, 2023

Choose a reason for hiding this comment

cirospaciari May 20, 2023 • edited Loading

Choose a reason for hiding this comment

Jarred-Sumner May 21, 2023

Choose a reason for hiding this comment

Jarred-Sumner commented May 21, 2023

cirospaciari commented May 17, 2023 •

edited

Loading

github-actions bot commented May 17, 2023 •

edited

Loading

github-actions bot commented May 17, 2023 •

edited

Loading

github-actions bot commented May 17, 2023 •

edited

Loading

github-actions bot commented May 19, 2023 •

edited

Loading

cirospaciari May 20, 2023 •

edited

Loading