Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-12-31 13:08:05 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10973 from wy65701436/inlimited-robot

Browse Source 
add no expriation limited robot account
This commit is contained in:
Wang Yan 2020-03-09 11:30:21 +08:00 committed by GitHub
commit 7b8aca6cd2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/pkg/robot/controller.go
View File

@ -86,11 +86,15 @@ func (d *DefaultAPIController) CreateRobotAccount(robotReq *model.RobotCreate) (
ProjectID: robotReq.ProjectID,
Access: robotReq.Access,
StandardClaims: jwt.StandardClaims{
IssuedAt: time.Now().UTC().Unix(),
ExpiresAt: robotReq.ExpiresAt,
Issuer: opt.Issuer,
IssuedAt: time.Now().UTC().Unix(),
Issuer: opt.Issuer,
},
}
// "-1" means the robot account is a permanent account, no expiration time set.
// The ExpiresAt claim is optional, so if it's not set, it will still be considered a valid claim
if robot.ExpiresAt != -1 {
rClaims.ExpiresAt = robotReq.ExpiresAt
}
tk, err := token.New(opt, rClaims)
if err != nil {
deferDel = err

2
src/pkg/robot/controller_test.go
View File

@ -79,7 +79,7 @@ func (s *ControllerTestSuite) TestRobotAccount() {
robot2 := &model.RobotCreate{
Name: "robot2",
Description: "TestCreateRobotAccount",
ExpiresAt: expiresAt,
ExpiresAt: -1,
ProjectID: int64(1),
Access: policies,
}

4
src/pkg/robot/model/robot.go
View File

@ -68,8 +68,8 @@ func (rq *RobotCreate) Valid(v *validation.Validation) {
if utils.IsContainIllegalChar(rq.Name, []string{",", "~", "#", "$", "%"}) {
v.SetError("name", "robot name contains illegal characters")
}
if rq.ExpiresAt < 0 {
v.SetError("expires_at", "expiration time must be a positive integer if set")
if rq.ExpiresAt < -1 {
v.SetError("expires_at", "expiration time must be a positive integer or -1 if set")
}
}