Skip to content
Closed
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
45 changes: 45 additions & 0 deletions integrations/api_repo_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -235,3 +235,48 @@ func TestAPIGetRepoByIDUnauthorized(t *testing.T) {
req := NewRequestf(t, "GET", "/api/v1/repositories/2")
sess.MakeRequest(t, req, http.StatusNotFound)
}

func TestAPIOrgRepoCreate(t *testing.T) {
prepareTestEnv(t)
testCases := []struct {
desc string
user *models.User
org *models.User
repoName string
resp int
}{
{
desc: "owner of organization",
user: models.AssertExistsAndLoadBean(t, &models.User{ID: 2}).(*models.User),
org: models.AssertExistsAndLoadBean(t, &models.User{ID: 3}).(*models.User),
repoName: "foo",
resp: http.StatusCreated,
},
{
desc: "admin",
user: models.AssertExistsAndLoadBean(t, &models.User{ID: 1}).(*models.User),
org: models.AssertExistsAndLoadBean(t, &models.User{ID: 3}).(*models.User),
repoName: "foobar",
resp: http.StatusCreated,
},
{
desc: "non-member of organization",
user: models.AssertExistsAndLoadBean(t, &models.User{ID: 15}).(*models.User),
org: models.AssertExistsAndLoadBean(t, &models.User{ID: 3}).(*models.User),
repoName: "foobaz",
resp: http.StatusForbidden,
},
}
for _, tc := range testCases {
t.Run(tc.desc, func(t *testing.T) {
session := loginUser(t, tc.user.Name)

req := NewRequestf(t, "POST", "/api/v1/org/%s/repos", tc.org.LowerName)
resp := session.MakeRequest(t, req, tc.resp)

var apiRepo *api.Repository
DecodeJSON(t, resp, &apiRepo)
assert.Equal(t, tc.repoName, apiRepo.Name)
})
}
}
16 changes: 9 additions & 7 deletions routers/api/v1/repo/repo.go
Original file line number Diff line number Diff line change
Expand Up @@ -257,13 +257,15 @@ func CreateOrgRepo(ctx *context.APIContext, opt api.CreateRepoOption) {
return
}

isOwner, err := org.IsOwnedBy(ctx.User.ID)
if err != nil {
ctx.ServerError("IsOwnedBy", err)
return
} else if !isOwner {
ctx.Error(403, "", "Given user is not owner of organization.")
return
if !ctx.User.IsAdmin {
isOwner, err := org.IsOwnedBy(ctx.User.ID)
if err != nil {
ctx.ServerError("IsOwnedBy", err)
return
} else if !isOwner {
ctx.Error(403, "", "Given user is not owner of organization.")
return
}
}
CreateUserRepo(ctx, org, opt)
}
Expand Down