Fix merge issues

Emyrk · Emyrk · commit 10b42960c517 · 2022-09-13T09:27:05.000-04:00
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -406,7 +406,6 @@ func New(options *Options) *API {
 					httpmw.ExtractWorkspaceParam(options.Database),
 				)
 				r.Get("/", api.workspaceAgent)
-				r.Post("/peer", api.postWorkspaceAgentWireguardPeer)
 				r.Get("/dial", api.workspaceAgentDial)
 				r.Get("/turn", api.userWorkspaceAgentTurn)
 				r.Get("/pty", api.workspaceAgentPTY)
diff --git a/coderd/httpmw/csrf.go b/coderd/httpmw/csrf.go
@@ -16,7 +16,7 @@ func CSRF(secureCookie bool) func(next http.Handler) http.Handler {
 	return func(next http.Handler) http.Handler {
 		mw := nosurf.New(next)
 		mw.SetBaseCookie(http.Cookie{Path: "/", HttpOnly: true, SameSite: http.SameSiteLaxMode, Secure: secureCookie})
-		mw.SetFailureHandler(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		mw.SetFailureHandler(http.HandlerFunc(func(wg http.ResponseWriter, r *http.Request) {
 			http.Error(w, "Something is wrong with your CSRF token. Please refresh the page. If this error persists, try clearing your cookies.", http.StatusBadRequest)
 		}))
 
@@ -28,6 +28,8 @@ func CSRF(secureCookie bool) func(next http.Handler) http.Handler {
 		mw.ExemptRegexp(regexp.MustCompile("api/v2/workspaceagents/[^/]*$"))
 		// Agent authenticated routes
 		mw.ExemptRegexp(regexp.MustCompile("api/v2/workspaceagents/me/*"))
+		// Derp routes
+		mw.ExemptRegexp(regexp.MustCompile("derp/*"))
 
 		mw.ExemptFunc(func(r *http.Request) bool {
 			// CSRF only affects requests that automatically attach credentials via a cookie.

Original file line number	Diff line number	Diff line change
`@@ -406,7 +406,6 @@ func New(options Options) API {`
`406`	`406`	`httpmw.ExtractWorkspaceParam(options.Database),`
`407`	`407`	`)`
`408`	`408`	`r.Get("/", api.workspaceAgent)`
`409`		`- r.Post("/peer", api.postWorkspaceAgentWireguardPeer)`
`410`	`409`	`r.Get("/dial", api.workspaceAgentDial)`
`411`	`410`	`r.Get("/turn", api.userWorkspaceAgentTurn)`
`412`	`411`	`r.Get("/pty", api.workspaceAgentPTY)`