Skip to content

feat: implement provisioner auth middleware and proper org params #12330

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 11 commits into from
Mar 4, 2024
Merged

feat: implement provisioner auth middleware and proper org params #12330

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
913600f
feat: provisioner auth in mw to allow ExtractOrg
Emyrk Feb 27, 2024
df54d89
chore: handle default org handling for provisioner daemons
Emyrk Feb 27, 2024
3e982cb
Lint
Emyrk Feb 27, 2024
0cbd149
fix provisioner auth mw
Emyrk Feb 27, 2024
e543e57
Linting
Emyrk Feb 28, 2024
c6fef46
Move 403 -> 401
Emyrk Feb 28, 2024
9372502
Add unit tests
Emyrk Feb 28, 2024
c855447
update todo comment
Emyrk Feb 28, 2024
321a145
fixup previous authorize
Emyrk Feb 28, 2024
0656d80
use const for test
Emyrk Feb 28, 2024
03d6f74
Fix logger name, update comment
Emyrk Feb 29, 2024
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
Linting
  • Loading branch information
@Emyrk
Emyrk committed Feb 28, 2024
commit e543e57b3e005c8f97a372419b0104e68e992af4
14 changes: 7 additions & 7 deletions coderd/httpmw/organizationparam.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ func ExtractOrganizationParam(db database.Store) func(http.Handler) http.Handler
}

var organization database.Organization
var err error
var dbErr error

// If the name is exactly "default", then we fetch the default
// organization. This is a special case to make it easier
Expand All @@ -65,28 +65,28 @@ func ExtractOrganizationParam(db database.Store) func(http.Handler) http.Handler
// TODO: This change was added March 2024, this should be removed
// some number of months after that date.
if arg == codersdk.DefaultOrganization || arg == uuid.Nil.String() {
organization, err = db.GetDefaultOrganization(ctx)
organization, dbErr = db.GetDefaultOrganization(ctx)
} else {
// Try by name or uuid.
id, err := uuid.Parse(arg)
if err == nil {
organization, err = db.GetOrganizationByID(ctx, id)
organization, dbErr = db.GetOrganizationByID(ctx, id)
} else {
organization, err = db.GetOrganizationByName(ctx, arg)
organization, dbErr = db.GetOrganizationByName(ctx, arg)
}
}
if httpapi.Is404Error(err) {
if httpapi.Is404Error(dbErr) {
httpapi.ResourceNotFound(rw)
httpapi.Write(ctx, rw, http.StatusNotFound, codersdk.Response{
Message: fmt.Sprintf("Organization %q not found.", arg),
Detail: "Provide either the organization id or name.",
})
return
}
if err != nil {
if dbErr != nil {
httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
Message: fmt.Sprintf("Internal error fetching organization %q.", arg),
Detail: err.Error(),
Detail: dbErr.Error(),
})
return
}
Expand Down