Merge pull request #31 from bradcypert/bradcypert/#29-parse-http-version

parse HTTP version and use it in curl requests

Author: bradcypert

build.zig.zon

@@ -45,8 +45,8 @@
             .hash = "regex-0.1.2-axC350bnAQCyrPkH2IEfri8hebJO6IujGY1rhcgZBXpL",
         },
         .curl = .{
-            .url = "git+https://github.com/jiacai2050/zig-curl/?ref=HEAD#df369a2925a57446cb3147def4e11e6782452dbd",
-            .hash = "curl-0.3.1-P4tT4X_LAAB-rzh6tsg_j9OSokOCTt6pK4DxFUYUwC7K",
+            .url = "git+https://github.com/jiacai2050/zig-curl/?ref=HEAD#1a23d311582c1e72bdb9ec3020f82b8e2a4b8c8a",
+            .hash = "curl-0.3.1-P4tT4cPNAAAZsLz5AsgitsBp3W0uVpoFT7IeNX2qOQlP",
         },
     },
     .paths = .{

src/httpfile/assertion_checker.zig

@@ -327,6 +327,7 @@ test "Assertion checker with diagnostics - all pass" {
         .headers = .empty,
         .assertions = assertions,
         .body = null,
+        .version = .@"HTTP/1.1",
     };
 
     var response_headers = std.StringHashMap([]const u8).init(allocator);
@@ -381,6 +382,7 @@ test "Assertion checker with not_equal - all pass" {
         .headers = .empty,
         .assertions = assertions,
         .body = null,
+        .version = .@"HTTP/1.1",
     };
 
     var response_headers = std.StringHashMap([]const u8).init(allocator);
@@ -435,6 +437,7 @@ test "Assertion checker with failures - collects all failures" {
         .headers = .empty,
         .assertions = assertions,
         .body = null,
+        .version = .@"HTTP/1.1",
     };
 
     var response_headers = std.StringHashMap([]const u8).init(allocator);
@@ -493,6 +496,7 @@ test "HttpParser supports starts_with for status, body, and header" {
         .headers = .empty,
         .assertions = assertions,
         .body = null,
+        .version = .@"HTTP/1.1",
     };
 
     var response_headers = std.StringHashMap([]const u8).init(allocator);
@@ -556,6 +560,7 @@ test "HttpParser supports matches_regex and not_matches_regex for status, body,
         .headers = .empty,
         .assertions = assertions,
         .body = null,
+        .version = .@"HTTP/1.1",
     };
 
     var response_headers = std.StringHashMap([]const u8).init(allocator);
@@ -605,6 +610,7 @@ test "HttpParser supports contains and not_contains for headers" {
         .headers = .empty,
         .assertions = assertions,
         .body = null,
+        .version = .@"HTTP/1.1",
     };
 
     var response_headers = std.StringHashMap([]const u8).init(allocator);

src/httpfile/http_client.zig

@@ -70,6 +70,7 @@ pub const HttpClient = struct {
         const easy = try curl.Easy.init(.{
             .ca_bundle = ca_bundle,
         });
+
         defer easy.deinit();
 
         var writer = std.Io.Writer.Allocating.init(self.allocator);
@@ -90,6 +91,20 @@ pub const HttpClient = struct {
 
         const url = try self.allocator.dupeZ(u8, request.url);
         defer self.allocator.free(url);
+        switch (request.version) {
+            .@"HTTP/1.0" => {
+                try easy.setHttpVersion(.http1_0);
+            },
+            .@"HTTP/1.1" => {
+                try easy.setHttpVersion(.http1_1);
+            },
+            .@"HTTP/2" => {
+                try easy.setHttpVersion(.http2);
+            },
+            .@"HTTP/3" => {
+                try easy.setHttpVersion(.http3);
+            },
+        }
         const resp = try easy.fetch(url, .{
             .method = try map_method_for_curl(request.method orelse return error.RequestMethodNotSet),
             // TODO: Is it possible to remove the ptrCast?

src/httpfile/parser.zig

@@ -36,13 +36,21 @@ pub const Assertion = struct {
     assertion_type: AssertionType,
 };
 
+pub const HttpVersion = enum {
+    @"HTTP/1.0",
+    @"HTTP/1.1",
+    @"HTTP/2",
+    @"HTTP/3",
+};
+
 pub const HttpRequest = struct {
     // TODO: Null HTTP METHOD SHOULD NOT BE CRITICAL TO PROPERLY PARSING
     method: ?http.Method,
     url: []const u8,
     headers: ArrayList(http.Header),
     body: ?[]u8,
     assertions: ArrayList(Assertion),
+    version: HttpVersion,
     // TODO: Add a name for the request if needed.
 
     pub fn init() HttpRequest {
@@ -52,6 +60,7 @@ pub const HttpRequest = struct {
             .headers = .empty,
             .body = null,
             .assertions = .empty,
+            .version = .@"HTTP/1.1",
         };
     }
 
@@ -136,8 +145,12 @@ pub fn parseContent(allocator: Allocator, content: []const u8) !ArrayList(HttpRe
             var tokens = std.mem.tokenizeScalar(u8, trimmed_line, ' ');
             const method_str = tokens.next() orelse return error.InvalidRequestMissingMethod;
             const url = tokens.next() orelse return error.InvalidRequestMissingURL;
+            const version = tokens.next();
             current_request.method = std.meta.stringToEnum(http.Method, method_str) orelse null;
             current_request.url = try allocator.dupe(u8, url);
+            if (version) |v| {
+                current_request.version = std.meta.stringToEnum(HttpVersion, v) orelse return error.InvalidHttpVersion;
+            }
             state = .headers;
             continue;
         }
@@ -171,7 +184,7 @@ pub fn parseContent(allocator: Allocator, content: []const u8) !ArrayList(HttpRe
 
 test "HttpParser from String Contents" {
     const test_http_contents =
-        \\GET https://api.example.com
+        \\GET https://api.example.com HTTP/3
         \\Accept: */*
         \\Authorization: Bearer ABC123
         \\
@@ -199,6 +212,7 @@ test "HttpParser from String Contents" {
     try std.testing.expectEqual(http.Method.POST, requests.items[1].method);
     try std.testing.expectEqualStrings("https://api.example.com", requests.items[0].url);
     try std.testing.expectEqualStrings("https://api.example.com/users", requests.items[1].url);
+    try std.testing.expectEqual(HttpVersion.@"HTTP/3", requests.items[0].version);
     try std.testing.expectEqualStrings("Authorization", requests.items[0].headers.items[1].name);
     try std.testing.expectEqualStrings("Bearer ABC123", requests.items[0].headers.items[1].value);
     try std.testing.expectEqualStrings("Authorization", requests.items[1].headers.items[1].name);