8cb7c19bf4
To audit access to our forgejo-instance we currently need to enable debug ssh-logs. It turns out a single log become multiple events in a k8s/container setup. To have our log-collectors properly join these events, we would like to indent them similar to what some stacktraces look like.
This PR would change
```
2025/09/08 07:18:53 ...eb/routing/logger.go:102:func1() [I] Serv Results:
IsWiki: %t
DeployKeyID: %d
KeyID: %d KeyName: %s
UserName: %s
UserID: %d
OwnerName: %s
RepoName: %s
RepoID: %d
```
to
```
2025/09/08 07:18:53 ...eb/routing/logger.go:102:func1() [I] Serv Results:
IsWiki: %t
DeployKeyID: %d
KeyID: %d KeyName: %s
UserName: %s
UserID: %d
OwnerName: %s
RepoName: %s
RepoID: %d
```
Furthermore to standardize user configuration of ssh-logs I have added `LOGGER_SSH_MODE` . It can be configured like router-logger. By doing so we can change the log-LEVEL to debug for ssh without changing other loggers. This would deprecate `ENABLE_SSH_LOG`.
## Checklist
The [contributor guide](https://forgejo.org/docs/next/contributor/) contains information that will be helpful to first time contributors. There also are a few [conditions for merging Pull Requests in Forgejo repositories](https://codeberg.org/forgejo/governance/src/branch/main/PullRequestsAgreement.md). You are also welcome to join the [Forgejo development chatroom](https://matrix.to/#/#forgejo-development:matrix.org).
### Documentation
- [ ] I created a pull request [to the documentation](https://codeberg.org/forgejo/docs) to explain to Forgejo users how to use this change.
- [x] I did not document these changes and I do not expect someone else to do it.
### Release notes
- [x] I do not want this change to show in the release notes.
- [ ] I want the title to show in the release notes with a link to this pull request.
- [ ] I want the content of the `release-notes/<pull request number>.md` to be be used for the release notes instead of the title.
<!--start release-notes-assistant-->
## Release notes
<!--URL:https://codeberg.org/forgejo/forgejo-->
- Features
- [PR](https://codeberg.org/forgejo/forgejo/pulls/9056): <!--number 9056 --><!--line 0 --><!--description ZmVhdChsb2cpOiBiZXR0ZXIgcGFyc2VhYmxlIGFuZCBjb25maWd1cmFibGUgc3NoLWxvZ3M=-->feat(log): better parseable and configurable ssh-logs<!--description-->
<!--end release-notes-assistant-->
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/9056
Reviewed-by: Lucas <sclu1034@noreply.codeberg.org>
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Co-authored-by: zokki <zokki.softwareschmiede@gmail.com>
Co-committed-by: zokki <zokki.softwareschmiede@gmail.com>
80 lines
2.5 KiB
Go
80 lines
2.5 KiB
Go
// Copyright 2019 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package log
|
|
|
|
import (
|
|
"bytes"
|
|
"fmt"
|
|
"os"
|
|
"runtime"
|
|
)
|
|
|
|
var unknown = []byte("???")
|
|
|
|
// Stack will skip back the provided number of frames and return a stack trace with source code.
|
|
// Although we could just use debug.Stack(), this routine will return the source code and
|
|
// skip back the provided number of frames - i.e. allowing us to ignore preceding function calls.
|
|
// A skip of 0 returns the stack trace for the calling function, not including this call.
|
|
// If the problem is a lack of memory of course all this is not going to work...
|
|
func Stack(skip int) string {
|
|
buf := new(bytes.Buffer)
|
|
|
|
// Store the last file we opened as its probable that the preceding stack frame
|
|
// will be in the same file
|
|
var lines [][]byte
|
|
var lastFilename string
|
|
for i := skip + 1; ; i++ { // Skip over frames
|
|
programCounter, filename, lineNumber, ok := runtime.Caller(i)
|
|
// If we can't retrieve the information break - basically we're into go internals at this point.
|
|
if !ok {
|
|
break
|
|
}
|
|
|
|
// Print equivalent of debug.Stack()
|
|
_, _ = fmt.Fprintf(buf, "\t%s:%d (0x%x)\n", filename, lineNumber, programCounter)
|
|
// Now try to print the offending line
|
|
if filename != lastFilename {
|
|
data, err := os.ReadFile(filename)
|
|
if err != nil {
|
|
// can't read this source file
|
|
// likely we don't have the sourcecode available
|
|
continue
|
|
}
|
|
lines = bytes.Split(data, []byte{'\n'})
|
|
lastFilename = filename
|
|
}
|
|
_, _ = fmt.Fprintf(buf, "\t\t%s: %s\n", functionName(programCounter), source(lines, lineNumber))
|
|
}
|
|
return buf.String()
|
|
}
|
|
|
|
// functionName converts the provided programCounter into a function name
|
|
func functionName(programCounter uintptr) []byte {
|
|
function := runtime.FuncForPC(programCounter)
|
|
if function == nil {
|
|
return unknown
|
|
}
|
|
name := []byte(function.Name())
|
|
|
|
// Because we provide the filename we can drop the preceding package name.
|
|
if lastslash := bytes.LastIndex(name, []byte("/")); lastslash >= 0 {
|
|
name = name[lastslash+1:]
|
|
}
|
|
// And the current package name.
|
|
if period := bytes.Index(name, []byte(".")); period >= 0 {
|
|
name = name[period+1:]
|
|
}
|
|
// And we should just replace the interpunct with a dot
|
|
name = bytes.ReplaceAll(name, []byte("·"), []byte("."))
|
|
return name
|
|
}
|
|
|
|
// source returns a space-trimmed slice of the n'th line.
|
|
func source(lines [][]byte, n int) []byte {
|
|
n-- // in stack trace, lines are 1-indexed but our array is 0-indexed
|
|
if n < 0 || n >= len(lines) {
|
|
return unknown
|
|
}
|
|
return bytes.TrimSpace(lines[n])
|
|
}
|