opensource/coder
3
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2026-09-24 15:04:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: don't allow "new" or "create" as url-friendly names (#13596)

Browse Source
This commit is contained in:
Kayla Washburn-Love
2024-06-18 15:36:13 -06:00
committed by GitHub
parent 3a1fa04590
commit e987ad1d89
12 changed files with 117 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
enterprise/cli/templatecreate_test.go
+5 -5
View File
@@ -41,7 +41,7 @@ func TestTemplateCreate(t *testing.T) {
})
inv, conf := newCLI(t, "templates",
"create", "new",
"create", "new-template",
"--directory", source,
"--test.provisioner", string(database.ProvisionerTypeEcho),
"--require-active-version",
@@ -54,7 +54,7 @@ func TestTemplateCreate(t *testing.T) {
require.NoError(t, err)
ctx := testutil.Context(t, testutil.WaitMedium)
template, err := templateAdmin.TemplateByName(ctx, user.OrganizationID, "new")
template, err := templateAdmin.TemplateByName(ctx, user.OrganizationID, "new-template")
require.NoError(t, err)
require.True(t, template.RequireActiveVersion)
})
@@ -86,7 +86,7 @@ func TestTemplateCreate(t *testing.T) {
)
inv, conf := newCLI(t, "templates",
"create", "new",
"create", "new-template",
"--directory", source,
"--test.provisioner", string(database.ProvisionerTypeEcho),
"--failure-ttl="+expectedFailureTTL.String(),
@@ -102,7 +102,7 @@ func TestTemplateCreate(t *testing.T) {
require.NoError(t, err)
ctx := testutil.Context(t, testutil.WaitMedium)
template, err := templateAdmin.TemplateByName(ctx, user.OrganizationID, "new")
template, err := templateAdmin.TemplateByName(ctx, user.OrganizationID, "new-template")
require.NoError(t, err)
require.Equal(t, expectedFailureTTL.Milliseconds(), template.FailureTTLMillis)
require.Equal(t, expectedDormancyThreshold.Milliseconds(), template.TimeTilDormantMillis)
@@ -123,7 +123,7 @@ func TestTemplateCreate(t *testing.T) {
templateAdmin, _ := coderdtest.CreateAnotherUser(t, client, admin.OrganizationID, rbac.RoleTemplateAdmin())
inv, conf := newCLI(t, "templates",
"create", "new",
"create", "new-template",
"--require-active-version",
"-y",
)
enterprise/coderd/groups_test.go
+20
View File
@@ -101,6 +101,26 @@ func TestCreateGroup(t *testing.T) {
require.Equal(t, http.StatusConflict, cerr.StatusCode())
})
t.Run("ReservedName", func(t *testing.T) {
t.Parallel()
client, user := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
Features: license.Features{
codersdk.FeatureTemplateRBAC: 1,
},
}})
userAdminClient, _ := coderdtest.CreateAnotherUser(t, client, user.OrganizationID, rbac.RoleUserAdmin())
ctx := testutil.Context(t, testutil.WaitLong)
_, err := userAdminClient.CreateGroup(ctx, user.OrganizationID, codersdk.CreateGroupRequest{
Name: "new",
})
require.Error(t, err)
var apiErr *codersdk.Error
require.ErrorAs(t, err, &apiErr)
require.Equal(t, http.StatusBadRequest, apiErr.StatusCode())
})
t.Run("allUsers", func(t *testing.T) {
t.Parallel()