aljaz/lndhub.go
1
1
Fork 0
mirror of https://github.com/getAlby/lndhub.go.git synced 2025-12-23 15:44:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

add user id to logs as json field

Browse Source
This commit is contained in:
kiwiidb
2023-05-23 19:30:32 +02:00
parent db74659dd0
commit cd7ee1cf7c
4 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
go.mod
View File

@@ -15,6 +15,7 @@ require (
github.com/labstack/gommon v0.4.0 github.com/labstack/gommon v0.4.0
github.com/lightningnetwork/lnd v0.15.5-beta.rc2 github.com/lightningnetwork/lnd v0.15.5-beta.rc2
github.com/rabbitmq/amqp091-go v1.6.1 github.com/rabbitmq/amqp091-go v1.6.1
github.com/rs/zerolog v1.28.0
github.com/stretchr/testify v1.8.1 github.com/stretchr/testify v1.8.1
github.com/uptrace/bun v1.1.10 github.com/uptrace/bun v1.1.10
github.com/uptrace/bun/dialect/pgdialect v1.1.10 github.com/uptrace/bun/dialect/pgdialect v1.1.10
@@ -24,7 +25,6 @@ require (
github.com/ziflex/lecho/v3 v3.3.0 github.com/ziflex/lecho/v3 v3.3.0
golang.org/x/crypto v0.5.0 golang.org/x/crypto v0.5.0
google.golang.org/grpc v1.52.0 google.golang.org/grpc v1.52.0
google.golang.org/protobuf v1.28.1
gopkg.in/DataDog/dd-trace-go.v1 v1.47.0 gopkg.in/DataDog/dd-trace-go.v1 v1.47.0
gopkg.in/macaroon.v2 v2.1.0 gopkg.in/macaroon.v2 v2.1.0
) )
@@ -131,7 +131,6 @@ require (
github.com/prometheus/common v0.39.0 // indirect github.com/prometheus/common v0.39.0 // indirect
github.com/prometheus/procfs v0.9.0 // indirect github.com/prometheus/procfs v0.9.0 // indirect
github.com/rogpeppe/fastuuid v1.2.0 // indirect github.com/rogpeppe/fastuuid v1.2.0 // indirect
github.com/rs/zerolog v1.28.0 // indirect
github.com/secure-systems-lab/go-securesystemslib v0.4.0 // indirect github.com/secure-systems-lab/go-securesystemslib v0.4.0 // indirect
github.com/sirupsen/logrus v1.9.0 // indirect github.com/sirupsen/logrus v1.9.0 // indirect
github.com/soheilhy/cmux v0.1.5 // indirect github.com/soheilhy/cmux v0.1.5 // indirect
@@ -175,6 +174,7 @@ require (
golang.org/x/term v0.4.0 // indirect golang.org/x/term v0.4.0 // indirect
golang.org/x/text v0.6.0 // indirect golang.org/x/text v0.6.0 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/errgo.v1 v1.0.1 // indirect gopkg.in/errgo.v1 v1.0.1 // indirect
gopkg.in/macaroon-bakery.v2 v2.3.0 // indirect gopkg.in/macaroon-bakery.v2 v2.3.0 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
@@ -190,7 +190,7 @@ require (
github.com/btcsuite/btcd/btcec/v2 v2.3.2 github.com/btcsuite/btcd/btcec/v2 v2.3.2
github.com/go-openapi/spec v0.20.8 // indirect github.com/go-openapi/spec v0.20.8 // indirect
github.com/go-openapi/swag v0.22.3 // indirect github.com/go-openapi/swag v0.22.3 // indirect
github.com/gorilla/websocket v1.5.0 github.com/gorilla/websocket v1.5.0 // indirect
github.com/labstack/echo-contrib v0.13.1 github.com/labstack/echo-contrib v0.13.1
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
github.com/swaggo/echo-swagger v1.3.5 github.com/swaggo/echo-swagger v1.3.5

8
legacy_endpoints.go
View File

@@ -10,13 +10,13 @@ import (
"golang.org/x/time/rate" "golang.org/x/time/rate"
) )
func RegisterLegacyEndpoints(svc *service.LndhubService, e *echo.Echo, secured *echo.Group, securedWithStrictRateLimit *echo.Group, strictRateLimitMiddleware echo.MiddlewareFunc, adminMw echo.MiddlewareFunc) { func RegisterLegacyEndpoints(svc *service.LndhubService, e *echo.Echo, secured *echo.Group, securedWithStrictRateLimit *echo.Group, strictRateLimitMiddleware echo.MiddlewareFunc, adminMw echo.MiddlewareFunc, logMw echo.MiddlewareFunc) {
// Public endpoints for account creation and authentication // Public endpoints for account creation and authentication
e.POST("/auth", controllers.NewAuthController(svc).Auth) e.POST("/auth", controllers.NewAuthController(svc).Auth, logMw)
if svc.Config.AllowAccountCreation { if svc.Config.AllowAccountCreation {
e.POST("/create", controllers.NewCreateUserController(svc).CreateUser, strictRateLimitMiddleware, adminMw) e.POST("/create", controllers.NewCreateUserController(svc).CreateUser, strictRateLimitMiddleware, adminMw, logMw)
} }
e.POST("/invoice/:user_login", controllers.NewInvoiceController(svc).Invoice, middleware.RateLimiter(middleware.NewRateLimiterMemoryStore(rate.Limit(svc.Config.DefaultRateLimit)))) e.POST("/invoice/:user_login", controllers.NewInvoiceController(svc).Invoice, middleware.RateLimiter(middleware.NewRateLimiterMemoryStore(rate.Limit(svc.Config.DefaultRateLimit))), logMw)
// Secured endpoints which require a Authorization token (JWT) // Secured endpoints which require a Authorization token (JWT)
secured.POST("/addinvoice", controllers.NewAddInvoiceController(svc).AddInvoice) secured.POST("/addinvoice", controllers.NewAddInvoiceController(svc).AddInvoice)

22
main.go
View File

@@ -13,6 +13,7 @@ import (
"time" "time"
"github.com/getAlby/lndhub.go/rabbitmq" "github.com/getAlby/lndhub.go/rabbitmq"
"github.com/rs/zerolog"
cache "github.com/SporkHubr/echo-http-cache" cache "github.com/SporkHubr/echo-http-cache"
"github.com/SporkHubr/echo-http-cache/adapter/memory" "github.com/SporkHubr/echo-http-cache/adapter/memory"
@@ -131,9 +132,6 @@ func main() {
e.Logger = logger e.Logger = logger
e.Use(middleware.RequestID()) e.Use(middleware.RequestID())
e.Use(lecho.Middleware(lecho.Config{
Logger: logger,
}))
// Setup exception tracking with Sentry if configured // Setup exception tracking with Sentry if configured
// sentry init needs to happen before the echo middlewares are added // sentry init needs to happen before the echo middlewares are added
@@ -186,13 +184,14 @@ func main() {
InvoicePubSub: service.NewPubsub(), InvoicePubSub: service.NewPubsub(),
} }
logMw := createLoggingMiddleware(logger)
// strict rate limit for requests for sending payments // strict rate limit for requests for sending payments
strictRateLimitMiddleware := createRateLimitMiddleware(c.StrictRateLimit, c.BurstRateLimit) strictRateLimitMiddleware := createRateLimitMiddleware(c.StrictRateLimit, c.BurstRateLimit)
secured := e.Group("", tokens.Middleware(c.JWTSecret)) secured := e.Group("", tokens.Middleware(c.JWTSecret), logMw)
securedWithStrictRateLimit := e.Group("", tokens.Middleware(c.JWTSecret), strictRateLimitMiddleware) securedWithStrictRateLimit := e.Group("", tokens.Middleware(c.JWTSecret), strictRateLimitMiddleware, logMw)
RegisterLegacyEndpoints(svc, e, secured, securedWithStrictRateLimit, strictRateLimitMiddleware, tokens.AdminTokenMiddleware(c.AdminToken)) RegisterLegacyEndpoints(svc, e, secured, securedWithStrictRateLimit, strictRateLimitMiddleware, tokens.AdminTokenMiddleware(c.AdminToken), logMw)
RegisterV2Endpoints(svc, e, secured, securedWithStrictRateLimit, strictRateLimitMiddleware, tokens.AdminTokenMiddleware(c.AdminToken)) RegisterV2Endpoints(svc, e, secured, securedWithStrictRateLimit, strictRateLimitMiddleware, tokens.AdminTokenMiddleware(c.AdminToken), logMw)
//Swagger API spec //Swagger API spec
docs.SwaggerInfo.Host = c.Host docs.SwaggerInfo.Host = c.Host
@@ -307,6 +306,15 @@ func main() {
svc.Logger.Info("LNDhub exiting gracefully. Goodbye.") svc.Logger.Info("LNDhub exiting gracefully. Goodbye.")
} }
func createLoggingMiddleware(logger *lecho.Logger) echo.MiddlewareFunc {
return lecho.Middleware(lecho.Config{
Logger: logger,
Enricher: func(c echo.Context, logger zerolog.Context) zerolog.Context {
return logger.Interface("UserID", c.Get("UserID"))
},
})
}
func createRateLimitMiddleware(requestsPerSecond int, burst int) echo.MiddlewareFunc { func createRateLimitMiddleware(requestsPerSecond int, burst int) echo.MiddlewareFunc {
config := middleware.RateLimiterConfig{ config := middleware.RateLimiterConfig{
Store: middleware.NewRateLimiterMemoryStoreWithConfig( Store: middleware.NewRateLimiterMemoryStoreWithConfig(

4
v2_endpoints.go
View File

@@ -6,11 +6,11 @@ import (
"github.com/labstack/echo/v4" "github.com/labstack/echo/v4"
) )
func RegisterV2Endpoints(svc *service.LndhubService, e *echo.Echo, secured *echo.Group, securedWithStrictRateLimit *echo.Group, strictRateLimitMiddleware echo.MiddlewareFunc, adminMw echo.MiddlewareFunc) { func RegisterV2Endpoints(svc *service.LndhubService, e *echo.Echo, secured *echo.Group, securedWithStrictRateLimit *echo.Group, strictRateLimitMiddleware echo.MiddlewareFunc, adminMw echo.MiddlewareFunc, logMw echo.MiddlewareFunc) {
// TODO: v2 auth endpoint: generalized oauth token generation // TODO: v2 auth endpoint: generalized oauth token generation
// e.POST("/auth", controllers.NewAuthController(svc).Auth) // e.POST("/auth", controllers.NewAuthController(svc).Auth)
if svc.Config.AllowAccountCreation { if svc.Config.AllowAccountCreation {
e.POST("/v2/users", v2controllers.NewCreateUserController(svc).CreateUser, strictRateLimitMiddleware, adminMw) e.POST("/v2/users", v2controllers.NewCreateUserController(svc).CreateUser, strictRateLimitMiddleware, adminMw, logMw)
} }
invoiceCtrl := v2controllers.NewInvoiceController(svc) invoiceCtrl := v2controllers.NewInvoiceController(svc)
keysendCtrl := v2controllers.NewKeySendController(svc) keysendCtrl := v2controllers.NewKeySendController(svc)