Mathis/llamactl
1
0
Fork 0
mirror of https://github.com/lordmathis/llamactl.git synced 2025-11-06 17:14:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Validate instance name in openai proxy

Browse Source
This commit is contained in:
Matúš Námešný
2025-10-22 18:55:57 +02:00
parent 3b8bc658e3
commit a9fb0d613d
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/server/handlers_openai.go
View File

@@ -6,6 +6,7 @@ import (
"fmt" "fmt"
"io" "io"
"llamactl/pkg/instance" "llamactl/pkg/instance"
"llamactl/pkg/validation"
"net/http" "net/http"
"net/http/httputil" "net/http/httputil"
"net/url" "net/url"
@@ -85,8 +86,15 @@ func (h *Handler) OpenAIProxy() http.HandlerFunc {
return return
} }
// Validate instance name at the entry point
validatedName, err := validation.ValidateInstanceName(modelName)
if err != nil {
http.Error(w, "Invalid instance name: "+err.Error(), http.StatusBadRequest)
return
}
// Route to the appropriate inst based on instance name // Route to the appropriate inst based on instance name
inst, err := h.InstanceManager.GetInstance(modelName) inst, err := h.InstanceManager.GetInstance(validatedName)
if err != nil { if err != nil {
http.Error(w, "Invalid instance: "+err.Error(), http.StatusBadRequest) http.Error(w, "Invalid instance: "+err.Error(), http.StatusBadRequest)
return return
@@ -96,7 +104,7 @@ func (h *Handler) OpenAIProxy() http.HandlerFunc {
if inst.IsRemote() { if inst.IsRemote() {
// Restore the body for the remote proxy // Restore the body for the remote proxy
r.Body = io.NopCloser(bytes.NewReader(bodyBytes)) r.Body = io.NopCloser(bytes.NewReader(bodyBytes))
h.RemoteOpenAIProxy(w, r, modelName, inst) h.RemoteOpenAIProxy(w, r, validatedName, inst)
return return
} }
@@ -122,7 +130,7 @@ func (h *Handler) OpenAIProxy() http.HandlerFunc {
} }
// If on-demand start is enabled, start the instance // If on-demand start is enabled, start the instance
if _, err := h.InstanceManager.StartInstance(modelName); err != nil { if _, err := h.InstanceManager.StartInstance(validatedName); err != nil {
http.Error(w, "Failed to start instance: "+err.Error(), http.StatusInternalServerError) http.Error(w, "Failed to start instance: "+err.Error(), http.StatusInternalServerError)
return return
} }