From aa20a12917e06cc687778cccbd85b9dba6a6b440 Mon Sep 17 00:00:00 2001 From: CodeShell <122738806+CodeShellDev@users.noreply.github.com> Date: Sat, 8 Nov 2025 09:39:28 +0100 Subject: [PATCH 01/10] add debugs --- internals/proxy/middlewares/mapping.go | 1 + internals/proxy/middlewares/message.go | 1 + internals/proxy/middlewares/template.go | 1 + 3 files changed, 3 insertions(+) diff --git a/internals/proxy/middlewares/mapping.go b/internals/proxy/middlewares/mapping.go index 53f7a01..f2cad4d 100644 --- a/internals/proxy/middlewares/mapping.go +++ b/internals/proxy/middlewares/mapping.go @@ -64,6 +64,7 @@ func mappingHandler(next http.Handler) http.Handler { err := body.Write(req) if err != nil { + log.Error("Could write to Request Body: ", err.Error()) http.Error(w, "Internal Error", http.StatusInternalServerError) return } diff --git a/internals/proxy/middlewares/message.go b/internals/proxy/middlewares/message.go index 481c216..fb51b12 100644 --- a/internals/proxy/middlewares/message.go +++ b/internals/proxy/middlewares/message.go @@ -63,6 +63,7 @@ func messageHandler(next http.Handler) http.Handler { err := body.Write(req) if err != nil { + log.Error("Could write to Request Body: ", err.Error()) http.Error(w, "Internal Error", http.StatusInternalServerError) return } diff --git a/internals/proxy/middlewares/template.go b/internals/proxy/middlewares/template.go index 9ab980d..def3401 100644 --- a/internals/proxy/middlewares/template.go +++ b/internals/proxy/middlewares/template.go @@ -75,6 +75,7 @@ func templateHandler(next http.Handler) http.Handler { err := body.Write(req) if err != nil { + log.Error("Could write to Request Body: ", err.Error()) http.Error(w, "Internal Error", http.StatusInternalServerError) return } From e821ab1545ad5ef85719bd55f3c711527eeaa388 Mon Sep 17 00:00:00 2001 From: CodeShell <122738806+CodeShellDev@users.noreply.github.com> Date: Sat, 8 Nov 2025 09:44:49 +0100 Subject: [PATCH 02/10] update loglines --- internals/proxy/middlewares/mapping.go | 2 +- internals/proxy/middlewares/message.go | 2 +- internals/proxy/middlewares/template.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internals/proxy/middlewares/mapping.go b/internals/proxy/middlewares/mapping.go index f2cad4d..1dd055c 100644 --- a/internals/proxy/middlewares/mapping.go +++ b/internals/proxy/middlewares/mapping.go @@ -64,7 +64,7 @@ func mappingHandler(next http.Handler) http.Handler { err := body.Write(req) if err != nil { - log.Error("Could write to Request Body: ", err.Error()) + log.Error("Could not write to Request Body: ", err.Error()) http.Error(w, "Internal Error", http.StatusInternalServerError) return } diff --git a/internals/proxy/middlewares/message.go b/internals/proxy/middlewares/message.go index fb51b12..5749171 100644 --- a/internals/proxy/middlewares/message.go +++ b/internals/proxy/middlewares/message.go @@ -63,7 +63,7 @@ func messageHandler(next http.Handler) http.Handler { err := body.Write(req) if err != nil { - log.Error("Could write to Request Body: ", err.Error()) + log.Error("Could not write to Request Body: ", err.Error()) http.Error(w, "Internal Error", http.StatusInternalServerError) return } diff --git a/internals/proxy/middlewares/template.go b/internals/proxy/middlewares/template.go index def3401..f44726f 100644 --- a/internals/proxy/middlewares/template.go +++ b/internals/proxy/middlewares/template.go @@ -75,7 +75,7 @@ func templateHandler(next http.Handler) http.Handler { err := body.Write(req) if err != nil { - log.Error("Could write to Request Body: ", err.Error()) + log.Error("Could not write to Request Body: ", err.Error()) http.Error(w, "Internal Error", http.StatusInternalServerError) return } From ca732d45cae27637ac6e6299c7a6357eae5c39dd Mon Sep 17 00:00:00 2001 From: CodeShell <122738806+CodeShellDev@users.noreply.github.com> Date: Sat, 8 Nov 2025 09:49:24 +0100 Subject: [PATCH 03/10] check for empty body --- internals/proxy/middlewares/message.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/internals/proxy/middlewares/message.go b/internals/proxy/middlewares/message.go index 5749171..eaff2cb 100644 --- a/internals/proxy/middlewares/message.go +++ b/internals/proxy/middlewares/message.go @@ -57,6 +57,8 @@ func messageHandler(next http.Handler) http.Handler { } } + log.Dev("IsBodyEmpty: ", modifiedBody) + if modifiedBody { body.Data = bodyData From bec016873c616580ee02425adcbcc947825eaa55 Mon Sep 17 00:00:00 2001 From: CodeShell <122738806+CodeShellDev@users.noreply.github.com> Date: Sat, 8 Nov 2025 09:53:23 +0100 Subject: [PATCH 04/10] debug message templates --- internals/proxy/middlewares/message.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internals/proxy/middlewares/message.go b/internals/proxy/middlewares/message.go index eaff2cb..3558b2f 100644 --- a/internals/proxy/middlewares/message.go +++ b/internals/proxy/middlewares/message.go @@ -41,6 +41,9 @@ func messageHandler(next http.Handler) http.Handler { if !body.Empty { bodyData = body.Data + log.Dev("Template: ", messageTemplate) + log.Dev("BodyData: ", bodyData) + if messageTemplate != "" { headerData := request.GetReqHeaders(req) @@ -57,8 +60,6 @@ func messageHandler(next http.Handler) http.Handler { } } - log.Dev("IsBodyEmpty: ", modifiedBody) - if modifiedBody { body.Data = bodyData From 0dc36b936a8756fbe20275fca11d8af435f05652 Mon Sep 17 00:00:00 2001 From: CodeShell <122738806+CodeShellDev@users.noreply.github.com> Date: Sat, 8 Nov 2025 10:02:18 +0100 Subject: [PATCH 05/10] debug empty body --- internals/proxy/middlewares/message.go | 3 ++- utils/request/request.go | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/internals/proxy/middlewares/message.go b/internals/proxy/middlewares/message.go index 3558b2f..acbc8df 100644 --- a/internals/proxy/middlewares/message.go +++ b/internals/proxy/middlewares/message.go @@ -36,13 +36,14 @@ func messageHandler(next http.Handler) http.Handler { bodyData := map[string]any{} + log.Dev("BodyData: ", body.Data) + var modifiedBody bool if !body.Empty { bodyData = body.Data log.Dev("Template: ", messageTemplate) - log.Dev("BodyData: ", bodyData) if messageTemplate != "" { headerData := request.GetReqHeaders(req) diff --git a/utils/request/request.go b/utils/request/request.go index 8dd8514..47539c1 100644 --- a/utils/request/request.go +++ b/utils/request/request.go @@ -9,6 +9,7 @@ import ( "strconv" "strings" + "github.com/codeshelldev/secured-signal-api/utils/logger" "github.com/codeshelldev/secured-signal-api/utils/query" ) @@ -149,6 +150,7 @@ func GetReqBody(req *http.Request) (Body, error) { var isEmpty bool if err != nil { + logger.Dev("Error getting Body: ", err.Error()) return Body{Empty: true}, err } From 2d2690550bb59ebb4013599672052d0de025cf71 Mon Sep 17 00:00:00 2001 From: CodeShell <122738806+CodeShellDev@users.noreply.github.com> Date: Sat, 8 Nov 2025 11:00:15 +0100 Subject: [PATCH 06/10] remove debugs --- internals/proxy/middlewares/message.go | 4 ---- utils/request/request.go | 2 -- 2 files changed, 6 deletions(-) diff --git a/internals/proxy/middlewares/message.go b/internals/proxy/middlewares/message.go index acbc8df..5749171 100644 --- a/internals/proxy/middlewares/message.go +++ b/internals/proxy/middlewares/message.go @@ -36,15 +36,11 @@ func messageHandler(next http.Handler) http.Handler { bodyData := map[string]any{} - log.Dev("BodyData: ", body.Data) - var modifiedBody bool if !body.Empty { bodyData = body.Data - log.Dev("Template: ", messageTemplate) - if messageTemplate != "" { headerData := request.GetReqHeaders(req) diff --git a/utils/request/request.go b/utils/request/request.go index 47539c1..8dd8514 100644 --- a/utils/request/request.go +++ b/utils/request/request.go @@ -9,7 +9,6 @@ import ( "strconv" "strings" - "github.com/codeshelldev/secured-signal-api/utils/logger" "github.com/codeshelldev/secured-signal-api/utils/query" ) @@ -150,7 +149,6 @@ func GetReqBody(req *http.Request) (Body, error) { var isEmpty bool if err != nil { - logger.Dev("Error getting Body: ", err.Error()) return Body{Empty: true}, err } From a9d1624f220ff690a2a1638f5e8d47cbef1708dc Mon Sep 17 00:00:00 2001 From: CodeShell <122738806+CodeShellDev@users.noreply.github.com> Date: Sat, 8 Nov 2025 11:27:58 +0100 Subject: [PATCH 07/10] debug --- internals/proxy/middlewares/template.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/internals/proxy/middlewares/template.go b/internals/proxy/middlewares/template.go index f44726f..5ac3b73 100644 --- a/internals/proxy/middlewares/template.go +++ b/internals/proxy/middlewares/template.go @@ -188,6 +188,8 @@ func TemplateBody(body map[string]any, headers map[string][]string, VARIABLES ma maps.Copy(variables, prefixedBody) maps.Copy(variables, prefixedHeaders) + log.Dev(normalizedBody) + templatedData, err := templating.RenderJSON("body", normalizedBody, variables) if err != nil { From 2a3ff52cfaf5e8e73dbcf6b8eb26f2881cf4b25e Mon Sep 17 00:00:00 2001 From: CodeShell <122738806+CodeShellDev@users.noreply.github.com> Date: Sat, 8 Nov 2025 11:34:59 +0100 Subject: [PATCH 08/10] testing --- internals/proxy/middlewares/template.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internals/proxy/middlewares/template.go b/internals/proxy/middlewares/template.go index 5ac3b73..6055a55 100644 --- a/internals/proxy/middlewares/template.go +++ b/internals/proxy/middlewares/template.go @@ -188,7 +188,7 @@ func TemplateBody(body map[string]any, headers map[string][]string, VARIABLES ma maps.Copy(variables, prefixedBody) maps.Copy(variables, prefixedHeaders) - log.Dev(normalizedBody) + log.Dev(variables) templatedData, err := templating.RenderJSON("body", normalizedBody, variables) From 812fe29aed037a7075a1700ded581d83a7f4eb23 Mon Sep 17 00:00:00 2001 From: CodeShell <122738806+CodeShellDev@users.noreply.github.com> Date: Sat, 8 Nov 2025 11:42:51 +0100 Subject: [PATCH 09/10] stop VARIABLES mutating --- internals/proxy/middlewares/template.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/internals/proxy/middlewares/template.go b/internals/proxy/middlewares/template.go index 6055a55..5ac13fd 100644 --- a/internals/proxy/middlewares/template.go +++ b/internals/proxy/middlewares/template.go @@ -183,7 +183,9 @@ func TemplateBody(body map[string]any, headers map[string][]string, VARIABLES ma // Prefix Header Data with header_key_ prefixedHeaders := prefixData("header_key_", request.ParseHeaders(headers)) - variables := VARIABLES + variables := map[string]any{} + + maps.Copy(variables, VARIABLES) maps.Copy(variables, prefixedBody) maps.Copy(variables, prefixedHeaders) From 8c7cca3614184e84db0874d06eb377ae02f37d04 Mon Sep 17 00:00:00 2001 From: CodeShell <122738806+CodeShellDev@users.noreply.github.com> Date: Sat, 8 Nov 2025 11:51:12 +0100 Subject: [PATCH 10/10] remove debug --- internals/proxy/middlewares/template.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internals/proxy/middlewares/template.go b/internals/proxy/middlewares/template.go index 5ac13fd..9d8ae0f 100644 --- a/internals/proxy/middlewares/template.go +++ b/internals/proxy/middlewares/template.go @@ -190,8 +190,6 @@ func TemplateBody(body map[string]any, headers map[string][]string, VARIABLES ma maps.Copy(variables, prefixedBody) maps.Copy(variables, prefixedHeaders) - log.Dev(variables) - templatedData, err := templating.RenderJSON("body", normalizedBody, variables) if err != nil {