Skip to content

feat: app sharing (now open source!) #4378

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
Oct 14, 2022
Merged

feat: app sharing (now open source!) #4378

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
6b68642
feat: app sharing pt.1
deansheather Oct 5, 2022
1ca5c46
Merge branch 'main' into dean/app-sharing
deansheather Oct 5, 2022
67a7057
feat: app sharing pt.2
deansheather Oct 5, 2022
d7403ec
feat: app sharing pt.3
deansheather Oct 6, 2022
2a5bcc8
Merge branch 'main' into dean/app-sharing
deansheather Oct 6, 2022
a2eacaa
feat: app sharing pt.4
deansheather Oct 6, 2022
e4f6fd6
chore: move app sharing to open source
deansheather Oct 12, 2022
40300a7
Merge branch 'main' into dean/app-sharing
deansheather Oct 12, 2022
89a75d0
fixup! Merge branch 'main' into dean/app-sharing
deansheather Oct 12, 2022
4f6aac8
chore: add test for app sharing with scoped keys
deansheather Oct 12, 2022
9f45850
chore: add share to all example templates
deansheather Oct 12, 2022
cedc57d
fixup! chore: add share to all example templates
deansheather Oct 12, 2022
f8268e7
chore: remove app sharing level 'template'
deansheather Oct 13, 2022
aae96de
chore: upgrade coder tf provider to 0.5.3
deansheather Oct 13, 2022
8df6bed
Merge branch 'main' into dean/app-sharing
deansheather Oct 14, 2022
077cb62
fixup! Merge branch 'main' into dean/app-sharing
deansheather Oct 14, 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
fixup! Merge branch 'main' into dean/app-sharing
  • Loading branch information
@deansheather
deansheather committed Oct 12, 2022
commit 89a75d0414f705f0f438ccd2cbed612cf7bc7931
1 change: 0 additions & 1 deletion coderd/httpmw/apikey.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,5 +427,4 @@ func RedirectToLogin(rw http.ResponseWriter, r *http.Request, message string) {
}

http.Redirect(rw, r, u.String(), http.StatusTemporaryRedirect)
return
}
2 changes: 2 additions & 0 deletions coderd/httpmw/userparam.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ func UserParam(r *http.Request) database.User {

// ExtractUserParam extracts a user from an ID/username in the {user} URL
// parameter.
//
//nolint:revive
func ExtractUserParam(db database.Store, redirectToLoginOnMe bool) func(http.Handler) http.Handler {
return func(next http.Handler) http.Handler {
return http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
Expand Down
18 changes: 9 additions & 9 deletions coderd/workspaceapps.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@ func (api *API) workspaceAppsProxyPath(rw http.ResponseWriter, r *http.Request)
return
}

AppSharingLevel := database.AppSharingLevelOwner
appSharingLevel := database.AppSharingLevelOwner
if app.SharingLevel != "" {
AppSharingLevel = app.SharingLevel
appSharingLevel = app.SharingLevel
}
authed, ok := api.fetchWorkspaceApplicationAuth(rw, r, workspace, AppSharingLevel)
authed, ok := api.fetchWorkspaceApplicationAuth(rw, r, workspace, appSharingLevel)
if !ok {
return
}
Expand Down Expand Up @@ -191,11 +191,11 @@ func (api *API) handleSubdomainApplications(middlewares ...func(http.Handler) ht

// Verify application auth. This function will redirect or
// return an error page if the user doesn't have permission.
SharingLevel := database.AppSharingLevelOwner
sharingLevel := database.AppSharingLevelOwner
if workspaceAppPtr != nil && workspaceAppPtr.SharingLevel != "" {
SharingLevel = workspaceAppPtr.SharingLevel
sharingLevel = workspaceAppPtr.SharingLevel
}
if !api.verifyWorkspaceApplicationSubdomainAuth(rw, r, host, workspace, SharingLevel) {
if !api.verifyWorkspaceApplicationSubdomainAuth(rw, r, host, workspace, sharingLevel) {
return
}

Expand Down Expand Up @@ -598,11 +598,11 @@ type proxyApplication struct {
func (api *API) proxyWorkspaceApplication(proxyApp proxyApplication, rw http.ResponseWriter, r *http.Request) {
ctx := r.Context()

SharingLevel := database.AppSharingLevelOwner
sharingLevel := database.AppSharingLevelOwner
if proxyApp.App != nil && proxyApp.App.SharingLevel != "" {
SharingLevel = proxyApp.App.SharingLevel
sharingLevel = proxyApp.App.SharingLevel
}
if !api.checkWorkspaceApplicationAuth(rw, r, proxyApp.Workspace, SharingLevel) {
if !api.checkWorkspaceApplicationAuth(rw, r, proxyApp.Workspace, sharingLevel) {
return
}

Expand Down
4 changes: 2 additions & 2 deletions enterprise/coderd/workspaceagents_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,8 @@ func setupWorkspaceAgent(t *testing.T, client *codersdk.Client, user codersdk.Cr
defer cancel()

resources := coderdtest.AwaitWorkspaceAgents(t, client, workspace.ID)
agent, err := client.WorkspaceAgent(ctx, resources[0].Agents[0].ID)
agnt, err := client.WorkspaceAgent(ctx, resources[0].Agents[0].ID)
require.NoError(t, err)

return workspace, agent
return workspace, agnt
}