mirror of
https://github.com/optim-enterprises-bv/kubernetes.git
synced 2025-11-03 03:38:15 +00:00
16817e8f4f
Using securejoin.SecureJoin() ensures that paths are bound within a given root, but it doesn't protect from changes happening between the construction of the path and its use. securejoin 0.3 introduces a new Linux-specific API which avoids this by making rooted open operations explicit; this migrates kubelet's log retrieval to use that. Signed-off-by: Stephen Kitt <skitt@redhat.com>
109 lines
3.1 KiB
Go
109 lines
3.1 KiB
Go
//go:build linux
|
|
|
|
/*
|
|
Copyright 2022 The Kubernetes 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 kubelet
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"io"
|
|
"os"
|
|
"os/exec"
|
|
"strings"
|
|
|
|
securejoin "github.com/cyphar/filepath-securejoin"
|
|
unix "golang.org/x/sys/unix"
|
|
)
|
|
|
|
// getLoggingCmd returns the journalctl cmd and arguments for the given nodeLogQuery and boot. Note that
|
|
// services are explicitly passed here to account for the heuristics
|
|
func getLoggingCmd(n *nodeLogQuery, services []string) (string, []string, error) {
|
|
args := []string{
|
|
"--utc",
|
|
"--no-pager",
|
|
"--output=short-precise",
|
|
}
|
|
if n.SinceTime != nil {
|
|
args = append(args, fmt.Sprintf("--since=%s", n.SinceTime.Format(dateLayout)))
|
|
}
|
|
if n.UntilTime != nil {
|
|
args = append(args, fmt.Sprintf("--until=%s", n.UntilTime.Format(dateLayout)))
|
|
}
|
|
if n.TailLines != nil {
|
|
args = append(args, "--pager-end", fmt.Sprintf("--lines=%d", *n.TailLines))
|
|
}
|
|
for _, service := range services {
|
|
if len(service) > 0 {
|
|
args = append(args, "--unit="+service)
|
|
}
|
|
}
|
|
if len(n.Pattern) > 0 {
|
|
args = append(args, "--grep="+n.Pattern)
|
|
}
|
|
|
|
if n.Boot != nil {
|
|
args = append(args, "--boot", fmt.Sprintf("%d", *n.Boot))
|
|
}
|
|
|
|
return "journalctl", args, nil
|
|
}
|
|
|
|
// checkForNativeLogger checks journalctl output for a service
|
|
func checkForNativeLogger(ctx context.Context, service string) bool {
|
|
// This will return all the journald units
|
|
cmd := exec.CommandContext(ctx, "journalctl", []string{"--field", "_SYSTEMD_UNIT"}...)
|
|
output, err := cmd.CombinedOutput()
|
|
if err != nil {
|
|
// Returning false to allow checking if the service is logging to a file
|
|
return false
|
|
}
|
|
|
|
// journalctl won't return an error if we try to fetch logs for a non-existent service,
|
|
// hence we search for it in the list of services known to journalctl
|
|
return strings.Contains(string(output), service+".service")
|
|
}
|
|
|
|
// heuristicsCopyFileLog returns the contents of the given logFile
|
|
func heuristicsCopyFileLog(ctx context.Context, w io.Writer, logDir, logFileName string) error {
|
|
f, err := securejoin.OpenInRoot(logDir, logFileName)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
// Ignoring errors when closing a file opened read-only doesn't cause data loss
|
|
defer func() { _ = f.Close() }()
|
|
fInfo, err := f.Stat()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
// This is to account for the heuristics where logs for service foo
|
|
// could be in /var/log/foo/
|
|
if fInfo.IsDir() {
|
|
return os.ErrNotExist
|
|
}
|
|
rf, err := securejoin.Reopen(f, unix.O_RDONLY)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer func() { _ = rf.Close() }()
|
|
|
|
if _, err := io.Copy(w, newReaderCtx(ctx, rf)); err != nil {
|
|
return err
|
|
}
|
|
return nil
|
|
}
|