Skip to content

GitLab

Unverified Commit 035b274b authored by Michael Yang's avatar Michael Yang Committed by GitHub
Browse files

Merge pull request #3379 from ollama/mxyng/origins 

fix: trim quotes on OLLAMA_ORIGINS
parents 9c6a2549 af8a8a6b
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 6 deletions
server/routes.go
View file @ 035b274b
...@@ -1013,16 +1013,14 @@ func allowedHostsMiddleware(addr net.Addr) gin.HandlerFunc { ...@@ -1013,16 +1013,14 @@ func allowedHostsMiddleware(addr net.Addr) gin.HandlerFunc {
} }
func (s *Server) GenerateRoutes() http.Handler { func (s *Server) GenerateRoutes() http.Handler {
var origins []string
if o := os.Getenv("OLLAMA_ORIGINS"); o != "" {
origins = strings.Split(o, ",")
}
config := cors.DefaultConfig() config := cors.DefaultConfig()
config.AllowWildcard = true config.AllowWildcard = true
config.AllowBrowserExtensions = true config.AllowBrowserExtensions = true
config.AllowOrigins = origins if allowedOrigins := strings.Trim(os.Getenv("OLLAMA_ORIGINS"), "\"'"); allowedOrigins != "" {
config.AllowOrigins = strings.Split(allowedOrigins, ",")
}
for _, allowOrigin := range defaultAllowOrigins { for _, allowOrigin := range defaultAllowOrigins {
config.AllowOrigins = append(config.AllowOrigins, config.AllowOrigins = append(config.AllowOrigins,
fmt.Sprintf("http://%s", allowOrigin), fmt.Sprintf("http://%s", allowOrigin),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment