starred/godoxy
1
0
Fork 0
mirror of https://github.com/yusing/godoxy.git synced 2026-03-24 02:11:54 +01:00
Code Issues 18 Packages Projects Releases 10 Wiki Activity

refactor and remove unused code

Browse Source
This commit is contained in:
yusing
2025-02-10 09:52:53 +08:00
parent eaf191e350
commit 0a7b28caf5
15 changed files with 24 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
agent/pkg/agent/config.go
View File

@@ -37,7 +37,6 @@ type (
const (
EndpointVersion = "/version"
EndpointName = "/name"
EndpointCACert = "/ca-cert"
EndpointProxyHTTP = "/proxy/http"
EndpointHealth = "/health"
EndpointLogs = "/logs"

2
agent/pkg/agent/requests.go
View File

@@ -24,7 +24,7 @@ func (cfg *AgentConfig) Fetch(ctx context.Context, endpoint string) ([]byte, int
return nil, 0, err
}
defer resp.Body.Close()
data, err := io.ReadAll(resp.Body)
data, _ := io.ReadAll(resp.Body)
return data, resp.StatusCode, nil
}

2
agent/pkg/handler/docker_socket.go
View File

@@ -86,7 +86,7 @@ func DockerSocketHandler() http.HandlerFunc {
}
} else {
// For non-event streams, just copy the body
godoxyIO.NewPipe(r.Context(), resp.Body, NopWriteCloser{w}).Start()
_ = godoxyIO.NewPipe(r.Context(), resp.Body, NopWriteCloser{w}).Start()
}
}
}

5
agent/pkg/handler/handler.go
View File

@@ -32,7 +32,7 @@ func (NopWriteCloser) Close() error {
return nil
}
func NewHandler(caCertPEM []byte) http.Handler {
func NewHandler() http.Handler {
mux := ServeMux{http.NewServeMux()}
mux.HandleFunc(agent.EndpointProxyHTTP+"/{path...}", ProxyHTTP)
@@ -40,9 +40,6 @@ func NewHandler(caCertPEM []byte) http.Handler {
mux.HandleMethods("GET", agent.EndpointName, func(w http.ResponseWriter, r *http.Request) {
fmt.Fprint(w, env.AgentName)
})
mux.HandleMethods("GET", agent.EndpointCACert, func(w http.ResponseWriter, r *http.Request) {
w.Write(caCertPEM)
})
mux.HandleMethods("GET", agent.EndpointHealth, CheckHealth)
mux.HandleMethods("GET", agent.EndpointLogs, memlogger.LogsWS(nil))
mux.ServeMux.HandleFunc("/", DockerSocketHandler())

6
agent/pkg/handler/proxy_http.go
View File

@@ -17,14 +17,14 @@ import (
func ProxyHTTP(w http.ResponseWriter, r *http.Request) {
host := r.Header.Get(agentproxy.HeaderXProxyHost)
isHTTPs := strutils.ParseBool(r.Header.Get(agentproxy.HeaderXProxyHTTPS))
isHTTPS := strutils.ParseBool(r.Header.Get(agentproxy.HeaderXProxyHTTPS))
skipTLSVerify := strutils.ParseBool(r.Header.Get(agentproxy.HeaderXProxySkipTLSVerify))
responseHeaderTimeout, err := strconv.Atoi(r.Header.Get(agentproxy.HeaderXProxyResponseHeaderTimeout))
if err != nil {
responseHeaderTimeout = 0
}
logging.Debug().Msgf("proxy http request: host=%s, isHTTPs=%t, skipTLSVerify=%t, responseHeaderTimeout=%d", host, isHTTPs, skipTLSVerify, responseHeaderTimeout)
logging.Debug().Msgf("proxy http request: host=%s, isHTTPs=%t, skipTLSVerify=%t, responseHeaderTimeout=%d", host, isHTTPS, skipTLSVerify, responseHeaderTimeout)
if host == "" {
http.Error(w, "missing required headers", http.StatusBadRequest)
@@ -32,7 +32,7 @@ func ProxyHTTP(w http.ResponseWriter, r *http.Request) {
}
scheme := "http"
if isHTTPs {
if isHTTPS {
scheme = "https"
}

6
agent/pkg/server/server.go
View File

@@ -43,9 +43,11 @@ func StartAgentServer(parent task.Parent, opt Options) {
defer l.Close()
server := &http.Server{
Handler: handler.NewHandler(caCertPEM),
Handler: handler.NewHandler(),
TLSConfig: tlsConfig,
ErrorLog: log.New(logging.GetLogger(), "", 0),
}
server.Serve(tls.NewListener(l, tlsConfig))
if err := server.Serve(tls.NewListener(l, tlsConfig)); err != nil {
logging.Fatal().Err(err).Int("port", opt.Port).Msg("failed to serve")
}
}