Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions server/api/org.go
Original file line number Diff line number Diff line change
Expand Up @@ -127,15 +127,27 @@ func LookupOrg(c *gin.Context) {

orgFullName := strings.TrimLeft(c.Param("org_full_name"), "/")

org, err := _store.OrgFindByName(orgFullName, user.ForgeID)
if err != nil {
handleDBError(c, err)
return
var org *model.Org
if user == nil {
org, err = _store.OrgLookup(orgFullName)
if err != nil {
if err.Error() == "found more than one org with this name" {
_ = c.AbortWithError(http.StatusBadRequest, err)
return
}
handleDBError(c, err)
return
}
} else {
org, err = _store.OrgFindByName(orgFullName, user.ForgeID)
if err != nil {
handleDBError(c, err)
return
}
}

// don't leak private org infos
if org.Private {
user := session.User(c)
if user == nil {
c.AbortWithStatus(http.StatusNotFound)
return
Expand Down
17 changes: 17 additions & 0 deletions server/store/datastore/org.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
"xorm.io/xorm"

"go.woodpecker-ci.org/woodpecker/v3/server/model"
"go.woodpecker-ci.org/woodpecker/v3/server/store/types"
)

func (s storage) OrgCreate(org *model.Org) error {
Expand Down Expand Up @@ -82,6 +83,22 @@ func (s storage) orgFindByName(sess *xorm.Session, name string, forgeID int64) (
return org, wrapGet(sess.Where("LOWER(name) = ?", strings.ToLower(name)).And("forge_id = ?", forgeID).Get(org))
}

func (s storage) OrgLookup(name string) (*model.Org, error) {
var orgs []*model.Org
// we limit to 2 orgs, if we have >= 2 we return an error anyways.
err := s.engine.Where("LOWER(name) = ?", strings.ToLower(name)).Limit(2).Find(&orgs) //nolint:mnd
if err != nil {
return nil, err
}
if len(orgs) < 1 {
return nil, types.ErrRecordNotExist
}
if len(orgs) > 1 {
return nil, fmt.Errorf("found more than one org with this name")
}
return orgs[0], nil
}

func (s storage) OrgRepoList(org *model.Org, p *model.ListOptions) ([]*model.Repo, error) {
var repos []*model.Repo
return repos, s.paginate(p).OrderBy("id").Where("org_id = ?", org.ID).Find(&repos)
Expand Down
62 changes: 62 additions & 0 deletions server/store/mocks/mock_Store.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions server/store/store.go
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@ type Store interface {
OrgCreate(*model.Org) error
OrgGet(int64) (*model.Org, error)
OrgFindByName(string, int64) (*model.Org, error)
OrgLookup(string) (*model.Org, error)
OrgUpdate(*model.Org) error
OrgDelete(int64) error
OrgList(*model.ListOptions) ([]*model.Org, error)
Expand Down