Skip to content

Allow passing a callback function for error handling in auditing filter. #164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Gerrit91 merged 2 commits into from
Feb 12, 2025
Merged

Allow passing a callback function for error handling in auditing filter. #164

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
879b43f
Allow passing a callback function for error handling in auditing filter.
Gerrit91 Feb 3, 2025
fee92dc
Merge branch 'master' into error-callback-for-auditing-http-filter
Gerrit91 Feb 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 32 additions & 4 deletions auditing/auditing-interceptor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,10 +366,38 @@ func NewConnectInterceptor(a Auditing, logger *slog.Logger, shouldAudit func(ful
}, nil
}

func HttpFilter(a Auditing, logger *slog.Logger) (restful.FilterFunction, error) {
type (
httpFilterOpt interface{}

httpFilterErrorCallback struct {
callback func(err error, response *restful.Response)
}
)

func NewHttpFilterErrorCallback(callback func(err error, response *restful.Response)) *httpFilterErrorCallback {
return &httpFilterErrorCallback{callback: callback}
}

func HttpFilter(a Auditing, logger *slog.Logger, opts ...httpFilterOpt) (restful.FilterFunction, error) {
if a == nil {
return nil, fmt.Errorf("cannot use nil auditing to create http middleware")
}

errorCallback := func(err error, response *restful.Response) {
if err := response.WriteError(http.StatusInternalServerError, err); err != nil {
logger.Error("unable to write http response", "error", err)
}
}

for _, opt := range opts {
switch o := opt.(type) {
case *httpFilterErrorCallback:
errorCallback = o.callback
default:
return nil, fmt.Errorf("unknown filter option: %T", opt)
}
}

return func(request *restful.Request, response *restful.Response, chain *restful.FilterChain) {
r := request.Request

Expand Down Expand Up @@ -441,7 +469,7 @@ func HttpFilter(a Auditing, logger *slog.Logger) (restful.FilterFunction, error)
r.Body = io.NopCloser(bytes.NewReader(body))
if err != nil {
logger.Error("unable to read request body", "error", err)
response.WriteHeader(http.StatusInternalServerError)
errorCallback(err, response)
return
}
err = json.Unmarshal(body, &auditReqContext.Body)
Expand All @@ -453,7 +481,7 @@ func HttpFilter(a Auditing, logger *slog.Logger) (restful.FilterFunction, error)
err := a.Index(auditReqContext)
if err != nil {
logger.Error("unable to index", "error", err)
response.WriteHeader(http.StatusInternalServerError)
errorCallback(err, response)
return
}

Expand All @@ -478,7 +506,7 @@ func HttpFilter(a Auditing, logger *slog.Logger) (restful.FilterFunction, error)
err = a.Index(auditReqContext)
if err != nil {
logger.Error("unable to index", "error", err)
response.WriteHeader(http.StatusInternalServerError)
errorCallback(err, response)
return
}
}, nil
Expand Down