mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-09 18:38:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

bug(ENG-21479): Fix Valkey URL Parsing (#24458)

Browse Source 
### What does this PR do?

Fixes https://github.com/oven-sh/bun/issues/24385

### How did you verify your code works?

Confirmed that the test added in the first commit fails on mainline
`bun` and is fixed in this PR.

---------

Co-authored-by: Jarred Sumner <jarred@jarredsumner.com>
This commit is contained in:
Marko Vejnovic
2025-11-07 21:18:07 -08:00
committed by GitHub
parent de9a38bd11
commit 02b474415d
3 changed files with 84 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/valkey/js_valkey.zig
View File

@@ -274,16 +274,45 @@ pub const JSValkeyClient = struct {
else
bun.String.static("valkey://localhost:6379");
defer url_str.deref();
var fallback_url_buf: [2048]u8 = undefined;
// Parse and validate the URL using URL.zig's fromString which returns null for invalid URLs
const parsed_url = URL.fromString(url_str) orelse {
if (url_str.tag != .StaticZigString) {
const url_utf8 = url_str.toUTF8WithoutRef(this_allocator);
defer url_utf8.deinit();
return globalObject.throwInvalidArguments("Invalid URL format: \"{s}\"", .{url_utf8.slice()});
// TODO(markovejnovic): The following check for :// is a stop-gap. It is my expectation
// that URL.fromString returns null if the protocol is not specified. This is not, in-fact,
// the case right now and I do not understand why. It will take some work in JSC to
// understand why this is happening, but since I need to uncork valkey, I'm adding this as
// a stop-gap.
const parsed_url = get_url: {
const url_slice = url_str.toUTF8WithoutRef(this_allocator);
defer url_slice.deinit();
const url_byte_slice = url_slice.slice();
if (url_byte_slice.len == 0) {
return globalObject.throwInvalidArguments("Invalid URL format", .{});
}
// This should never happen since our default URL is valid
return globalObject.throwInvalidArguments("Invalid URL format", .{});
if (bun.strings.contains(url_byte_slice, "://")) {
break :get_url URL.fromString(url_str) orelse {
return globalObject.throwInvalidArguments("Invalid URL format", .{});
};
}
const corrected_url = get_url_slice: {
const written = std.fmt.bufPrintZ(
&fallback_url_buf,
"valkey://{s}",
.{url_byte_slice},
) catch {
return globalObject.throwInvalidArguments("URL is too long.", .{});
};
break :get_url_slice fallback_url_buf[0..written.len];
};
break :get_url URL.fromUTF8(corrected_url) orelse {
return globalObject.throwInvalidArguments("Invalid URL format", .{});
};
};
defer parsed_url.deinit();