mirror of
https://github.com/cloudflare/cloudflared.git
synced 2026-06-23 04:10:20 +00:00
7585e38948
Check / check (1.22.x, macos-latest) (push) Has been cancelled
Check / check (1.22.x, ubuntu-latest) (push) Has been cancelled
Check / check (1.22.x, windows-latest) (push) Has been cancelled
Semgrep config / semgrep/ci (push) Has been cancelled
Fixing warnings in cloudflared log collector. This attempts to fix errors like the ones shown below: ``` diagnostic/diagnostic.go:132:23: Error return value of `logHandle.Close` is not checked (errcheck) defer logHandle.Close() diagnostic/diagnostic.go:134:26: G303: File creation in shared tmp directory without using ioutil.Tempfile (gosec) outputLogHandle, err := os.Create(filepath.Join(os.TempDir(), logFilename)) ```
114 lines
2.6 KiB
Go
114 lines
2.6 KiB
Go
package diagnostic
|
|
|
|
import (
|
|
"fmt"
|
|
"io"
|
|
"os"
|
|
"os/exec"
|
|
"path/filepath"
|
|
)
|
|
|
|
func PipeCommandOutputToFile(command *exec.Cmd, outputHandle *os.File) (*LogInformation, error) {
|
|
stdoutReader, err := command.StdoutPipe()
|
|
if err != nil {
|
|
return nil, fmt.Errorf(
|
|
"error retrieving stdout from command '%s': %w",
|
|
command.String(),
|
|
err,
|
|
)
|
|
}
|
|
|
|
stderrReader, err := command.StderrPipe()
|
|
if err != nil {
|
|
return nil, fmt.Errorf(
|
|
"error retrieving stderr from command '%s': %w",
|
|
command.String(),
|
|
err,
|
|
)
|
|
}
|
|
|
|
if err := command.Start(); err != nil {
|
|
return nil, fmt.Errorf(
|
|
"error running command '%s': %w",
|
|
command.String(),
|
|
err,
|
|
)
|
|
}
|
|
|
|
_, err = io.Copy(outputHandle, stdoutReader)
|
|
if err != nil {
|
|
return nil, fmt.Errorf(
|
|
"error copying stdout from %s to file %s: %w",
|
|
command.String(),
|
|
outputHandle.Name(),
|
|
err,
|
|
)
|
|
}
|
|
|
|
_, err = io.Copy(outputHandle, stderrReader)
|
|
if err != nil {
|
|
return nil, fmt.Errorf(
|
|
"error copying stderr from %s to file %s: %w",
|
|
command.String(),
|
|
outputHandle.Name(),
|
|
err,
|
|
)
|
|
}
|
|
|
|
if err := command.Wait(); err != nil {
|
|
return nil, fmt.Errorf(
|
|
"error waiting from command '%s': %w",
|
|
command.String(),
|
|
err,
|
|
)
|
|
}
|
|
|
|
return NewLogInformation(outputHandle.Name(), true, false), nil
|
|
}
|
|
|
|
func CopyFilesFromDirectory(path string) (string, error) {
|
|
const defaultLogFilename = "cloudflared.log"
|
|
|
|
// rolling logs have as suffix the current date thus
|
|
// when iterating the path files they are already in
|
|
// chronological order
|
|
files, err := os.ReadDir(path)
|
|
if err != nil {
|
|
return "", fmt.Errorf("error reading directory %s: %w", path, err)
|
|
}
|
|
|
|
// nolint: gosec
|
|
outputHandle, err := os.Create(filepath.Join(os.TempDir(), logFilename))
|
|
if err != nil {
|
|
return "", fmt.Errorf("creating temporary log file %s: %w", logFilename, err)
|
|
}
|
|
defer func() { _ = outputHandle.Close() }()
|
|
|
|
for _, file := range files {
|
|
// nolint: gosec
|
|
logHandle, err := os.Open(filepath.Join(path, file.Name()))
|
|
if err != nil {
|
|
return "", fmt.Errorf("error opening file %s: %w", file.Name(), err)
|
|
}
|
|
_, err = io.Copy(outputHandle, logHandle)
|
|
_ = logHandle.Close()
|
|
if err != nil {
|
|
return "", fmt.Errorf("error copying file %s: %w", file.Name(), err)
|
|
}
|
|
}
|
|
|
|
// nolint: gosec
|
|
logHandle, err := os.Open(filepath.Join(path, defaultLogFilename))
|
|
if err != nil {
|
|
return "", fmt.Errorf("error opening file %s:%w", defaultLogFilename, err)
|
|
}
|
|
defer func() { _ = logHandle.Close() }()
|
|
|
|
_, err = io.Copy(outputHandle, logHandle)
|
|
if err != nil {
|
|
return "", fmt.Errorf("error copying file %s:%w", logHandle.Name(), err)
|
|
}
|
|
|
|
return outputHandle.Name(), nil
|
|
}
|