From 2a8afa017ebe328bd5e89590a976ac57f65e6f2f Mon Sep 17 00:00:00 2001
From: deatil <2217957370@qq.com>
Date: Fri, 21 Feb 2025 01:36:20 +0800
Subject: [PATCH] fixed

---
 src/jwt.zig   | 31 +++++++++++++++++++---
 src/token.zig | 72 +++++++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 89 insertions(+), 14 deletions(-)

diff --git a/src/jwt.zig b/src/jwt.zig
index de054c9..6ab520a 100644
--- a/src/jwt.zig
+++ b/src/jwt.zig
@@ -196,16 +196,16 @@ test "parse JWTTypeInvalid" {
 test "parse JWTSignatureInvalid" {
     const alloc = std.heap.page_allocator;
 
-    const kp = eddsa.Ed25519.KeyPair.generate();
+    const kp = ecdsa.ecdsa.EcdsaP256Sha256.KeyPair.generate();
 
     const token_string = "eyJ0eXAiOiJKV1QiLCJhbGciOiJFUzI1NiJ9.eyJhdWQiOiJleGFtcGxlLmNvbSIsImlhdCI6ImZvbyJ9.dGVzdC1zaWduYXR1cmU";
 
-    const p = SigningMethodEdDSA.init(alloc);
+    const p = SigningMethodES256.init(alloc);
 
     var need_true: bool = false;
     _ = p.parse(token_string, kp.public_key) catch |err| {
         need_true = true;
-        try testing.expectEqual(Error.JWTAlgoInvalid, err);
+        try testing.expectEqual(Error.JWTSignatureInvalid, err);
     };
     try testing.expectEqual(true, need_true);
 
@@ -665,3 +665,28 @@ test "getTokenHeader" {
     try testing.expectEqualStrings("ES256", header.alg);
 
 }
+
+test "SigningMethodES256 with JWTClaims" {
+    const alloc = std.heap.page_allocator;
+
+    const kp = ecdsa.ecdsa.EcdsaP256Sha256.KeyPair.generate();
+
+    const claims: JWTClaims = .{
+        .aud = "example.com",
+        .sub = "foo",
+    };
+
+    const s = SigningMethodES256.init(alloc);
+    const token_string = try s.make(claims, kp.secret_key);
+    try testing.expectEqual(true, token_string.len > 0);
+
+    // ==========
+
+    const p = SigningMethodES256.init(alloc);
+    var parsed = try p.parse(token_string, kp.public_key);
+
+    const claims2 = try parsed.getClaims();
+    try testing.expectEqualStrings(claims.aud.?, claims2.object.get("aud").?.string);
+    try testing.expectEqualStrings(claims.sub.?, claims2.object.get("sub").?.string);
+
+}
diff --git a/src/token.zig b/src/token.zig
index 15ee463..eb70593 100644
--- a/src/token.zig
+++ b/src/token.zig
@@ -18,6 +18,7 @@ pub const Token = struct {
     pub const Header = struct {
         typ: []const u8,
         alg: []const u8,
+        kid: ?[]const u8 = null,
     };
 
     pub fn init(alloc: Allocator) Self {
@@ -98,17 +99,29 @@ pub const Token = struct {
 
         var typ: []const u8 = "";
         if (header.object.get("typ")) |jwt_type| {
-            typ = jwt_type.string;
+            if (jwt_type == .string) {
+                typ = jwt_type.string;
+            }
         }
 
         var alg: []const u8 = "";
         if (header.object.get("alg")) |jwt_alg| {
-            alg = jwt_alg.string;
+            if (jwt_alg == .string) {
+                alg = jwt_alg.string;
+            }
+        }
+
+        var kid: []const u8 = "";
+        if (header.object.get("kid")) |jwt_kid| {
+            if (jwt_kid == .string) {
+                kid = jwt_kid.string;
+            }
         }
 
         return .{
             .typ = typ,
             .alg = alg,
+            .kid = kid,
         };
     }
 
@@ -125,10 +138,11 @@ pub const Token = struct {
        const claims = try self.getClaims();
 
         if (claims.object.get("nbf")) |jwt_nbf| {
-            const nbf = jwt_nbf.integer;
-
-            if (now > nbf) {
-                return true;
+            if (jwt_nbf == .integer) {
+                const nbf = jwt_nbf.integer;
+                if (now > nbf) {
+                    return true;
+                }
             }
         }
 
@@ -139,14 +153,15 @@ pub const Token = struct {
        const claims = try self.getClaims();
 
         if (claims.object.get("exp")) |jwt_exp| {
-            const exp = jwt_exp.integer;
-
-            if (now > exp) {
-                return true;
+            if (jwt_exp == .integer) {
+                const exp = jwt_exp.integer;
+                if (now <= exp) {
+                    return false;
+                }
             }
         }
 
-        return false;
+        return true;
     }
 
 };
@@ -240,6 +255,41 @@ test "Token 2" {
     try testing.expectEqualStrings(check1, res1);
 }
 
+test "Token 3" {
+    const alloc = std.heap.page_allocator;
+
+    const header: Token.Header = .{
+        .typ = "JWE",
+        .alg = "ES256",
+        .kid = "kids",
+    };
+    const claims = .{
+        .aud = "example.com",
+        .iat = "foo",
+    };
+    const signature = "test-signature";
+
+    const check1 = "eyJ0eXAiOiJKV0UiLCJhbGciOiJFUzI1NiIsImtpZCI6ImtpZHMifQ.eyJhdWQiOiJleGFtcGxlLmNvbSIsImlhdCI6ImZvbyJ9.dGVzdC1zaWduYXR1cmU";
+
+    var token = Token.init(alloc);
+    try token.setHeader(header);
+    try token.setClaims(claims);
+    try token.setSignature(signature);
+
+    defer token.deinit();
+
+    const res1 = try token.signedString();
+    try testing.expectEqualStrings(check1, res1);
+
+    // ================
+
+    var token2 = Token.init(alloc);
+    try token2.parse(check1);
+
+    const header2 = try token2.getHeader();
+    try testing.expectEqualStrings(header.kid.?, header2.kid.?);
+}
+
 test "Token isExpired" {
     const alloc = std.heap.page_allocator;