From 252400a911a7c94bc5cd1590138d9d34ce925710 Mon Sep 17 00:00:00 2001
From: sultanofdisco <ohsujin712@gmail.com>
Date: Sat, 31 May 2025 14:39:20 +0900
Subject: [PATCH] =?UTF-8?q?nonceCheck=20=EC=88=98=EC=A0=952?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dist/plugin_package.zip                       | Bin 138874 -> 138993 bytes
 packages/backend/src/controller/nonceCheck.ts |  14 +++++---------
 packages/backend/src/index.ts                 |  12 +++++++++---
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/dist/plugin_package.zip b/dist/plugin_package.zip
index 1b3f2de848388ebb64e74f2d20219127856b5c5f..fe3427f734b31f302e79d45cdff5ded749d6d010 100644
GIT binary patch
delta 334
zcmeyhhvVa34xRvSW)?065D<`=$fLp}Ak%2nYQ(tJh-tnUtByiZYVq`oVobWzM48y8
zFA`@mo^B-0WXT_rpPicLlbV?AoRONGtv5YeoJoa6K}}6zdb>DN;Pf;>Cduh?5=^a{
zWr;-!dHH$CsbGc9`FSNp`8heMMGCeGd8y?JesHPnQze)#F*?+0T5~BV6sKhCrIw}U
zl@#mc=XvIpq!uNo7L){~78m5_6{l(>7FXsaD`*s_WE+88SO_ADH5F{_6so7ENHOU^
z+`WB*6jLLk#KF~{))>ezF@P|{vm6Wz3<5ISHD#D)Ffs|qOg}8kWWpyPvp))<bULdX
llYu-)Ofxj7H<pos0fc!$!34)sriaKeDX{6tF)=VO0052rT15Z=

delta 231
zcmeykm*dwS4xRvSW)?065O5Ql$fLsKCe~=wYQ(tJh-tpq^lM^Fx~!U-3e{ZG1!Eb-
zr|0o9NlmvCXELAOBF>~TeTz7gr%qaFUUErhex5=~YI1%`s%J__es*e}Mp0@ZNS}g2
zQEEwPQJ#X5k~LTDbY3wgsp(=8Os(55NiZE@oPJY^Nt01?dY>ed`F4A0CQn8Qp^b(g
zc1klbfH1^u91IK$ZerUP$S}=dWO5UmZY9TL!sjNoKMJ9AdW{^D0Z4A09Fq*A?DW%e
NObTpUWtkWl7yzJvJx>4t

diff --git a/packages/backend/src/controller/nonceCheck.ts b/packages/backend/src/controller/nonceCheck.ts
index 383ca90..a27a4d6 100644
--- a/packages/backend/src/controller/nonceCheck.ts
+++ b/packages/backend/src/controller/nonceCheck.ts
@@ -1,4 +1,4 @@
-import type { Request } from "caido:utils";
+import type { Request, Response } from "caido:utils";
 import { TokenLeakCheck } from "./tokenLeakCheck";
 
 export class NonceCheckController{
@@ -6,8 +6,8 @@ export class NonceCheckController{
      * 응답이 OIDC(OpenID Connect) 플로우인지 확인하는 메서드
      */
     
-    public static isOidcFlow(req: Request): boolean {
-        if(TokenLeakCheck.extractIdToken(req)) {
+    public static isOidcFlow(req: Request, res:Response): boolean {
+        if(TokenLeakCheck.extractIdToken(req, res)) {
             return true;
         }
         return false;
@@ -15,10 +15,10 @@ export class NonceCheckController{
 
   
     public static isNonceCheckRequest(req: Request): boolean {
-        const id_token = decodeIdToken(req);
+        const id_token = TokenLeakCheck.decodeIdToken(req);
 
         // 1. nonce 파라미터가 포함된 요청인지 확인
-        if (id_token.includes("nonce=")) {
+        if (id_token && id_token.includes("nonce=")) {
             return true;
         }
 
@@ -26,8 +26,4 @@ export class NonceCheckController{
     }
 }
 
-function decodeIdToken(req: Request): string {
-    // Implement actual decoding logic here. For now, return an empty string or mock value.
-    return "";
-}
 
diff --git a/packages/backend/src/index.ts b/packages/backend/src/index.ts
index 0ad8c01..00fdd51 100644
--- a/packages/backend/src/index.ts
+++ b/packages/backend/src/index.ts
@@ -1,5 +1,5 @@
 import type { SDK, DefineAPI } from "caido:plugin";
-import type { Request } from "caido:utils";
+import type { Request, Response } from "caido:utils";
 import { ImplicitGrantController } from "./controller/implictGrant";
 import { AuthZCodeGrantController } from "./controller/authZCodeGrant";
 import { NonceCheckController } from "./controller/nonceCheck";
@@ -8,6 +8,7 @@ export type API = DefineAPI<{}>;
 
 const implicitGrantController = new ImplicitGrantController();
 const authZCodeGrantController = new AuthZCodeGrantController();
+const nonceCheckController = new NonceCheckController();
 
 // function matchSSORequest(req: Request): boolean {
 //   const raw = req.getRaw().toString();
@@ -28,7 +29,8 @@ const authZCodeGrantController = new AuthZCodeGrantController();
 // }
 
 export function init(sdk: SDK<API>) {
-  sdk.events.onInterceptRequest(async (sdk, req: Request) => {
+  // 요청 이벤트
+  sdk.events.onInterceptRequest(async (sdk, req) => {
     const result =
       authZCodeGrantController.testReq(req) ||
       implicitGrantController.testReq(req);
@@ -41,8 +43,12 @@ export function init(sdk: SDK<API>) {
         reporter: "",
       });
     }
+  });
 
-    if(NonceCheckController.isOidcFlow(req)) {
+  // 응답 이벤트
+  sdk.events.onInterceptResponse(async (sdk, req, res) => {
+
+    if (NonceCheckController.isOidcFlow(req, res)) {
       await sdk.findings.create({
         title: "OIDC Flow Detected",
         description: "The request appears to be part of an OIDC flow.",