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

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
Merge remote-tracking branch 'origin/main' into stevenmasley/404_vs_403
  • Loading branch information
@Emyrk
Emyrk committed Jun 10, 2022
commit 7155b2ec6e1946f6fa47249ad235c8393e79f34a
7 changes: 6 additions & 1 deletion coderd/templates.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package coderd

import (
"context"
"database/sql"
"errors"
"fmt"
Expand Down Expand Up @@ -46,6 +45,11 @@ func (api *API) template(rw http.ResponseWriter, r *http.Request) {
return
}

if !api.Authorize(rw, r, rbac.ActionRead, template) {
httpapi.ResourceNotFound(rw)
return
}

count := uint32(0)
if len(workspaceCounts) > 0 {
count = uint32(workspaceCounts[0].Count)
Expand Down Expand Up @@ -109,6 +113,7 @@ func (api *API) deleteTemplate(rw http.ResponseWriter, r *http.Request) {
func (api *API) postTemplateByOrganization(rw http.ResponseWriter, r *http.Request) {
var createTemplate codersdk.CreateTemplateRequest
organization := httpmw.OrganizationParam(r)
apiKey := httpmw.APIKey(r)
if !api.Authorize(r, rbac.ActionCreate, rbac.ResourceTemplate.InOrg(organization.ID)) {
httpapi.ResourceNotFound(rw)
return
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.