sim1222-mirror/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-08-19 07:04:10 +09:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix: avoid hash uuid

Browse Source
This commit is contained in:
Jason Song
2022-11-29 11:42:03 +08:00
parent 797c21de1f
commit 3ac6bf3db4
4 changed files with 39 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
models/bots/task.go
View File

@ -17,14 +17,12 @@ import (
auth_model "code.gitea.io/gitea/models/auth"
"code.gitea.io/gitea/models/db"
"code.gitea.io/gitea/modules/base"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/timeutil"
"code.gitea.io/gitea/modules/util"
runnerv1 "code.gitea.io/bots-proto-go/runner/v1"
gouuid "github.com/google/uuid"
lru "github.com/hashicorp/golang-lru"
"github.com/nektos/act/pkg/jobparser"
"google.golang.org/protobuf/types/known/timestamppb"
@ -190,16 +188,9 @@ func (task *Task) LoadAttributes(ctx context.Context) error {
return nil
}
func (task *Task) GenerateToken() error {
salt, err := util.CryptoRandomString(10)
if err != nil {
return err
}
task.TokenSalt = salt
task.Token = base.EncodeSha1(gouuid.New().String())
task.TokenHash = auth_model.HashToken(task.Token, task.TokenSalt)
task.TokenLastEight = task.Token[len(task.Token)-8:]
return nil
func (task *Task) GenerateToken() (err error) {
task.Token, task.TokenSalt, task.TokenHash, task.TokenLastEight, err = generateSaltedToken()
return err
}
type LogIndexes []int64