From edab21990f49b4cf58fc6fccd0504ddc3ffa7cdc Mon Sep 17 00:00:00 2001 From: itzaname Date: Fri, 27 Jun 2025 22:21:49 -0400 Subject: [PATCH] Add request logging --- go.mod | 2 +- go.sum | 6 ++++++ pkg/api/middleware/validate.go | 2 ++ pkg/rpc/dev.go | 12 ++++++++++++ 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 89bb3a0..cdb65dd 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module git.itzana.me/StrafesNET/dev-service go 1.24.0 require ( - git.itzana.me/strafesnet/go-grpc v0.0.0-20250622145054-0c0eb0ba26c7 + git.itzana.me/strafesnet/go-grpc v0.0.0-20250628021738-df0a4ad40969 git.itzana.me/strafesnet/utils v0.0.0-20220716194944-d8ca164052f9 github.com/gin-gonic/gin v1.10.0 github.com/sirupsen/logrus v1.9.3 diff --git a/go.sum b/go.sum index a2773cc..9281dce 100644 --- a/go.sum +++ b/go.sum @@ -4,6 +4,12 @@ git.itzana.me/strafesnet/go-grpc v0.0.0-20250622012600-01ac9fdf02d8 h1:QHlKFYqiN git.itzana.me/strafesnet/go-grpc v0.0.0-20250622012600-01ac9fdf02d8/go.mod h1:X7XTRUScRkBWq8q8bplbeso105RPDlnY7J6Wy1IwBMs= git.itzana.me/strafesnet/go-grpc v0.0.0-20250622145054-0c0eb0ba26c7 h1:k6Skqr00NOo9Do9Z5rxqzRSR+1BR/bY93+Lf86QlFV8= git.itzana.me/strafesnet/go-grpc v0.0.0-20250622145054-0c0eb0ba26c7/go.mod h1:X7XTRUScRkBWq8q8bplbeso105RPDlnY7J6Wy1IwBMs= +git.itzana.me/strafesnet/go-grpc v0.0.0-20250628013406-d2e2e2321173 h1:xpsiAdDUWonTnKOfsh1A21Z3fcg7yqdPdY2VkBqXk7M= +git.itzana.me/strafesnet/go-grpc v0.0.0-20250628013406-d2e2e2321173/go.mod h1:X7XTRUScRkBWq8q8bplbeso105RPDlnY7J6Wy1IwBMs= +git.itzana.me/strafesnet/go-grpc v0.0.0-20250628013837-4e32e54728f4 h1:MXSHyP51n1EVovNIAzMYtKIMuu2I6DDb4vCwvBQjRqI= +git.itzana.me/strafesnet/go-grpc v0.0.0-20250628013837-4e32e54728f4/go.mod h1:X7XTRUScRkBWq8q8bplbeso105RPDlnY7J6Wy1IwBMs= +git.itzana.me/strafesnet/go-grpc v0.0.0-20250628021738-df0a4ad40969 h1:bGfsRi9WrklI5cwvfvI/jJAGa3PQgJVNAzseFBW56mY= +git.itzana.me/strafesnet/go-grpc v0.0.0-20250628021738-df0a4ad40969/go.mod h1:X7XTRUScRkBWq8q8bplbeso105RPDlnY7J6Wy1IwBMs= git.itzana.me/strafesnet/utils v0.0.0-20220716194944-d8ca164052f9 h1:7lU6jyR7S7Rhh1dnUp7GyIRHUTBXZagw8F4n4hOyxLw= git.itzana.me/strafesnet/utils v0.0.0-20220716194944-d8ca164052f9/go.mod h1:uyYerSieEt4v0MJCdPLppG0LtJ4Yj035vuTetWGsxjY= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= diff --git a/pkg/api/middleware/validate.go b/pkg/api/middleware/validate.go index 0860de0..84f132a 100644 --- a/pkg/api/middleware/validate.go +++ b/pkg/api/middleware/validate.go @@ -36,6 +36,8 @@ func ValidateRequest(service, permission string, conn *grpc.ClientConn) gin.Hand Service: service, Permission: permission, Key: apiKey, + IP: ctx.ClientIP(), + Resource: ctx.Request.URL.String(), }) if err != nil { diff --git a/pkg/rpc/dev.go b/pkg/rpc/dev.go index 9e134ec..76f7c6b 100644 --- a/pkg/rpc/dev.go +++ b/pkg/rpc/dev.go @@ -3,6 +3,7 @@ package rpc import ( "context" "fmt" + log "github.com/sirupsen/logrus" "net/http" "time" @@ -76,6 +77,17 @@ func (d Dev) Validate(ctx context.Context, request *dev.APIValidationRequest) (* return buildResponse(appCache, limit, true, "", 0), nil } + log.WithFields(log.Fields{ + "service": request.Service, + "permission": request.Permission, + "resource": request.Resource, + "ip": request.IP, + "user": appCache.UserID, + "application": appCache.Name, + }).Info( + "request accepted", + ) + return buildResponse(appCache, limit, false, ErrUnauthorized, http.StatusUnauthorized), nil }