update for harbor v2.0.1

goharbor · Jul 7, 2020 · 1d368e4 · 1d368e4
1 parent eb82cb9
commit 1d368e4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/common/rbac/project_rbac_user.go b/src/common/rbac/project_rbac_user.go
@@ -17,6 +17,7 @@ package rbac
 import (
 	"github.com/goharbor/harbor/src/common/models"
 	"github.com/goharbor/harbor/src/pkg/permission/types"
+	"github.com/goharbor/harbor/src/core/config"
 )
 
 type projectRBACUser struct {
@@ -32,6 +33,10 @@ func (user *projectRBACUser) GetUserName() string {
 
 // GetPolicies returns policies of the visitor
 func (user *projectRBACUser) GetPolicies() []*types.Policy {
+	cur := config.DisableAnonymous()
+	if cur {
+		return nil
+	}
 	if user.project.IsPublic() {
 		return getPoliciesForPublicProject(user.project.ProjectID)
 	}

diff --git a/src/core/api/search.go b/src/core/api/search.go
@@ -16,9 +16,10 @@ package api
 
 import (
 	"fmt"
+	"strings"
+
 	pro "github.com/goharbor/harbor/src/common/dao/project"
 	"github.com/goharbor/harbor/src/common/security/local"
-	"strings"
 
 	"github.com/goharbor/harbor/src/common/dao"
 	"github.com/goharbor/harbor/src/common/models"
@@ -63,11 +64,11 @@ func (s *SearchAPI) Get() {
 		projects = result.Projects
 	} else {
 		cur := config.DisableAnonymous()
-		if !isAuthenticated && cur {
+		if !s.SecurityCtx.IsAuthenticated() && cur {
 			// return empty if anonymos access is disabled
 			return
 		}
-				
+
 		projects, err = s.ProjectMgr.GetPublic()
 		if err != nil {
 			s.ParseAndHandleError("failed to get projects", err)