瀏覽代碼

Merge pull request #3379 from ollama/mxyng/origins

fix: trim quotes on OLLAMA_ORIGINS
Michael Yang 1 年之前
父節點
當前提交
035b274b70
共有 1 個文件被更改,包括 4 次插入6 次删除
  1. 4 6
      server/routes.go

+ 4 - 6
server/routes.go

@@ -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),