Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-27 20:59:10 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #11370 from heww/fix-issue-11198

Browse Source 
fix(scan): add scanner name as prefix for name of the robot when submit scan job
This commit is contained in:
He Weiwei 2020-03-31 19:23:28 +08:00 committed by GitHub
commit 1a7cad3a14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/controller/scan/base_controller.go
View File

@ -509,7 +509,7 @@ func (bc *basicController) GetStats(requester string) (*all.Stats, error) {
}
// makeRobotAccount creates a robot account based on the arguments for scanning.
func (bc *basicController) makeRobotAccount(projectID int64, repository string) (*model.Robot, error) {
func (bc *basicController) makeRobotAccount(projectID int64, repository string, registration *scanner.Registration) (*model.Robot, error) {
// Use uuid as name to avoid duplicated entries.
UUID, err := bc.uuid()
if err != nil {
@ -518,7 +518,7 @@ func (bc *basicController) makeRobotAccount(projectID int64, repository string)
resource := rbac.NewProjectNamespace(projectID).Resource(rbac.ResourceRepository)
robotReq := &model.RobotCreate{
Name: UUID,
Name: fmt.Sprintf("%s-%s", registration.Name, UUID),
Description: "for scan",
ProjectID: projectID,
Access: []*types.Policy{
@ -549,7 +549,7 @@ func (bc *basicController) launchScanJob(trackID string, artifact *ar.Artifact,
return "", errors.Wrap(err, "scan controller: launch scan job")
}
robot, err := bc.makeRobotAccount(artifact.ProjectID, artifact.RepositoryName)
robot, err := bc.makeRobotAccount(artifact.ProjectID, artifact.RepositoryName, registration)
if err != nil {
return "", errors.Wrap(err, "scan controller: launch scan job")
}

7
src/controller/scan/base_controller_test.go
View File

@ -22,7 +22,6 @@ import (
"testing"
"time"
"github.com/goharbor/harbor/src/common"
cj "github.com/goharbor/harbor/src/common/job"
jm "github.com/goharbor/harbor/src/common/job/models"
"github.com/goharbor/harbor/src/common/rbac"
@ -173,7 +172,7 @@ func (suite *ControllerTestSuite) SetupSuite() {
{Resource: types.Resource(resource), Action: rbac.ActionScannerPull},
}
rname := "the-uuid-123"
rname := fmt.Sprintf("%s-%s", suite.registration.Name, "the-uuid-123")
account := &model.RobotCreate{
Name: rname,
Description: "for scan",
@ -182,7 +181,7 @@ func (suite *ControllerTestSuite) SetupSuite() {
}
rc.On("CreateRobotAccount", account).Return(&model.Robot{
ID: 1,
Name: common.RobotPrefix + rname,
Name: rname,
Token: "robot-account",
Description: "for scan",
ProjectID: suite.artifact.ProjectID,
@ -192,7 +191,7 @@ func (suite *ControllerTestSuite) SetupSuite() {
req := &v1.ScanRequest{
Registry: &v1.Registry{
URL: "https://core.com",
Authorization: "Basic " + base64.StdEncoding.EncodeToString([]byte(common.RobotPrefix+"the-uuid-123:robot-account")),
Authorization: "Basic " + base64.StdEncoding.EncodeToString([]byte(rname+":robot-account")),
},
Artifact: &v1.Artifact{
NamespaceID: suite.artifact.ProjectID,