superrob1500
/
mirror-ghostty
mirror of https://github.com/ghostty-org/ghostty
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

extract url parsing into its own function

pull/7029/head
Kristófer R 2025-05-01 00:24:37 -04:00
parent 64bfaf23f9
commit ffe7f0d8bf
No known key found for this signature in database
1 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
src/termio/stream_handler.zig
View File

@ -1071,6 +1071,52 @@ pub const StreamHandler = struct {
return true; return true;
} }
fn parseUrl(url: []const u8) !std.Uri {
return std.Uri.parse(url) catch |e| {
// It's possible this is a mac address on macOS where the last 2 characters in the
// address are non-digits, e.g. 'ff', and thus an invalid port.
//
// Example: file://12:34:56:78:90:12/path/to/file
if (e != error.InvalidPort) return e;
const url_without_scheme = url: {
if (std.mem.startsWith(u8, url, "file://")) break :url url[7..];
if (std.mem.startsWith(u8, url, "kitty-shell-cwd://")) break :url url[18..];
return error.UnsupportedScheme;
};
// The first '/' after the scheme marks the end of the hostname. If the first '/'
// following the end of the scheme is not at the right position this is not a
// valid mac address.
if (std.mem.indexOfScalarPos(u8, url_without_scheme, 0, '/') != 17) {
return error.HostnameIsNotMacAddress;
}
// At this point we may have a mac address as the hostname.
const mac_address = url_without_scheme[0..17];
if (!isValidMacAddress(mac_address)) {
return error.HostnameIsNotMacAddress;
}
var uri_path_end_idx: usize = 17;
while (uri_path_end_idx < url_without_scheme.len and
!isUriPathSeparator(url_without_scheme[uri_path_end_idx]))
{
uri_path_end_idx += 1;
}
// Same compliance factor as std.Uri.parse(), i.e. not at all compliant with the URI
// spec.
return .{
.scheme = "file",
.host = .{ .percent_encoded = mac_address },
.path = .{ .percent_encoded = url_without_scheme[17..uri_path_end_idx] },
};
};
}
pub fn reportPwd(self: *StreamHandler, url: []const u8) !void { pub fn reportPwd(self: *StreamHandler, url: []const u8) !void {
// Special handling for the empty URL. We treat the empty URL // Special handling for the empty URL. We treat the empty URL
// as resetting the pwd as if we never saw a pwd. I can't find any // as resetting the pwd as if we never saw a pwd. I can't find any
@ -1099,55 +1145,9 @@ pub const StreamHandler = struct {
return; return;
} }
const uri: std.Uri = uri: { const uri: std.Uri = parseUrl(url) catch |e| {
const uri = std.Uri.parse(url) catch |e| { log.warn("invalid url in OSC 7: {}", .{e});
// It's possible this is a mac address on macOS where the last 2 characters in the return;
// address are non-digits, e.g. 'ff', and thus an invalid port.
//
// Example: file://12:34:56:78:90:12/path/to/file
if (e != error.InvalidPort) return;
const url_without_scheme = url: {
if (std.mem.startsWith(u8, url, "file://")) break :url url[7..];
if (std.mem.startsWith(u8, url, "kitty-shell-cwd://")) break :url url[18..];
log.warn("invalid url in OSC 7: invalid scheme", .{});
return;
};
// The first '/' after the scheme marks the end of the hostname. If the first '/'
// following the end of the scheme is not at the right position this is not a
// valid mac address.
if (std.mem.indexOfScalarPos(u8, url_without_scheme, 0, '/') != 17) {
log.warn("invalid url in OSC 7: {}", .{e});
return;
}
// At this point we may have a mac address as the hostname.
const mac_address = url_without_scheme[0..17];
if (!isValidMacAddress(mac_address)) {
log.warn("ivalid url in OSC 7: {}", .{e});
return;
}
var uri_path_end_idx: usize = 17;
while (uri_path_end_idx < url_without_scheme.len and
!isUriPathSeparator(url_without_scheme[uri_path_end_idx]))
{
uri_path_end_idx += 1;
}
// Same compliance factor as std.Uri.parse(), i.e. not at all compliant with the URI
// spec.
break :uri .{
.scheme = "file",
.host = .{ .percent_encoded = mac_address },
.path = .{ .percent_encoded = url_without_scheme[17..uri_path_end_idx] },
};
};
break :uri uri;
}; };
if (!std.mem.eql(u8, "file", uri.scheme) and if (!std.mem.eql(u8, "file", uri.scheme) and