Added HTTP headers required for gradio

claceio · Sep 29, 2024 · e72bf2e · e72bf2e
1 parent 5d9b9b5
commit e72bf2e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/internal/app/container_manager.go b/internal/app/container_manager.go
@@ -687,7 +687,7 @@ func (m *ContainerManager) ProdReload(dryRun bool) error {
 	err = m.command.RunContainer(m.systemConfig, m.app.AppEntry, containerName,
 		imageName, m.port, envMap, m.getMountArgs(), m.app.Metadata.ContainerOptions)
 	if err != nil {
-		return fmt.Errorf("error building image: %w", err)
+		return fmt.Errorf("error starting container: %w", err)
 	}
 
 	containers, err = m.command.GetContainers(m.systemConfig, containerName, false)

diff --git a/internal/app/setup.go b/internal/app/setup.go
@@ -679,12 +679,10 @@ func (a *App) addProxyConfig(count int, router *chi.Mux, proxyDef *starlarkstruc
 			// disabled in proxy config
 			req.Host = url.Host
 		}
-
 	}
 
 	permsHandler := func(p *httputil.ReverseProxy) http.Handler {
 		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-
 			// If write API, check if preview/stage app is allowed access
 			isWriteReques := r.Method == http.MethodPost || r.Method == http.MethodPut || r.Method == http.MethodDelete
 			if isWriteReques {
@@ -696,6 +694,13 @@ func (a *App) addProxyConfig(count int, router *chi.Mux, proxyDef *starlarkstruc
 					return
 				}
 			}
+
+			r.Header.Set("X-Forwarded-Host", strings.SplitN(r.Host, ":", 1)[0])
+			if r.TLS != nil {
+				r.Header.Set("X-Forwarded-Proto", "https")
+			} else {
+				r.Header.Set("X-Forwarded-Proto", "http")
+			}
 			// use the reverse proxy to handle the request
 			p.ServeHTTP(w, r)
 		})

diff --git a/internal/server/app_apis.go b/internal/server/app_apis.go
@@ -485,7 +485,7 @@ func (s *Server) verifyClientCerts(r *http.Request, authName string) error {
 }
 
 func (s *Server) MatchApp(hostHeader, matchPath string) (types.AppInfo, error) {
-	s.Trace().Msgf("MatchApp %s %s", hostHeader, matchPath)
+	//s.Trace().Msgf("MatchApp %s %s", hostHeader, matchPath)
 	apps, err := s.apps.GetAllApps()
 	if err != nil {
 		return types.AppInfo{}, err
@@ -504,7 +504,6 @@ func (s *Server) MatchApp(hostHeader, matchPath string) (types.AppInfo, error) {
 	// Check if host header matches a known domain
 	checkDomain := false
 	if hostHeader != "" && domainMap[hostHeader] {
-		s.Trace().Msgf("Matched domain %s", hostHeader)
 		checkDomain = true
 	}