Commit ddb754ff2fd29298dd1b6c9f4a8619ce4f960e36 | zig

author	Andrew Kelley <andrew@ziglang.org> 2024-02-16 19:15:17-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2024-02-23 02:37:11-07:00
log	ddb754ff2fd29298dd1b6c9f4a8619ce4f960e36
tree	e89a5c8165b912c97d6a7d1461925ffebb3c2414
parent	ae630b695e1306ae357a900a44732912eac2a417

std.http: fix parsing incorrect tokenization

2 files changed, 8 insertions(+), 5 deletions(-)

lib
- std
  - http
    Client.zig
    Server.zig

lib/std/http/Client.zig+1

...	@@ -545,6 +545,7 @@ pub const Response = struct {	...	@@ -545,6 +545,7 @@ pub const Response = struct {
545	}	545	}
546	}	546	}
547	}	547	}
		548	return error.HttpHeadersInvalid; // missing empty line
548	}	549	}
549		550
550	inline fn int64(array: *const [8]u8) u64 {	551	inline fn int64(array: *const [8]u8) u64 {

lib/std/http/Server.zig+7-5

 @@ -197,9 +197,9 @@ pub const Request = struct {
     };
     pub fn parse(req: *Request, bytes: []const u8) ParseError!void {
-        var it = mem.tokenizeAny(u8, bytes, "\r\n");
+        var it = mem.splitSequence(u8, bytes, "\r\n");
-        const first_line = it.next() orelse return error.HttpHeadersInvalid;
+        const first_line = it.next().?;
         if (first_line.len < 10)
             return error.HttpHeadersInvalid;
 @@ -229,15 +229,16 @@ pub const Request = struct {
         req.version = version;
         while (it.next()) |line| {
-            if (line.len == 0) return error.HttpHeadersInvalid;
+            if (line.len == 0) return;
             switch (line[0]) {
                 ' ', '\t' => return error.HttpHeaderContinuationsUnsupported,
                 else => {},
             }
-            var line_it = mem.tokenizeAny(u8, line, ": ");
+            var line_it = mem.splitSequence(u8, line, ": ");
-            const header_name = line_it.next() orelse return error.HttpHeadersInvalid;
+            const header_name = line_it.next().?;
             const header_value = line_it.rest();
+            if (header_value.len == 0) return error.HttpHeadersInvalid;
             if (std.ascii.eqlIgnoreCase(header_name, "connection")) {
                 req.keep_alive = !std.ascii.eqlIgnoreCase(header_value, "close");
 @@ -291,6 +292,7 @@ pub const Request = struct {
                 if (iter.next()) |_| return error.HttpTransferEncodingUnsupported;
             }
         }
+        return error.HttpHeadersInvalid; // missing empty line
     }
     inline fn int64(array: *const [8]u8) u64 {