upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor synced 2025-04-17 18:13:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Wenkai Yin 2017-05-11 17:02:01 +08:00
parent 06ba7e0de0
commit f1f302ec29
2 changed files with 34 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ui/api/base.go
View File

@ -27,11 +27,11 @@ import (
// BaseController ...
type BaseController struct {
api.BaseAPI
// SecurityCxt is the security context used to authN &authZ
SecurityCxt security.Context
// ProManager is the project manager which abstracts the operations
// SecurityCtx is the security context used to authN &authZ
SecurityCtx security.Context
// ProjectMgr is the project manager which abstracts the operations
// related to projects
ProManager projectmanager.ProjectManager
ProjectMgr projectmanager.ProjectManager
}
// Prepare inits security context and project manager from beego
@ -39,14 +39,14 @@ type BaseController struct {
func (b *BaseController) Prepare() {
ok := false
ctx := b.Ctx.Input.GetData(filter.HarborSecurityContext)
b.SecurityCxt, ok = ctx.(security.Context)
b.SecurityCtx, ok = ctx.(security.Context)
if !ok {
log.Error("failed to get security context")
b.CustomAbort(http.StatusInternalServerError, "")
}
pm := b.Ctx.Input.GetData(filter.HarborProjectManager)
b.ProManager, ok = pm.(projectmanager.ProjectManager)
b.ProjectMgr, ok = pm.(projectmanager.ProjectManager)
if !ok {
log.Error("failed to get project manager")
b.CustomAbort(http.StatusInternalServerError, "")

64
src/ui/api/repository.go
View File

@ -69,21 +69,18 @@ func (ra *RepositoryAPI) Get() {
return
}
if !ra.ProManager.Exist(projectID) {
if !ra.ProjectMgr.Exist(projectID) {
ra.HandleNotFound(fmt.Sprintf("project %d not found", projectID))
return
}
if !ra.ProManager.IsPublic(projectID) {
if !ra.SecurityCxt.IsAuthenticated() {
if !ra.SecurityCtx.HasReadPerm(projectID) {
if !ra.SecurityCtx.IsAuthenticated() {
ra.HandleUnauthorized()
return
}
if !ra.SecurityCxt.HasReadPerm(projectID) {
ra.HandleForbidden(ra.SecurityCxt.GetUsername())
return
}
ra.HandleForbidden(ra.SecurityCtx.GetUsername())
return
}
keyword := ra.GetString("q")
@ -149,18 +146,18 @@ func (ra *RepositoryAPI) Delete() {
repoName := ra.GetString(":splat")
projectName, _ := utils.ParseRepository(repoName)
if !ra.ProManager.Exist(projectName) {
if !ra.ProjectMgr.Exist(projectName) {
ra.HandleNotFound(fmt.Sprintf("project %s not found", projectName))
return
}
if !ra.SecurityCxt.IsAuthenticated() {
if !ra.SecurityCtx.IsAuthenticated() {
ra.HandleUnauthorized()
return
}
if !ra.SecurityCxt.HasAllPerm(projectName) {
ra.HandleForbidden(ra.SecurityCxt.GetUsername())
if !ra.SecurityCtx.HasAllPerm(projectName) {
ra.HandleForbidden(ra.SecurityCtx.GetUsername())
return
}
@ -197,7 +194,7 @@ func (ra *RepositoryAPI) Delete() {
var digest string
signedTags := make(map[string]struct{})
targets, err := notary.GetInternalTargets(config.InternalNotaryEndpoint(),
ra.SecurityCxt.GetUsername(), repoName)
ra.SecurityCtx.GetUsername(), repoName)
if err != nil {
log.Errorf("Failed to get Notary targets for repository: %s, error: %v", repoName, err)
log.Warningf("Failed to check signature status of repository: %s for deletion, there maybe orphaned targets in Notary.", repoName)
@ -239,9 +236,9 @@ func (ra *RepositoryAPI) Delete() {
go TriggerReplicationByRepository(repoName, []string{t}, models.RepOpDelete)
go func(tag string) {
project := ra.ProManager.Get(projectName)
project := ra.ProjectMgr.Get(projectName)
if err := dao.AddAccessLog(models.AccessLog{
Username: ra.SecurityCxt.GetUsername(),
Username: ra.SecurityCtx.GetUsername(),
ProjectID: project.ProjectID,
RepoName: repoName,
RepoTag: tag,
@ -271,21 +268,18 @@ func (ra *RepositoryAPI) GetTags() {
repoName := ra.GetString(":splat")
projectName, _ := utils.ParseRepository(repoName)
if !ra.ProManager.Exist(projectName) {
if !ra.ProjectMgr.Exist(projectName) {
ra.HandleNotFound(fmt.Sprintf("project %s not found", projectName))
return
}
if !ra.ProManager.IsPublic(projectName) {
if !ra.SecurityCxt.IsAuthenticated() {
if !ra.SecurityCtx.HasReadPerm(projectName) {
if !ra.SecurityCtx.IsAuthenticated() {
ra.HandleUnauthorized()
return
}
if !ra.SecurityCxt.HasReadPerm(projectName) {
ra.HandleForbidden(ra.SecurityCxt.GetUsername())
return
}
ra.HandleForbidden(ra.SecurityCtx.GetUsername())
return
}
client, err := ra.initRepositoryClient(repoName)
@ -366,21 +360,19 @@ func (ra *RepositoryAPI) GetManifests() {
}
projectName, _ := utils.ParseRepository(repoName)
if !ra.ProManager.Exist(projectName) {
if !ra.ProjectMgr.Exist(projectName) {
ra.HandleNotFound(fmt.Sprintf("project %s not found", projectName))
return
}
if !ra.ProManager.IsPublic(projectName) {
if !ra.SecurityCxt.IsAuthenticated() {
if !ra.SecurityCtx.HasReadPerm(projectName) {
if !ra.SecurityCtx.IsAuthenticated() {
ra.HandleUnauthorized()
return
}
if !ra.SecurityCxt.HasReadPerm(projectName) {
ra.HandleForbidden(ra.SecurityCxt.GetUsername())
return
}
ra.HandleForbidden(ra.SecurityCtx.GetUsername())
return
}
rc, err := ra.initRepositoryClient(repoName)
@ -451,7 +443,7 @@ func (ra *RepositoryAPI) initRepositoryClient(repoName string) (r *registry.Repo
return nil, err
}
return NewRepositoryClient(endpoint, true, ra.SecurityCxt.GetUsername(),
return NewRepositoryClient(endpoint, true, ra.SecurityCtx.GetUsername(),
repoName, "repository", repoName, "pull", "push", "*")
}
@ -463,10 +455,10 @@ func (ra *RepositoryAPI) GetTopRepos() {
}
projectIDs := []int64{}
projects := ra.ProManager.GetPublic()
if ra.SecurityCxt.IsAuthenticated() {
projects = append(projects, ra.ProManager.GetByMember(
ra.SecurityCxt.GetUsername())...)
projects := ra.ProjectMgr.GetPublic()
if ra.SecurityCtx.IsAuthenticated() {
projects = append(projects, ra.ProjectMgr.GetByMember(
ra.SecurityCtx.GetUsername())...)
}
for _, project := range projects {
@ -494,7 +486,7 @@ func (ra *RepositoryAPI) GetSignatures() {
repoName := ra.GetString(":splat")
targets, err := notary.GetInternalTargets(config.InternalNotaryEndpoint(),
ra.SecurityCxt.GetUsername(), repoName)
ra.SecurityCtx.GetUsername(), repoName)
if err != nil {
log.Errorf("Error while fetching signature from notary: %v", err)
ra.CustomAbort(http.StatusInternalServerError, "internal error")