-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added: - stacktrace to log entry - cmd flag to enable/disable stacktrace (by default stacktrace enabled, stacktrace log level = error) To disable stacktrace in logs, one should explicitly provide `--enable-stacktrace=false` flag or set corresponding env var (`ENABLE_STACKTRACE=false`). Fixed: - fallback to default logger, if context does not contain logger - sensitive data in logged tls v1.Secret is now omitted Fixes: #235 --------- Signed-off-by: Artem Bortnikov <artem.bortnikov@telekom.com>
- Loading branch information
Showing
8 changed files
with
354 additions
and
66 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,142 @@ | ||
/* | ||
Copyright 2024 The etcd-operator Authors. | ||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
package log | ||
|
||
import ( | ||
"context" | ||
"io" | ||
"log/slog" | ||
"os" | ||
"slices" | ||
"strings" | ||
"time" | ||
|
||
corev1 "k8s.io/api/core/v1" | ||
) | ||
|
||
var sensitiveDataKeys = []string{"key", "crt", "password", "secret", "token"} | ||
|
||
const sensitiveDataReplacement = "OMITTED" | ||
|
||
type Handler struct { | ||
slog.Handler | ||
writer io.Writer | ||
level slog.Leveler | ||
stacktraceEnabled bool | ||
stacktraceLevel slog.Leveler | ||
} | ||
|
||
func NewHandler(opts ...Option) *Handler { | ||
handler := &Handler{ | ||
writer: os.Stdout, | ||
level: slog.LevelInfo, | ||
stacktraceLevel: slog.LevelError, | ||
} | ||
applyForHandler(handler, opts...) | ||
handler.Handler = slog.NewJSONHandler(handler.writer, &slog.HandlerOptions{ | ||
Level: handler.level, | ||
ReplaceAttr: replaceCommonKeyValues, | ||
}) | ||
|
||
return handler | ||
} | ||
|
||
func (h *Handler) stacktrace(level slog.Level) bool { | ||
return h.stacktraceEnabled && level >= h.stacktraceLevel.Level() | ||
} | ||
|
||
func (h *Handler) Enabled(ctx context.Context, level slog.Level) bool { | ||
return h.Handler.Enabled(ctx, level) | ||
} | ||
|
||
func (h *Handler) Handle(ctx context.Context, r slog.Record) error { | ||
if h.stacktrace(r.Level) { | ||
trace := getStacktrace(4) | ||
r.AddAttrs(slog.Attr{Key: "stacktrace", Value: slog.AnyValue(trace)}) | ||
} | ||
return h.Handler.Handle(ctx, r) | ||
} | ||
|
||
func (h *Handler) WithAttrs(attrs []slog.Attr) slog.Handler { | ||
redacted := make([]slog.Attr, 0) | ||
for _, attr := range attrs { | ||
redacted = append(redacted, redactAttr(attr)) | ||
} | ||
handler := h.clone() | ||
handler.Handler = handler.Handler.WithAttrs(redacted) | ||
return handler | ||
} | ||
|
||
func (h *Handler) WithGroup(name string) slog.Handler { | ||
handler := h.clone() | ||
handler.Handler = handler.Handler.WithGroup(name) | ||
return handler | ||
} | ||
|
||
func (h *Handler) clone() *Handler { | ||
return &Handler{ | ||
Handler: h.Handler, | ||
writer: h.writer, | ||
level: h.level, | ||
stacktraceEnabled: h.stacktraceEnabled, | ||
stacktraceLevel: h.stacktraceLevel, | ||
} | ||
} | ||
|
||
func replaceCommonKeyValues(_ []string, a slog.Attr) slog.Attr { | ||
if a.Key == slog.MessageKey { | ||
a.Key = "message" | ||
return a | ||
} | ||
if a.Key == slog.TimeKey { | ||
v := a.Value | ||
t := v.Time().Format(time.RFC3339) | ||
a.Value = slog.StringValue(t) | ||
} | ||
return a | ||
} | ||
|
||
func redactAttr(attr slog.Attr) slog.Attr { | ||
// more redacting function could be added | ||
redacted := redactKubernetesSecretAttr(attr) | ||
return redacted | ||
} | ||
|
||
func redactKubernetesSecretAttr(attr slog.Attr) slog.Attr { | ||
val := attr.Value.Any() | ||
sec, ok := val.(*corev1.Secret) | ||
if !ok { | ||
return attr | ||
} | ||
res := sec.DeepCopy() | ||
data := res.Data | ||
for k, v := range data { | ||
if !slices.ContainsFunc(sensitiveDataKeys, func(s string) bool { | ||
return strings.Contains(k, s) | ||
}) { | ||
data[k] = v | ||
continue | ||
} | ||
data[k] = []byte(sensitiveDataReplacement) | ||
} | ||
|
||
res.Data = data | ||
return slog.Attr{ | ||
Key: attr.Key, | ||
Value: slog.AnyValue(res), | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.