opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5851 from swordqiu/automated-cherry-pick-of-#5850-upstream-release-3.1

Browse Source 
Automated cherry pick of #5850: fix: allow any character in project/domain name, giveup displayname
This commit is contained in:
Zexi Li
2020-04-18 16:27:49 +08:00
committed by GitHub
parent b8b8174632 e94e63d6d4
commit cfafea78e7
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/keystone/driver/cas/cas.go
+2 -3
View File
@@ -162,9 +162,8 @@ func (self *SCASDriver) userTryJoinProject(ctx context.Context, usr *models.SUse
domainId = api.DEFAULT_DOMAIN_ID
}
if len(self.casConfig.CasProjectAttribute) > 0 {
casProjName := fetchAttribute(resp, self.casConfig.CasProjectAttribute)
if len(casProjName) > 0 {
projName := models.NormalizeProjectName(casProjName)
projName := fetchAttribute(resp, self.casConfig.CasProjectAttribute)
if len(projName) > 0 {
targetProject, err = models.ProjectManager.FetchProject("", projName, domainId, "")
if err != nil {
log.Errorf("fetch project %s fail %s", projName, err)
pkg/keystone/models/projects.go
+2 -3
View File
@@ -76,7 +76,7 @@ type SProject struct {
ParentId string `width:"64" charset:"ascii" list:"domain" create:"domain_optional"`
IsDomain tristate.TriState `default:"false" nullable:"false" create:"domain_optional"`
IsDomain tristate.TriState `default:"false" nullable:"false"`
}
func (manager *SProjectManager) GetContextManagers() [][]db.IModelManager {
@@ -530,13 +530,12 @@ func (project *SProject) PerformLeave(
return nil, nil
}
func (manager *SProjectManager) NewProject(ctx context.Context, name string, desc string, domainId string) (*SProject, error) {
func (manager *SProjectManager) NewProject(ctx context.Context, projectName string, desc string, domainId string) (*SProject, error) {
lockman.LockClass(ctx, manager, domainId)
defer lockman.ReleaseClass(ctx, manager, domainId)
project := &SProject{}
project.SetModelManager(ProjectManager, project)
projectName := NormalizeProjectName(name)
ownerId := &db.SOwnerId{}
if manager.NamespaceScope() == rbacutils.ScopeDomain {
ownerId.DomainId = domainId