feat(audit): wire request-meta middleware and writer initialization
This commit is contained in:
parent
f308fd830a
commit
eea2ecbc72
|
|
@ -19,6 +19,7 @@ package initialize
|
||||||
import (
|
import (
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"code.vikunja.io/api/pkg/audit"
|
||||||
"code.vikunja.io/api/pkg/config"
|
"code.vikunja.io/api/pkg/config"
|
||||||
"code.vikunja.io/api/pkg/cron"
|
"code.vikunja.io/api/pkg/cron"
|
||||||
"code.vikunja.io/api/pkg/db"
|
"code.vikunja.io/api/pkg/db"
|
||||||
|
|
@ -98,6 +99,12 @@ func FullInitWithoutAsync() {
|
||||||
// See the package comment in pkg/license/license.go before removing.
|
// See the package comment in pkg/license/license.go before removing.
|
||||||
license.Init()
|
license.Init()
|
||||||
|
|
||||||
|
if config.AuditEnabled.GetBool() {
|
||||||
|
if err := audit.Init(); err != nil {
|
||||||
|
log.Fatalf("Could not initialize audit logging: %s", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Start the mail daemon
|
// Start the mail daemon
|
||||||
mail.StartMailDaemon()
|
mail.StartMailDaemon()
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,45 @@
|
||||||
|
// Vikunja is a to-do list application to facilitate your life.
|
||||||
|
// Copyright 2018-present Vikunja and contributors. All rights reserved.
|
||||||
|
//
|
||||||
|
// This program is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU Affero General Public License as published by
|
||||||
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU Affero General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU Affero General Public License
|
||||||
|
// along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
package middleware
|
||||||
|
|
||||||
|
import (
|
||||||
|
"code.vikunja.io/api/pkg/events"
|
||||||
|
|
||||||
|
"github.com/labstack/echo/v5"
|
||||||
|
)
|
||||||
|
|
||||||
|
// RequestMeta stashes IP, User-Agent and X-Request-ID on the request context
|
||||||
|
// so events dispatched while handling the request carry them as message
|
||||||
|
// metadata (consumed by the audit listeners).
|
||||||
|
func RequestMeta() echo.MiddlewareFunc {
|
||||||
|
return func(next echo.HandlerFunc) echo.HandlerFunc {
|
||||||
|
return func(c *echo.Context) error {
|
||||||
|
req := c.Request()
|
||||||
|
requestID := req.Header.Get(echo.HeaderXRequestID)
|
||||||
|
if requestID == "" {
|
||||||
|
requestID = c.Response().Header().Get(echo.HeaderXRequestID)
|
||||||
|
}
|
||||||
|
ctx := events.WithRequestMeta(req.Context(), &events.RequestMeta{
|
||||||
|
IP: c.RealIP(),
|
||||||
|
UserAgent: req.UserAgent(),
|
||||||
|
RequestID: requestID,
|
||||||
|
})
|
||||||
|
c.SetRequest(req.WithContext(ctx))
|
||||||
|
return next(c)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -199,6 +199,10 @@ func NewEcho() *echo.Echo {
|
||||||
// handler binds them. Runs globally so both /api/v1 and /api/v2 benefit.
|
// handler binds them. Runs globally so both /api/v1 and /api/v2 benefit.
|
||||||
e.Use(vmiddleware.NormalizeArrayParams())
|
e.Use(vmiddleware.NormalizeArrayParams())
|
||||||
|
|
||||||
|
if config.AuditEnabled.GetBool() {
|
||||||
|
e.Use(vmiddleware.RequestMeta())
|
||||||
|
}
|
||||||
|
|
||||||
setupSentry(e)
|
setupSentry(e)
|
||||||
|
|
||||||
// Validation
|
// Validation
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue