Skip to content

Commit

Permalink
Add preflight OPTIONS handling and update CORS config (#4086)
Browse files Browse the repository at this point in the history
* Add preflight OPTIONS handling and update CORS config

- Implement early return with HTTP 204 (No Content) for OPTIONS requests in allowedHostsMiddleware to optimize preflight handling.

- Extend CORS configuration to explicitly allow 'Authorization' headers and 'OPTIONS' method when OLLAMA_ORIGINS environment variable is set.

* allow auth, content-type, and user-agent headers

* Update routes.go
  • Loading branch information
BruceMacD committed May 8, 2024
1 parent 2687f02 commit cef45fe
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions server/routes.go
Original file line number Diff line number Diff line change
Expand Up @@ -935,6 +935,11 @@ func allowedHostsMiddleware(addr net.Addr) gin.HandlerFunc {
}

if allowedHost(host) {
if c.Request.Method == "OPTIONS" {
c.AbortWithStatus(http.StatusNoContent)
return
}

c.Next()
return
}
Expand All @@ -947,6 +952,7 @@ func (s *Server) GenerateRoutes() http.Handler {
config := cors.DefaultConfig()
config.AllowWildcard = true
config.AllowBrowserExtensions = true
config.AllowHeaders = []string{"Authorization", "Content-Type", "User-Agent", "Accept", "X-Requested-With"}
config.AllowOrigins = envconfig.AllowOrigins

r := gin.Default()
Expand Down

0 comments on commit cef45fe

Please sign in to comment.