Skip to content

cherry-pick #7045 fix(security): fix cwe-276, (parts of)cwe-22 #7047

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
d4x1 merged 1 commit into from
Feb 28, 2024
Merged

cherry-pick #7045 fix(security): fix cwe-276, (parts of)cwe-22 #7047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion backend/impls/logruslog/stream.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ func GetFileStream(path string) (io.Writer, errors.Error) {
if err != nil {
return nil, errors.Convert(err)
}
file, err := os.OpenFile(path, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0777)
file, err := os.OpenFile(path, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0644)
if err != nil {
return nil, errors.Convert(err)
}
Expand Down
22 changes: 7 additions & 15 deletions backend/test/helper/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,16 @@ import (

// IsWSL FIXME
func IsWSL() bool {
lines, err := readFile("/proc/version")
file, err := os.Open("/proc/version")
if err != nil {
return false
}
defer file.Close()
var lines []string
scanner := bufio.NewScanner(file)
for scanner.Scan() {
lines = append(lines, scanner.Text())
}
for _, line := range lines {
l := strings.ToLower(line)
if strings.Contains(l, "microsoft") {
Expand Down Expand Up @@ -85,17 +91,3 @@ func Contains[T any](list []T, elem any) bool {
}
return false
}

func readFile(path string) ([]string, error) {
file, err := os.Open(path)
if err != nil {
return nil, err
}
defer file.Close()
var lines []string
scanner := bufio.NewScanner(file)
for scanner.Scan() {
lines = append(lines, scanner.Text())
}
return lines, scanner.Err()
}