fix(oauth2): exclude authorization endpoint from permissive CORS - Apply standard CORS to `/oauth2/authorize`, with or without a trailing slash, as required by OAuth 2.1 §3.1. - Normalize repeated slashes before selecting the policy to prevent exclusion bypasses, including in wsproxy. - Preserve permissive CORS for other OAuth2 endpoints, discovery documents, and MCP. Same-origin consent behavior is unchanged. - Add middleware and router regression tests and update provider security docs.
138 lines
4.0 KiB
Go
138 lines
4.0 KiB
Go
package httpmw
|
|
|
|
import (
|
|
"net/http"
|
|
"net/url"
|
|
"regexp"
|
|
"strings"
|
|
|
|
"github.com/go-chi/cors"
|
|
|
|
"github.com/coder/coder/v2/coderd/workspaceapps/appurl"
|
|
)
|
|
|
|
const (
|
|
// Server headers.
|
|
AccessControlAllowOriginHeader = "Access-Control-Allow-Origin"
|
|
AccessControlAllowCredentialsHeader = "Access-Control-Allow-Credentials"
|
|
AccessControlAllowMethodsHeader = "Access-Control-Allow-Methods"
|
|
AccessControlAllowHeadersHeader = "Access-Control-Allow-Headers"
|
|
VaryHeader = "Vary"
|
|
|
|
// Client headers.
|
|
OriginHeader = "Origin"
|
|
AccessControlRequestMethodsHeader = "Access-Control-Request-Methods"
|
|
AccessControlRequestHeadersHeader = "Access-Control-Request-Headers"
|
|
)
|
|
|
|
// repeatedSlashesRe matches runs of slashes that the router collapses to one.
|
|
var repeatedSlashesRe = regexp.MustCompile(`/+`)
|
|
|
|
//nolint:revive
|
|
func Cors(allowAll bool, origins ...string) func(next http.Handler) http.Handler {
|
|
if len(origins) == 0 {
|
|
// The default behavior is '*', so putting the empty string defaults to
|
|
// the secure behavior of blocking CORS requests.
|
|
origins = []string{""}
|
|
}
|
|
if allowAll {
|
|
origins = []string{"*"}
|
|
}
|
|
|
|
// Standard CORS for most endpoints
|
|
standardCors := cors.Handler(cors.Options{
|
|
AllowedOrigins: origins,
|
|
// We only need GET for latency requests
|
|
AllowedMethods: []string{http.MethodOptions, http.MethodGet},
|
|
AllowedHeaders: []string{"Accept", "Content-Type", "X-LATENCY-CHECK", "X-CSRF-TOKEN"},
|
|
// Do not send any cookies
|
|
AllowCredentials: false,
|
|
})
|
|
|
|
// Permissive CORS for OAuth2 and MCP endpoints
|
|
permissiveCors := cors.Handler(cors.Options{
|
|
AllowedOrigins: []string{"*"},
|
|
AllowedMethods: []string{
|
|
http.MethodGet,
|
|
http.MethodPost,
|
|
http.MethodDelete,
|
|
http.MethodOptions,
|
|
},
|
|
AllowedHeaders: []string{
|
|
"Content-Type",
|
|
"Accept",
|
|
"Authorization",
|
|
"x-api-key",
|
|
"Mcp-Session-Id",
|
|
"MCP-Protocol-Version",
|
|
"Last-Event-ID",
|
|
},
|
|
ExposedHeaders: []string{
|
|
"Content-Type",
|
|
"Authorization",
|
|
"x-api-key",
|
|
"Mcp-Session-Id",
|
|
"MCP-Protocol-Version",
|
|
},
|
|
MaxAge: 86400, // 24 hours in seconds
|
|
AllowCredentials: false,
|
|
})
|
|
|
|
return func(next http.Handler) http.Handler {
|
|
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
// The router collapses repeated slashes before matching, so
|
|
// "/oauth2//authorize" reaches the authorize handler. Match on
|
|
// the same path so a stray slash cannot pick a different policy.
|
|
path := repeatedSlashesRe.ReplaceAllString(r.URL.Path, "/")
|
|
|
|
// OAuth 2.1 §3.1 forbids CORS at the authorization endpoint. The
|
|
// client sends the user agent there and never fetches it itself.
|
|
isAuthorize := path == "/oauth2/authorize" ||
|
|
strings.HasPrefix(path, "/oauth2/authorize/")
|
|
|
|
// Use permissive CORS for OAuth2 (except authorize), MCP, and
|
|
// well-known endpoints
|
|
if !isAuthorize && (strings.HasPrefix(path, "/oauth2/") ||
|
|
strings.HasPrefix(path, "/api/experimental/mcp/") ||
|
|
strings.HasPrefix(path, "/api/v2/mcp/") ||
|
|
strings.HasPrefix(path, "/.well-known/oauth-")) {
|
|
permissiveCors(next).ServeHTTP(w, r)
|
|
return
|
|
}
|
|
|
|
// Use standard CORS for all other endpoints
|
|
standardCors(next).ServeHTTP(w, r)
|
|
})
|
|
}
|
|
}
|
|
|
|
func WorkspaceAppCors(regex *regexp.Regexp, app appurl.ApplicationURL) func(next http.Handler) http.Handler {
|
|
return cors.Handler(cors.Options{
|
|
AllowOriginFunc: func(_ *http.Request, rawOrigin string) bool {
|
|
origin, err := url.Parse(rawOrigin)
|
|
if rawOrigin == "" || origin.Host == "" || err != nil {
|
|
return false
|
|
}
|
|
subdomain, ok := appurl.ExecuteHostnamePattern(regex, origin.Host)
|
|
if !ok {
|
|
return false
|
|
}
|
|
originApp, err := appurl.ParseSubdomainAppURL(subdomain)
|
|
if err != nil {
|
|
return false
|
|
}
|
|
return ok && originApp.Username == app.Username
|
|
},
|
|
AllowedMethods: []string{
|
|
http.MethodHead,
|
|
http.MethodGet,
|
|
http.MethodPost,
|
|
http.MethodPut,
|
|
http.MethodPatch,
|
|
http.MethodDelete,
|
|
},
|
|
AllowedHeaders: []string{"*"},
|
|
AllowCredentials: true,
|
|
})
|
|
}
|