Skip to content

feat: Return more 404s vs 403s #2194

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.

Sign up for GitHub

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

Merged
merged 16 commits into from
Jun 14, 2022
Merged

feat: Return more 404s vs 403s #2194

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
a92f132
feat: Return more 404s vs 403s
Emyrk Jun 8, 2022
4e23ea7
Fix unit test assertion
Emyrk Jun 8, 2022
0562d2c
return 404 when member of org not found
Emyrk Jun 9, 2022
c7f976e
fixup! return 404 when member of org not found
Emyrk Jun 9, 2022
6ef1647
chore: Manually forbidden after Authorize
Emyrk Jun 10, 2022
8f90af4
Use %q over %s
Emyrk Jun 10, 2022
a6d15ed
Fix authoirze test
Emyrk Jun 10, 2022
815baf9
Return vague 404
Emyrk Jun 10, 2022
3f742ba
Merge remote-tracking branch 'origin/main' into stevenmasley/404_vs_403
Emyrk Jun 10, 2022
8bfe1f7
fix test assert
Emyrk Jun 10, 2022
7155b2e
Merge remote-tracking branch 'origin/main' into stevenmasley/404_vs_403
Emyrk Jun 10, 2022
7aa76f7
Fix compile issue
Emyrk Jun 10, 2022
3f07738
Modify 404 message
Emyrk Jun 10, 2022
9a40838
Merge remote-tracking branch 'origin/main' into stevenmasley/404_vs_403
Emyrk Jun 13, 2022
2c1ac1c
Use proper 404s
Emyrk Jun 13, 2022
93c04db
If cannot read user, return 404
Emyrk Jun 13, 2022
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
Prev Previous commit
Next Next commit
Fix unit test assertion
  • Loading branch information
@Emyrk
Emyrk committed Jun 8, 2022
commit 4e23ea740065d46dd732cbc2e8ce0fa257e01cbc
4 changes: 2 additions & 2 deletions cli/autostart_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ func TestAutostart(t *testing.T) {
clitest.SetupConfig(t, client, root)

err := cmd.Execute()
require.ErrorContains(t, err, "status code 403: Forbidden", "unexpected error")
require.ErrorContains(t, err, "status code 404", "unexpected error")
})

t.Run("Disable_NotFound", func(t *testing.T) {
Expand All @@ -126,7 +126,7 @@ func TestAutostart(t *testing.T) {
clitest.SetupConfig(t, client, root)

err := cmd.Execute()
require.ErrorContains(t, err, "status code 403: Forbidden", "unexpected error")
require.ErrorContains(t, err, "status code 404:", "unexpected error")
})

t.Run("Enable_DefaultSchedule", func(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions cli/ttl_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ func TestTTL(t *testing.T) {
clitest.SetupConfig(t, client, root)

err := cmd.Execute()
require.ErrorContains(t, err, "status code 403: Forbidden", "unexpected error")
require.ErrorContains(t, err, "status code 404:", "unexpected error")
})

t.Run("Unset_NotFound", func(t *testing.T) {
Expand All @@ -166,7 +166,7 @@ func TestTTL(t *testing.T) {
clitest.SetupConfig(t, client, root)

err := cmd.Execute()
require.ErrorContains(t, err, "status code 403: Forbidden", "unexpected error")
require.ErrorContains(t, err, "status code 404:", "unexpected error")
})

t.Run("TemplateMaxTTL", func(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion coderd/files_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ func TestDownload(t *testing.T) {
_, _, err := client.Download(context.Background(), "something")
var apiErr *codersdk.Error
require.ErrorAs(t, err, &apiErr)
require.Equal(t, http.StatusForbidden, apiErr.StatusCode())
require.Equal(t, http.StatusNotFound, apiErr.StatusCode())
})

t.Run("Insert", func(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion coderd/organizations_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ func TestOrganizationByUserAndName(t *testing.T) {
_, err := client.OrganizationByName(context.Background(), codersdk.Me, "nothing")
var apiErr *codersdk.Error
require.ErrorAs(t, err, &apiErr)
require.Equal(t, http.StatusForbidden, apiErr.StatusCode())
require.Equal(t, http.StatusNotFound, apiErr.StatusCode())
})

t.Run("NoMember", func(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion coderd/workspaces_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ func TestWorkspaceByOwnerAndName(t *testing.T) {
// Then:
// When we call without includes_deleted, we don't expect to get the workspace back
_, err = client.WorkspaceByOwnerAndName(context.Background(), workspace.OwnerName, workspace.Name, codersdk.WorkspaceByOwnerAndNameParams{})
require.ErrorContains(t, err, "403")
require.ErrorContains(t, err, "404")

// Then:
// When we call with includes_deleted, we should get the workspace back
Expand Down