Commit 477864dca560b03bb3c3e8e7e1e50362e7ed681f | zig

author	Andrew Kelley <andrew@ziglang.org> 2022-12-27 23:30:43-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2023-01-02 16:57:16-07:00
log	477864dca560b03bb3c3e8e7e1e50362e7ed681f
tree	8c2baf47e3c9b478fd38fb5cc2b41edfc797ae8b
parent	ceb211e65fe6bfe864b1150d08cd5e0383f6c2c2

2 files changed, 10 insertions(+), 9 deletions(-)

lib/std/crypto/tls/Client.zig+6-3

 @@ -725,8 +725,11 @@ pub fn writeAll(c: *Client, stream: net.Stream, bytes: []const u8) !void {
 /// Returns number of bytes that have been read, which are now populated inside
 /// `buffer`. A return value of zero bytes does not necessarily mean end of
-/// stream.
+/// stream. Instead, the `eof` flag is set upon end of stream. The `eof` flag
+/// may be set after any call to `read`, including when greater than zero bytes
+/// are returned, and this function asserts that `eof` is `false`.
 pub fn read(c: *Client, stream: net.Stream, buffer: []u8) !usize {
+    assert(!c.eof);
     const prev_len = c.partially_read_len;
     var in_buf: [max_ciphertext_len * 4]u8 = undefined;
     mem.copy(u8, &in_buf, c.partially_read_buffer[0..prev_len]);
 @@ -738,8 +741,8 @@ pub fn read(c: *Client, stream: net.Stream, buffer: []u8) !usize {
     const actual_read_len = try stream.read(ask_slice);
     const frag = in_buf[0 .. prev_len + actual_read_len];
     if (frag.len == 0) {
-        c.eof = true;
+        // This is either a truncation attack, or a bug in the server.
-        return 0;
+        return error.TlsConnectionTruncated;
     }
     var in: usize = 0;
     var out: usize = 0;

lib/std/http/Client.zig+4-6

 @@ -66,13 +66,11 @@ pub const Request = struct {
         var index: usize = 0;
         while (index < len) {
             const amt = try req.read(buffer[index..]);
-            if (amt == 0) {
-                switch (req.protocol) {
-                    .http => break,
-                    .https => if (req.tls_client.eof) break,
-                }
-            }
             index += amt;
+            switch (req.protocol) {
+                .http => if (amt == 0) break,
+                .https => if (req.tls_client.eof) break,
+            }
         }
         return index;
     }