Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-24 03:05:39 +01:00
Code Issues Projects Releases Wiki Activity

fix[logger]:update log ID validation logic (#11351)

Browse Source 
Signed-off-by: Steven Zou <szou@vmware.com>
This commit is contained in:
Steven Zou 2020-03-31 00:08:55 +08:00 committed by GitHub
parent fc7a601142
commit f2beed577f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/jobservice/logger/getter/file_getter.go
View File

@ -6,6 +6,7 @@ import (
"fmt"
"io/ioutil"
"path"
"strings"
"github.com/goharbor/harbor/src/jobservice/errs"
@ -24,12 +25,8 @@ func NewFileGetter(baseDir string) *FileGetter {
// Retrieve implements @Interface.Retrieve
func (fg *FileGetter) Retrieve(logID string) ([]byte, error) {
if len(logID) != 24 {
return nil, errors.New("invalid length of log identify")
}
if _, err := hex.DecodeString(logID); err != nil {
return nil, errors.New("invalid log identify")
if err := isValidLogID(logID); err != nil {
return nil, err
}
fPath := path.Join(fg.baseDir, fmt.Sprintf("%s.log", logID))
@ -40,3 +37,21 @@ func (fg *FileGetter) Retrieve(logID string) ([]byte, error) {
return ioutil.ReadFile(fPath)
}
func isValidLogID(id string) error {
lid := id
segment := strings.LastIndex(lid, "@")
if segment != -1 {
lid = lid[:segment]
}
if len(lid) != 24 {
return errors.New("invalid length of log identify")
}
if _, err := hex.DecodeString(lid); err != nil {
return errors.New("invalid log identify")
}
return nil
}