TyleoDvDelaware3217/GoDoxy
1
0
Fork 0
mirror of https://github.com/yusing/godoxy.git synced 2025-07-13 09:24:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix(agent): fix agent host validatation and improve file path handling

Browse source
This commit is contained in:
yusing 2025-03-29 16:44:16 +08:00
parent 392946fe33
commit be85633c32
3 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
agent/pkg/agent/config.go
View file

@ -131,7 +131,12 @@ func (cfg *AgentConfig) StartWithCerts(parent task.Parent, ca, crt, key []byte)
} }
func (cfg *AgentConfig) Start(parent task.Parent) gperr.Error { func (cfg *AgentConfig) Start(parent task.Parent) gperr.Error {
certData, err := os.ReadFile(certs.AgentCertsFilename(cfg.Addr)) filepath, ok := certs.AgentCertsFilepath(cfg.Addr)
if !ok {
return gperr.New("invalid agent host").Subject(cfg.Addr)
}
certData, err := os.ReadFile(filepath)
if err != nil { if err != nil {
return gperr.Wrap(err, "failed to read agent certs") return gperr.Wrap(err, "failed to read agent certs")
} }

12
agent/pkg/certs/zip.go
View file

@ -7,6 +7,7 @@ import (
"path/filepath" "path/filepath"
"github.com/yusing/go-proxy/internal/common" "github.com/yusing/go-proxy/internal/common"
"github.com/yusing/go-proxy/internal/utils/strutils"
) )
func writeFile(zipWriter *zip.Writer, name string, data []byte) error { func writeFile(zipWriter *zip.Writer, name string, data []byte) error {
@ -50,8 +51,15 @@ func ZipCert(ca, crt, key []byte) ([]byte, error) {
return data.Bytes(), nil return data.Bytes(), nil
} }
func AgentCertsFilename(host string) string { func isValidAgentHost(host string) bool {
return filepath.Join(common.AgentCertsBasePath, host+".zip") return strutils.IsValidFilename(host + ".zip")
}
func AgentCertsFilepath(host string) (filepathOut string, ok bool) {
if !isValidAgentHost(host) {
return "", false
}
return filepath.Join(common.AgentCertsBasePath, host+".zip"), true
} }
func ExtractCert(data []byte) (ca, crt, key []byte, err error) { func ExtractCert(data []byte) (ca, crt, key []byte, err error) {

4
internal/api/v1/new_agent.go
View file

@ -126,8 +126,8 @@ func VerifyNewAgent(w http.ResponseWriter, r *http.Request) {
return return
} }
filename := certs.AgentCertsFilename(data.Host) filename, ok := certs.AgentCertsFilepath(data.Host)
if !strutils.IsValidFilename(filename) { if !ok {
gphttp.ClientError(w, gphttp.ErrInvalidKey("host")) gphttp.ClientError(w, gphttp.ErrInvalidKey("host"))
return return
} }