Skip to content

chore: move app proxying code to workspaceapps pkg #6998

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 12 commits into from
Apr 5, 2023
Merged

chore: move app proxying code to workspaceapps pkg #6998

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
921a7c5
chore: move app proxying code to workspaceapps pkg
deansheather Apr 4, 2023
7e0ea10
fixup! chore: move app proxying code to workspaceapps pkg
deansheather Apr 4, 2023
70309ce
Renamed from PR review
Emyrk Apr 4, 2023
900709b
Attach rate limiter outside the pkg
Emyrk Apr 4, 2023
20ecf88
Fix some accidental renameS
Emyrk Apr 4, 2023
540de03
rate limiter over api key
Emyrk Apr 4, 2023
2e710e2
chore: upgrade to go-jose v3
deansheather Apr 5, 2023
b38c1c8
chore: change app signing key to be 96 bytes
deansheather Apr 5, 2023
a933d6d
fixup! chore: change app signing key to be 96 bytes
deansheather Apr 5, 2023
fe28e42
chore: Rename AppSigningKey to AppSecurityKey
Emyrk Apr 5, 2023
691c328
Merge remote-tracking branch 'origin/main' into dean/move-app-proxy-r…
Emyrk Apr 5, 2023
a34b663
Formatting
Emyrk Apr 5, 2023
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
Attach rate limiter outside the pkg
  • Loading branch information
@Emyrk
Emyrk committed Apr 4, 2023
commit 900709bf0201f09d60ca133630be33707f944484
5 changes: 4 additions & 1 deletion coderd/coderd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,10 @@ func New(options *Options) *API {
r.Get("/healthz", func(w http.ResponseWriter, r *http.Request) { _, _ = w.Write([]byte("OK")) })

// Attach workspace apps routes.
workspaceAppServer.Attach(r, apiRateLimiter)
r.Group(func(r chi.Router) {
r.Use(apiKeyMiddleware)
workspaceAppServer.Attach(r)
})

r.Route("/derp", func(r chi.Router) {
r.Get("/", derpHandler.ServeHTTP)
Expand Down
3 changes: 1 addition & 2 deletions coderd/workspaceapps/proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,8 @@ type Server struct {
AppSigningKey SigningKey
}

func (s *Server) Attach(r chi.Router, pathAppRateLimiter func(http.Handler) http.Handler) {
func (s *Server) Attach(r chi.Router) {
servePathApps := func(r chi.Router) {
r.Use(pathAppRateLimiter)
r.HandleFunc("/*", s.workspaceAppsProxyPath)
}

Expand Down