Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add check for storage where repo/org name is empty #2968

Merged
merged 3 commits into from
Dec 19, 2023
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
4 changes: 4 additions & 0 deletions server/store/datastore/org.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
package datastore

import (
"fmt"
"strings"

"xorm.io/xorm"
Expand All @@ -29,6 +30,9 @@ func (s storage) OrgCreate(org *model.Org) error {
func (s storage) orgCreate(org *model.Org, sess *xorm.Session) error {
// sanitize
org.Name = strings.ToLower(org.Name)
if org.Name == "" {
return fmt.Errorf("org name is empty")
}
// insert
_, err := sess.Insert(org)
return err
Expand Down
1 change: 1 addition & 0 deletions server/store/datastore/org_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ func TestOrgCRUD(t *testing.T) {
assert.NoError(t, store.CreateRepo(&model.Repo{UserID: 1, Owner: "some_other_u", Name: "abc", FullName: "some_other_u/abc", OrgID: someUser.ID}))
assert.NoError(t, store.CreateRepo(&model.Repo{UserID: 1, Owner: "some_other_u", Name: "xyz", FullName: "some_other_u/xyz", OrgID: someUser.ID}))
assert.NoError(t, store.CreateRepo(&model.Repo{UserID: 1, Owner: "renamedorg", Name: "567", FullName: "renamedorg/567", OrgID: orgOne.ID}))
assert.Error(t, store.OrgCreate(&model.Org{Name: ""}), "expect to fail if name is empty")

// get all repos for a specific org
repos, err := store.OrgRepoList(someUser, &model.ListOptions{All: true})
Expand Down
9 changes: 9 additions & 0 deletions server/store/datastore/repo.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ package datastore

import (
"errors"
"fmt"
"strings"

"xorm.io/builder"
Expand Down Expand Up @@ -80,6 +81,14 @@ func (s storage) GetRepoCount() (int64, error) {
}

func (s storage) CreateRepo(repo *model.Repo) error {
switch {
case repo.Name == "":
return fmt.Errorf("repo name is empty")
case repo.Owner == "":
return fmt.Errorf("repo owner is empty")
case repo.FullName == "":
return fmt.Errorf("repo full name is empty")
}
// only Insert set auto created ID back to object
_, err := s.engine.Insert(repo)
return err
Expand Down
21 changes: 21 additions & 0 deletions server/store/datastore/repo_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,27 @@ func TestRepos(t *testing.T) {
g.Assert(repo.ID != 0).IsTrue()
})

g.It("Should fail if repo has no name / owner / fullname", func() {
g.Assert(store.CreateRepo(&model.Repo{
UserID: 1,
FullName: "bradrydzewski/",
Owner: "bradrydzewski",
Name: "",
})).IsNotNil()
g.Assert(store.CreateRepo(&model.Repo{
UserID: 1,
FullName: "/test",
Owner: "",
Name: "test",
})).IsNotNil()
g.Assert(store.CreateRepo(&model.Repo{
UserID: 1,
FullName: "",
Owner: "bradrydzewski",
Name: "test",
})).IsNotNil()
})

g.It("Should Get a Repo by ID", func() {
repo := model.Repo{
UserID: 1,
Expand Down