Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-09-29 22:07:32 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4230 from stonezdj/project_member_refactor2

Browse Source 
Refactor project member
This commit is contained in:
Daniel Jiang 2018-02-27 14:33:26 +08:00 committed by GitHub
commit ef54647749
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 202 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
make/photon/db/registry.sql
View File

@ -82,19 +82,19 @@ insert into project (owner_id, name, creation_time, update_time) values
(1, 'library', NOW(), NOW());
create table project_member (
id int not null AUTO_INCREMENT,
project_id int NOT NULL,
user_id int NOT NULL,
entity_id int NOT NULL,
entity_type char NOT NULL, ## u for user, g for user group
role int NOT NULL,
creation_time timestamp,
update_time timestamp,
PRIMARY KEY (project_id, user_id),
FOREIGN KEY (role) REFERENCES role(role_id),
FOREIGN KEY (project_id) REFERENCES project(project_id),
FOREIGN KEY (user_id) REFERENCES user(user_id)
creation_time timestamp default CURRENT_TIMESTAMP,
update_time timestamp default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
PRIMARY KEY (id),
CONSTRAINT unique_project_entity_type UNIQUE (project_id, entity_id, entity_type)
);
insert into project_member (project_id, user_id, role, creation_time, update_time) values
(1, 1, 1, NOW(), NOW());
insert into project_member (project_id, entity_id, role, entity_type) values
(1, 1, 1, 'u');
create table project_metadata (
id int NOT NULL AUTO_INCREMENT,
@ -112,6 +112,19 @@ create table project_metadata (
insert into project_metadata (id, project_id, name, value, creation_time, update_time, deleted) values
(1, 1, 'public', 'true', NOW(), NOW(), 0);
create table user_group
(
id int NOT NULL AUTO_INCREMENT,
group_name varchar(255) NOT NULL,
group_type int default 0,
group_property varchar(512) NOT NULL,
creation_time timestamp default CURRENT_TIMESTAMP,
update_time timestamp default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
PRIMARY KEY (id)
);
create table access_log (
log_id int NOT NULL AUTO_INCREMENT,
username varchar (255) NOT NULL,

31
make/photon/db/registry_sqlite.sql
View File

@ -59,7 +59,16 @@ create table user (
insert into user (username, email, password, realname, comment, deleted, sysadmin_flag, creation_time, update_time) values
('admin', 'admin@example.com', '', 'system admin', 'admin user',0, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
('anonymous', 'anonymous@example.com', '', 'anonymous user', 'anonymous user', 1, 0, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
create table user_group (
id INTEGER PRIMARY KEY,
group_name varchar(255) NOT NULL,
group_type int default 0,
group_property varchar(512) NOT NULL,
creation_time timestamp default CURRENT_TIMESTAMP,
update_time timestamp default CURRENT_TIMESTAMP
);
create table project (
project_id INTEGER PRIMARY KEY,
owner_id int NOT NULL,
@ -78,20 +87,21 @@ create table project (
insert into project (owner_id, name, creation_time, update_time) values
(1, 'library', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
create table project_member (
id INTEGER PRIMARY KEY,
project_id int NOT NULL,
user_id int NOT NULL,
entity_id int NOT NULL,
entity_type char NOT NULL,
role int NOT NULL,
creation_time timestamp,
update_time timestamp,
PRIMARY KEY (project_id, user_id),
FOREIGN KEY (role) REFERENCES role(role_id),
FOREIGN KEY (project_id) REFERENCES project(project_id),
FOREIGN KEY (user_id) REFERENCES user(user_id)
creation_time timestamp default CURRENT_TIMESTAMP,
update_time timestamp default CURRENT_TIMESTAMP,
UNIQUE (project_id, entity_id, entity_type)
);
insert into project_member (project_id, user_id, role, creation_time, update_time) values
(1, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
insert into project_member (project_id, entity_id, role, entity_type) values
(1, 1, 1, 'u');
create table project_metadata (
id INTEGER PRIMARY KEY,
@ -235,3 +245,4 @@ create table alembic_version (
);
insert into alembic_version values ('1.4.0');

2
src/common/const.go
View File

@ -84,4 +84,6 @@ const (
CfgDriverJSON = "json"
NewHarborAdminName = "admin@harbor.local"
RegistryStorageProviderName = "registry_storage_provider_name"
UserMember = "u"
GroupMember = "g"
)

3
src/common/dao/base.go
View File

@ -133,7 +133,8 @@ func paginateForRawSQL(sql string, limit, offset int64) string {
return fmt.Sprintf("%s limit %d offset %d", sql, limit, offset)
}
func escape(str string) string {
//Escape ..
func Escape(str string) string {
str = strings.Replace(str, `%`, `\%`, -1)
str = strings.Replace(str, `_`, `\_`, -1)
return str

23
src/common/dao/dao_test.go
View File

@ -49,7 +49,7 @@ func cleanByUser(username string) {
err = execUpdate(o, `delete
from project_member
where user_id = (
where entity_id = (
select user_id
from user
where username = ?
@ -661,7 +661,7 @@ func TestGetUserByProject(t *testing.T) {
}
func TestGetUserProjectRoles(t *testing.T) {
r, err := GetUserProjectRoles(currentUser.UserID, currentProject.ProjectID)
r, err := GetUserProjectRoles(currentUser.UserID, currentProject.ProjectID, common.UserMember)
if err != nil {
t.Errorf("Error happened in GetUserProjectRole: %v, userID: %+v, project Id: %d", err, currentUser.UserID, currentProject.ProjectID)
}
@ -701,12 +701,19 @@ func TestGetProjects(t *testing.T) {
}
func TestAddProjectMember(t *testing.T) {
err := AddProjectMember(currentProject.ProjectID, 1, models.DEVELOPER)
pmid, err := AddProjectMember(currentProject.ProjectID, 1, models.DEVELOPER, common.UserMember)
if err != nil {
t.Errorf("Error occurred in AddProjectMember: %v", err)
}
if pmid == 0 {
t.Errorf("Error add project member, pmid=0")
}
pmid, err = AddProjectMember(currentProject.ProjectID, 1, models.DEVELOPER, "randomstring")
if err == nil {
t.Errorf("Should failed on adding project member when adding duplicated items")
}
roles, err := GetUserProjectRoles(1, currentProject.ProjectID)
roles, err := GetUserProjectRoles(1, currentProject.ProjectID, common.UserMember)
if err != nil {
t.Errorf("Error occurred in GetUserProjectRoles: %v", err)
}
@ -725,11 +732,11 @@ func TestAddProjectMember(t *testing.T) {
}
func TestUpdateProjectMember(t *testing.T) {
err := UpdateProjectMember(currentProject.ProjectID, 1, models.GUEST)
err := UpdateProjectMember(currentProject.ProjectID, 1, models.GUEST, "randomstring")
if err != nil {
t.Errorf("Error occurred in UpdateProjectMember: %v", err)
}
roles, err := GetUserProjectRoles(1, currentProject.ProjectID)
roles, err := GetUserProjectRoles(1, currentProject.ProjectID, common.UserMember)
if err != nil {
t.Errorf("Error occurred in GetUserProjectRoles: %v", err)
}
@ -740,12 +747,12 @@ func TestUpdateProjectMember(t *testing.T) {
}
func TestDeleteProjectMember(t *testing.T) {
err := DeleteProjectMember(currentProject.ProjectID, 1)
err := DeleteProjectMember(currentProject.ProjectID, 1, "randomstring")
if err != nil {
t.Errorf("Error occurred in DeleteProjectMember: %v", err)
}
roles, err := GetUserProjectRoles(1, currentProject.ProjectID)
roles, err := GetUserProjectRoles(1, currentProject.ProjectID, common.UserMember)
if err != nil {
t.Errorf("Error occurred in GetUserProjectRoles: %v", err)
}

10
src/common/dao/project.go
View File

@ -20,7 +20,6 @@ import (
"fmt"
"time"
//"github.com/vmware/harbor/src/common/utils/log"
)
@ -46,7 +45,10 @@ func AddProject(project models.Project) (int64, error) {
return 0, err
}
err = AddProjectMember(projectID, project.OwnerID, models.PROJECTADMIN)
pmID, err := AddProjectMember(projectID, project.OwnerID, models.PROJECTADMIN, common.UserMember)
if pmID == 0 {
return projectID, fmt.Errorf("Failed to add project member, pmid=0")
}
return projectID, err
}
@ -146,7 +148,7 @@ func projectQueryConditions(query *models.ProjectQueryParam) (string, []interfac
sql += ` join project_member pm
on p.project_id = pm.project_id
join user u2
on pm.user_id=u2.user_id`
on pm.entity_id=u2.user_id`
}
sql += ` where p.deleted=0`
@ -157,7 +159,7 @@ func projectQueryConditions(query *models.ProjectQueryParam) (string, []interfac
if len(query.Name) != 0 {
sql += ` and p.name like ?`
params = append(params, "%"+escape(query.Name)+"%")
params = append(params, "%"+Escape(query.Name)+"%")
}
if query.Member != nil && len(query.Member.Name) != 0 {

39
src/common/dao/project_test.go
View File

@ -16,6 +16,7 @@ package dao
import (
"fmt"
"strings"
"testing"
"github.com/vmware/harbor/src/common/models"
@ -78,3 +79,41 @@ func delProjPermanent(id int64) error {
Delete()
return err
}
func Test_projectQueryConditions(t *testing.T) {
type args struct {
query *models.ProjectQueryParam
}
tests := []struct {
name string
args args
want string
want1 []interface{}
}{
{"Query invalid projectID",
args{query: &models.ProjectQueryParam{ProjectIDs: []int64{}, Owner: "admin"}},
"from project as p where 1 = 0",
[]interface{}{}},
{"Query with valid projectID",
args{query: &models.ProjectQueryParam{ProjectIDs: []int64{2, 3}, Owner: "admin"}},
` from project as p join user u1
on p.owner_id = u1.user_id where p.deleted=0 and u1.username=? and p.project_id in ( ?,? ) order by p.name`,
[]interface{}{2, 3}},
{"Query with valid page and member",
args{query: &models.ProjectQueryParam{ProjectIDs: []int64{2, 3}, Owner: "admin", Name: "sample", Member: &models.MemberQuery{Name: "name", Role: 1}, Pagination: &models.Pagination{Page: 1, Size: 20}}},
` from project as p join user u1
on p.owner_id = u1.user_id join project_member pm
on p.project_id = pm.project_id
join user u2
on pm.entity_id=u2.user_id where p.deleted=0 and u1.username=? and p.name like ? and u2.username=? and pm.role = ? and p.project_id in ( ?,? ) order by p.name limit ? offset ?`,
[]interface{}{1, []int64{2, 3}, 20, 0}},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
got, _ := projectQueryConditions(tt.args.query)
if strings.TrimSpace(got) != strings.TrimSpace(tt.want) {
t.Errorf("projectQueryConditions() got = %v\n, want %v", got, tt.want)
}
})
}
}

62
src/common/dao/projectmember.go
View File

@ -15,25 +15,39 @@
package dao
import (
"github.com/vmware/harbor/src/common"
"github.com/vmware/harbor/src/common/models"
)
// AddProjectMember inserts a record to table project_member
func AddProjectMember(projectID int64, userID int, role int) error {
func AddProjectMember(projectID int64, userID int, role int, entityType string) (int, error) {
o := GetOrmer()
if !(entityType == common.UserMember || entityType == common.GroupMember) {
entityType = common.UserMember
}
sql := `insert into project_member (project_id, entity_id , role, entity_type) values (?, ?, ?, ?)`
_, err := o.Raw(sql, projectID, userID, role, entityType).Exec()
if err != nil {
return 0, err
}
var pmid int
querySQL := `select id from project_member where project_id = ? and entity_id = ? and entity_type = ? limit 1`
sql := "insert into project_member (project_id, user_id , role) values (?, ?, ?)"
_, err := o.Raw(sql, projectID, userID, role).Exec()
return err
err = o.Raw(querySQL, projectID, userID, entityType).QueryRow(&pmid)
if err != nil {
return 0, err
}
return pmid, err
}
// UpdateProjectMember updates the record in table project_member
func UpdateProjectMember(projectID int64, userID int, role int) error {
func UpdateProjectMember(projectID int64, userID int, role int, entityType string) error {
o := GetOrmer()
if !(entityType == common.UserMember || entityType == common.GroupMember) {
entityType = common.UserMember
}
sql := "update project_member set role = ? where project_id = ? and user_id = ?"
sql := `update project_member set role = ? where project_id = ? and entity_id = ?`
_, err := o.Raw(sql, role, projectID, userID).Exec()
@ -41,12 +55,16 @@ func UpdateProjectMember(projectID int64, userID int, role int) error {
}
// DeleteProjectMember delete the record from table project_member
func DeleteProjectMember(projectID int64, userID int) error {
func DeleteProjectMember(projectID int64, userID int, entityType string) error {
o := GetOrmer()
sql := "delete from project_member where project_id = ? and user_id = ?"
if !(entityType == common.UserMember || entityType == common.GroupMember) {
entityType = common.UserMember
}
if _, err := o.Raw(sql, projectID, userID).Exec(); err != nil {
sql := `delete from project_member where project_id = ? and entity_id = ? and entity_type = ?`
if _, err := o.Raw(sql, projectID, userID, entityType).Exec(); err != nil {
return err
}
@ -54,27 +72,23 @@ func DeleteProjectMember(projectID int64, userID int) error {
}
// GetUserByProject gets all members of the project.
func GetUserByProject(projectID int64, queryUser models.User) ([]*models.Member, error) {
func GetUserByProject(projectID int64, queryUser models.User) ([]*models.UserMember, error) {
o := GetOrmer()
sql := `select u.user_id, u.username, u.creation_time, u.update_time, r.name as rolename,
r.role_id as role
from user u
join project_member pm
on pm.project_id = ? and u.user_id = pm.user_id
join role r
on pm.role = r.role_id
where u.deleted = 0`
sql := `select pm.id as id, u.user_id, u.username, u.creation_time, u.update_time, r.name as rolename,
r.role_id as role, pm.entity_type as entity_type from user u join project_member pm
on pm.project_id = ? and u.user_id = pm.entity_id
join role r on pm.role = r.role_id where u.deleted = 0 and pm.entity_type = 'u' `
queryParam := make([]interface{}, 1)
queryParam = append(queryParam, projectID)
if queryUser.Username != "" {
sql += " and u.username like ? "
queryParam = append(queryParam, "%"+escape(queryUser.Username)+"%")
if len(queryUser.Username) != 0 {
sql += ` and u.username like ? `
queryParam = append(queryParam, `%`+Escape(queryUser.Username)+`%`)
}
sql += ` order by u.username `
members := []*models.Member{}
members := []*models.UserMember{}
_, err := o.Raw(sql, queryParam).QueryRows(&members)
return members, err

6
src/common/dao/replication_job.go
View File

@ -90,7 +90,7 @@ func FilterRepTargets(name string) ([]*models.RepTarget, error) {
sql := `select * from replication_target `
if len(name) != 0 {
sql += `where name like ? `
args = append(args, "%"+escape(name)+"%")
args = append(args, `%`+Escape(name)+`%`)
}
sql += `order by creation_time`
@ -173,11 +173,11 @@ func FilterRepPolicies(name string, projectID, page, pageSize int64) ([]*models.
if len(name) != 0 && projectID != 0 {
sql += `and rp.name like ? and rp.project_id = ? `
args = append(args, "%"+escape(name)+"%")
args = append(args, `%`+Escape(name)+`%`)
args = append(args, projectID)
} else if len(name) != 0 {
sql += `and rp.name like ? `
args = append(args, "%"+escape(name)+"%")
args = append(args, `%`+Escape(name)+`%`)
} else if projectID != 0 {
sql += `and rp.project_id = ? `
args = append(args, projectID)

4
src/common/dao/role.go
View File

@ -22,7 +22,7 @@ import (
)
// GetUserProjectRoles returns roles that the user has according to the project.
func GetUserProjectRoles(userID int, projectID int64) ([]models.Role, error) {
func GetUserProjectRoles(userID int, projectID int64, entityType string) ([]models.Role, error) {
o := GetOrmer()
@ -32,7 +32,7 @@ func GetUserProjectRoles(userID int, projectID int64) ([]models.Role, error) {
(
select role
from project_member
where project_id = ? and user_id = ?
where project_id = ? and entity_id = ? and entity_type = 'u'
)`
var roleList []models.Role

11
src/common/models/member.go
View File

@ -16,6 +16,17 @@ package models
// Member holds the details of a member.
type Member struct {
ID int `orm:"pk;column(id)" json:"id"`
ProjectID int64 `orm:"column(project_id)" json:"project_id"`
Entityname string `orm:"column(entity_name)" json:"entity_name"`
Rolename string `json:"role_name"`
Role int `json:"role_id"`
EntityID int `orm:"column(entity_id)" json:"entity_id"`
EntityType string `orm:"column(entity_type)" json:"entity_type"`
}
// UserMember ...
type UserMember struct {
ID int `orm:"pk;column(user_id)" json:"user_id"`
Username string `json:"username"`
Rolename string `json:"role_name"`

4
src/common/security/local/context.go
View File

@ -175,7 +175,7 @@ func (s *SecurityContext) GetProjectRoles(projectIDOrName interface{}) []int {
return roles
}
roleList, err := dao.GetUserProjectRoles(user.UserID, project.ProjectID)
roleList, err := dao.GetUserProjectRoles(user.UserID, project.ProjectID, common.UserMember)
if err != nil {
log.Errorf("failed to get roles of user %d to project %d: %v", user.UserID, project.ProjectID, err)
return roles
@ -192,5 +192,7 @@ func (s *SecurityContext) GetProjectRoles(projectIDOrName interface{}) []int {
}
}
//If len(roles)==0, Get Group Roles
return roles
}

12
src/common/security/local/context_test.go
View File

@ -123,23 +123,23 @@ func TestMain(m *testing.M) {
defer dao.DeleteProject(id)
// add project members
err = dao.AddProjectMember(private.ProjectID, projectAdminUser.UserID, common.RoleProjectAdmin)
_, err = dao.AddProjectMember(private.ProjectID, projectAdminUser.UserID, common.RoleProjectAdmin, common.UserMember)
if err != nil {
log.Fatalf("failed to add member: %v", err)
}
defer dao.DeleteProjectMember(private.ProjectID, projectAdminUser.UserID)
defer dao.DeleteProjectMember(private.ProjectID, projectAdminUser.UserID, common.UserMember)
err = dao.AddProjectMember(private.ProjectID, developerUser.UserID, common.RoleDeveloper)
_, err = dao.AddProjectMember(private.ProjectID, developerUser.UserID, common.RoleDeveloper, common.UserMember)
if err != nil {
log.Fatalf("failed to add member: %v", err)
}
defer dao.DeleteProjectMember(private.ProjectID, developerUser.UserID)
defer dao.DeleteProjectMember(private.ProjectID, developerUser.UserID, common.UserMember)
err = dao.AddProjectMember(private.ProjectID, guestUser.UserID, common.RoleGuest)
_, err = dao.AddProjectMember(private.ProjectID, guestUser.UserID, common.RoleGuest, common.UserMember)
if err != nil {
log.Fatalf("failed to add member: %v", err)
}
defer dao.DeleteProjectMember(private.ProjectID, guestUser.UserID)
defer dao.DeleteProjectMember(private.ProjectID, guestUser.UserID, common.UserMember)
os.Exit(m.Run())
}

11
src/ui/api/api_test.go
View File

@ -24,6 +24,8 @@ import (
"strings"
"testing"
"github.com/vmware/harbor/src/common"
"github.com/astaxie/beego"
"github.com/dghubble/sling"
"github.com/stretchr/testify/assert"
@ -224,7 +226,7 @@ func prepare() error {
}
projAdminID = int(id)
if err = dao.AddProjectMember(1, projAdminID, models.PROJECTADMIN); err != nil {
if _, err = dao.AddProjectMember(1, projAdminID, models.PROJECTADMIN, common.UserMember); err != nil {
return err
}
@ -239,7 +241,7 @@ func prepare() error {
}
projDeveloperID = int(id)
if err = dao.AddProjectMember(1, projDeveloperID, models.DEVELOPER); err != nil {
if _, err = dao.AddProjectMember(1, projDeveloperID, models.DEVELOPER, common.UserMember); err != nil {
return err
}
@ -254,13 +256,14 @@ func prepare() error {
}
projGuestID = int(id)
return dao.AddProjectMember(1, projGuestID, models.GUEST)
_, err = dao.AddProjectMember(1, projGuestID, models.GUEST, common.UserMember)
return err
}
func clean() {
ids := []int{projAdminID, projDeveloperID, projGuestID}
for _, id := range ids {
if err := dao.DeleteProjectMember(1, id); err != nil {
if err := dao.DeleteProjectMember(1, id, common.UserMember); err != nil {
fmt.Printf("failed to clean up member %d from project library: %v", id, err)
}
}

2
src/ui/api/harborapi_test.go
View File

@ -102,7 +102,7 @@ func init() {
beego.Router("/api/users/:id/sysadmin", &UserAPI{}, "put:ToggleUserAdminRole")
beego.Router("/api/projects/:id([0-9]+)/logs", &ProjectAPI{}, "get:Logs")
beego.Router("/api/projects/:id([0-9]+)/_deletable", &ProjectAPI{}, "get:Deletable")
beego.Router("/api/projects/:pid([0-9]+)/members/?:mid", &ProjectMemberAPI{}, "get:Get;post:Post;delete:Delete;put:Put")
beego.Router("/api/projects/:pid([0-9]+)/members/?:mid", &ProjectUserMemberAPI{}, "get:Get;post:Post;delete:Delete;put:Put")
beego.Router("/api/projects/:id([0-9]+)/metadatas/?:name", &MetadataAPI{}, "get:Get")
beego.Router("/api/projects/:id([0-9]+)/metadatas/", &MetadataAPI{}, "post:Post")
beego.Router("/api/projects/:id([0-9]+)/metadatas/:name", &MetadataAPI{}, "put:Put;delete:Delete")

30
src/ui/api/member.go
View File

@ -19,14 +19,16 @@ import (
"net/http"
"strings"
"github.com/vmware/harbor/src/common"
"github.com/vmware/harbor/src/common/dao"
"github.com/vmware/harbor/src/common/models"
"github.com/vmware/harbor/src/common/utils/log"
"github.com/vmware/harbor/src/ui/auth"
)
// ProjectMemberAPI handles request to /api/projects/{}/members/{}
type ProjectMemberAPI struct {
// ProjectUserMemberAPI handles request to /api/projects/{}/members/{}
type ProjectUserMemberAPI struct {
BaseController
memberID int
currentUserID int
@ -40,7 +42,7 @@ type memberReq struct {
}
// Prepare validates the URL and parms
func (pma *ProjectMemberAPI) Prepare() {
func (pma *ProjectUserMemberAPI) Prepare() {
pma.BaseController.Prepare()
if !pma.SecurityCtx.IsAuthenticated() {
@ -116,7 +118,7 @@ func (pma *ProjectMemberAPI) Prepare() {
}
// Get ...
func (pma *ProjectMemberAPI) Get() {
func (pma *ProjectUserMemberAPI) Get() {
pid := pma.project.ProjectID
if pma.memberID == 0 { //member id not set return list of the members
username := pma.GetString("username")
@ -129,7 +131,7 @@ func (pma *ProjectMemberAPI) Get() {
}
pma.Data["json"] = userList
} else { //return detail of a member
roleList, err := listRoles(pma.memberID, pid)
roleList, err := listRoles(pma.memberID, pid, common.UserMember)
if err != nil {
log.Errorf("Error occurred in GetUserProjectRoles, error: %v", err)
pma.CustomAbort(http.StatusInternalServerError, "Internal error.")
@ -155,7 +157,7 @@ func (pma *ProjectMemberAPI) Get() {
}
// Post ...
func (pma *ProjectMemberAPI) Post() {
func (pma *ProjectUserMemberAPI) Post() {
projectID := pma.project.ProjectID
var req memberReq
@ -193,7 +195,7 @@ func (pma *ProjectMemberAPI) Post() {
userID = user.UserID
}
rolelist, err := dao.GetUserProjectRoles(userID, projectID)
rolelist, err := dao.GetUserProjectRoles(userID, projectID, common.UserMember)
if err != nil {
log.Errorf("Error occurred in GetUserProjectRoles, error: %v", err)
pma.CustomAbort(http.StatusInternalServerError, "Internal error.")
@ -215,7 +217,7 @@ func (pma *ProjectMemberAPI) Post() {
pma.CustomAbort(http.StatusBadRequest, "invalid role")
}
err = dao.AddProjectMember(projectID, userID, rid)
_, err = dao.AddProjectMember(projectID, userID, rid, common.UserMember)
if err != nil {
log.Errorf("Failed to update DB to add project user role, project id: %d, user id: %d, role id: %d", projectID, userID, rid)
pma.RenderError(http.StatusInternalServerError, "Failed to update data in database")
@ -224,13 +226,13 @@ func (pma *ProjectMemberAPI) Post() {
}
// Put ...
func (pma *ProjectMemberAPI) Put() {
func (pma *ProjectUserMemberAPI) Put() {
pid := pma.project.ProjectID
mid := pma.memberID
var req memberReq
pma.DecodeJSONReq(&req)
roleList, err := dao.GetUserProjectRoles(mid, pid)
roleList, err := dao.GetUserProjectRoles(mid, pid, common.UserMember)
if len(roleList) == 0 {
log.Warningf("User is not in project, user id: %d, project id: %d", mid, pid)
pma.RenderError(http.StatusNotFound, "user not exist in project")
@ -238,7 +240,7 @@ func (pma *ProjectMemberAPI) Put() {
}
//TODO: delete and insert should in one transaction
//delete user project role record for the given user
err = dao.DeleteProjectMember(pid, mid)
err = dao.DeleteProjectMember(pid, mid, common.UserMember)
if err != nil {
log.Errorf("Failed to delete project roles for user, user id: %d, project id: %d, error: %v", mid, pid, err)
pma.RenderError(http.StatusInternalServerError, "Failed to update data in DB")
@ -246,7 +248,7 @@ func (pma *ProjectMemberAPI) Put() {
}
//insert roles in request
for _, rid := range req.Roles {
err = dao.AddProjectMember(pid, mid, int(rid))
_, err = dao.AddProjectMember(pid, mid, int(rid), common.UserMember)
if err != nil {
log.Errorf("Failed to update DB to add project user role, project id: %d, user id: %d, role id: %d", pid, mid, rid)
pma.RenderError(http.StatusInternalServerError, "Failed to update data in database")
@ -256,11 +258,11 @@ func (pma *ProjectMemberAPI) Put() {
}
// Delete ...
func (pma *ProjectMemberAPI) Delete() {
func (pma *ProjectUserMemberAPI) Delete() {
pid := pma.project.ProjectID
mid := pma.memberID
err := dao.DeleteProjectMember(pid, mid)
err := dao.DeleteProjectMember(pid, mid, common.UserMember)
if err != nil {
log.Errorf("Failed to delete project roles for user, user id: %d, project id: %d, error: %v", mid, pid, err)
pma.RenderError(http.StatusInternalServerError, "Failed to update data in DB")

9
src/ui/api/replication_policy_test.go
View File

@ -21,6 +21,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/vmware/harbor/src/common"
"github.com/vmware/harbor/src/common/dao"
"github.com/vmware/harbor/src/common/models"
"github.com/vmware/harbor/src/replication"
@ -320,10 +321,10 @@ func TestRepPolicyAPIList(t *testing.T) {
}
defer dao.DeleteUser(int(proAdminID))
if err = dao.AddProjectMember(1, int(proAdminID), models.PROJECTADMIN); err != nil {
if _, err = dao.AddProjectMember(1, int(proAdminID), models.PROJECTADMIN, common.UserMember); err != nil {
panic(err)
}
defer dao.DeleteProjectMember(1, int(proAdminID))
defer dao.DeleteProjectMember(1, int(proAdminID), common.UserMember)
proDevID, err := dao.Register(projectDev)
if err != nil {
@ -331,10 +332,10 @@ func TestRepPolicyAPIList(t *testing.T) {
}
defer dao.DeleteUser(int(proDevID))
if err = dao.AddProjectMember(1, int(proDevID), models.DEVELOPER); err != nil {
if _, err = dao.AddProjectMember(1, int(proDevID), models.DEVELOPER, common.UserMember); err != nil {
panic(err)
}
defer dao.DeleteProjectMember(1, int(proDevID))
defer dao.DeleteProjectMember(1, int(proDevID), common.UserMember)
// 400: invalid project ID
runCodeCheckingCases(t, &codeCheckingCase{

4
src/ui/api/utils.go
View File

@ -36,7 +36,7 @@ import (
)
//sysadmin has all privileges to all projects
func listRoles(userID int, projectID int64) ([]models.Role, error) {
func listRoles(userID int, projectID int64, entityType string) ([]models.Role, error) {
roles := make([]models.Role, 0, 1)
isSysAdmin, err := dao.IsAdminRole(userID)
if err != nil {
@ -53,7 +53,7 @@ func listRoles(userID int, projectID int64) ([]models.Role, error) {
return roles, nil
}
rs, err := dao.GetUserProjectRoles(userID, projectID)
rs, err := dao.GetUserProjectRoles(userID, projectID, entityType)
if err != nil {
log.Errorf("failed to get user %d 's roles for project %d: %v", userID, projectID, err)
return roles, err

2
src/ui/router.go
View File

@ -45,7 +45,7 @@ func initRouters() {
beego.Router("/sendEmail", &controllers.CommonController{}, "get:SendResetEmail")
//API:
beego.Router("/api/projects/:pid([0-9]+)/members/?:mid", &api.ProjectMemberAPI{})
beego.Router("/api/projects/:pid([0-9]+)/members/?:mid", &api.ProjectUserMemberAPI{})
beego.Router("/api/projects/", &api.ProjectAPI{}, "head:Head")
beego.Router("/api/projects/:id([0-9]+)", &api.ProjectAPI{})