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

Merge pull request #5521 from wy65701436/cherry-pick-gas

Browse Source 
Cherry-pick -- Fix security issue found by gas
This commit is contained in:
Wenkai Yin 2018-08-03 16:50:58 +08:00 committed by GitHub
commit 5faf41e4a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/http/modifier/auth/auth.go
View File

@ -42,6 +42,6 @@ func (s *SecretAuthorizer) Modify(req *http.Request) error {
if req == nil { if req == nil {
return errors.New("the request is null") return errors.New("the request is null")
} }
secret.AddToRequest(req, s.secret) err := secret.AddToRequest(req, s.secret)
return nil return err
} }

4
src/jobservice/period/sweeper.go
View File

@ -41,7 +41,9 @@ func (s *Sweeper) ClearOutdatedScheduledJobs() error {
r, err := conn.Do("SET", utils.KeyPeriodicLock(s.namespace), time.Now().Unix(), "EX", 30, "NX") r, err := conn.Do("SET", utils.KeyPeriodicLock(s.namespace), time.Now().Unix(), "EX", 30, "NX")
defer func() { defer func() {
//Make sure it can be unlocked if it is not expired yet //Make sure it can be unlocked if it is not expired yet
conn.Do("DEL", utils.KeyPeriodicLock(s.namespace)) if _, err := conn.Do("DEL", utils.KeyPeriodicLock(s.namespace)); err != nil {
logger.Errorf("Unlock key '%s' failed with error: %s\n", utils.KeyPeriodicLock(s.namespace), err.Error())
}
}() }()
if err != nil { if err != nil {
return err return err