fix http download for binary

sonroyaalmerol · Dec 19, 2024 · 4afb1d7 · 4afb1d7
1 parent f8a74da
commit 4afb1d7
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 20 deletions.
diff --git a/cmd/windows_agent/service.go b/cmd/windows_agent/service.go
@@ -59,7 +59,7 @@ func (p *agentService) Start(s service.Service) error {
 func (p *agentService) startPing() {
 	ping := func() {
 		var pingResp PingResp
-		pingErr := agent.ProxmoxHTTPRequest(http.MethodGet, "/api2/json/ping", nil, &pingResp)
+		_, pingErr := agent.ProxmoxHTTPRequest(http.MethodGet, "/api2/json/ping", nil, &pingResp)
 		if pingErr != nil {
 			agent.SetStatus(fmt.Sprintf("Error - (%s)", pingErr.Error()))
 		} else if !pingResp.Data.Pong {
@@ -94,7 +94,7 @@ func (p *agentService) versionCheck() {
 	}
 
 	versionCheck := func() {
-		_ = agent.ProxmoxHTTPRequest(http.MethodGet, "/api2/json/plus/version", nil, &versionResp)
+		_, _ = agent.ProxmoxHTTPRequest(http.MethodGet, "/api2/json/plus/version", nil, &versionResp)
 	}
 
 	versionCheck()
@@ -105,20 +105,26 @@ func (p *agentService) versionCheck() {
 			return
 		case <-time.After(time.Minute * 2):
 			if versionResp.Version != Version {
-				var dlResp io.Reader
-				err := agent.ProxmoxHTTPRequest(http.MethodGet, "/api2/json/plus/binary", dlResp, nil)
+				var dlResp io.ReadCloser
+				dlResp, err := agent.ProxmoxHTTPRequest(http.MethodGet, "/api2/json/plus/binary", nil, nil)
 				if err != nil {
 					if hasLogger {
 						logger.Errorf("Update download %s error: %s", versionResp.Version, err)
 					}
 					continue
 				}
 
+				closeResp := func() {
+					_, _ = io.Copy(io.Discard, dlResp)
+					dlResp.Close()
+				}
+
 				err = selfupdate.Apply(dlResp, selfupdate.Options{})
 				if err != nil {
 					if hasLogger {
 						logger.Errorf("Update download %s error: %s", versionResp.Version, err)
 					}
+					closeResp()
 					continue
 				}
 
@@ -127,6 +133,7 @@ func (p *agentService) versionCheck() {
 					if hasLogger {
 						logger.Errorf("Update download %s error: %s", versionResp.Version, err)
 					}
+					closeResp()
 					continue
 				}
 
@@ -187,16 +194,20 @@ func (p *agentService) run() {
 			return
 		}
 
-		err = agent.ProxmoxHTTPRequest(
+		body, err := agent.ProxmoxHTTPRequest(
 			http.MethodPost,
 			"/api2/json/d2d/target/agent",
 			bytes.NewBuffer(reqBody),
 			nil,
 		)
+
 		if err != nil {
 			logger.Errorf("Agent drives update error: %v", err)
 			return
 		}
+
+		_, _ = io.Copy(io.Discard, body)
+		body.Close()
 	}()
 
 	for _, drive := range drives {

diff --git a/internal/agent/cache/exclusions.go b/internal/agent/cache/exclusions.go
@@ -22,7 +22,7 @@ type ExclusionResp struct {
 
 func CompileExcludedPaths() []*regexp.Regexp {
 	var exclusionResp ExclusionResp
-	err := agent.ProxmoxHTTPRequest(
+	_, err := agent.ProxmoxHTTPRequest(
 		http.MethodGet,
 		"/api2/json/d2d/exclusion",
 		nil,

diff --git a/internal/agent/cache/partial_files.go b/internal/agent/cache/partial_files.go
@@ -24,7 +24,7 @@ var PartialFilePathRegexes = CompilePartialFileList()
 
 func CompilePartialFileList() []*regexp.Regexp {
 	var partialResp PartialFileResp
-	err := agent.ProxmoxHTTPRequest(
+	_, err := agent.ProxmoxHTTPRequest(
 		http.MethodGet,
 		"/api2/json/d2d/partial-file",
 		nil,

diff --git a/internal/agent/http.go b/internal/agent/http.go
@@ -19,11 +19,11 @@ import (
 
 var httpClient *http.Client
 
-func ProxmoxHTTPRequest(method, url string, body io.Reader, respBody any) error {
+func ProxmoxHTTPRequest(method, url string, body io.Reader, respBody any) (io.ReadCloser, error) {
 	serverUrl := ""
 	key, err := registry.OpenKey(registry.LOCAL_MACHINE, `Software\PBSPlus\Config`, registry.QUERY_VALUE)
 	if err != nil {
-		return fmt.Errorf("ProxmoxHTTPRequest: server url not found -> %w", err)
+		return nil, fmt.Errorf("ProxmoxHTTPRequest: server url not found -> %w", err)
 	}
 	defer key.Close()
 
@@ -42,7 +42,7 @@ func ProxmoxHTTPRequest(method, url string, body io.Reader, respBody any) error
 	}
 
 	if serverUrl, _, err = key.GetStringValue("ServerURL"); err != nil || serverUrl == "" {
-		return fmt.Errorf("ProxmoxHTTPRequest: server url not found -> %w", err)
+		return nil, fmt.Errorf("ProxmoxHTTPRequest: server url not found -> %w", err)
 	}
 
 	req, err := http.NewRequest(
@@ -56,7 +56,7 @@ func ProxmoxHTTPRequest(method, url string, body io.Reader, respBody any) error
 	)
 
 	if err != nil {
-		return fmt.Errorf("ProxmoxHTTPRequest: error creating http request -> %w", err)
+		return nil, fmt.Errorf("ProxmoxHTTPRequest: error creating http request -> %w", err)
 	}
 
 	hostname, _ := os.Hostname()
@@ -76,24 +76,27 @@ func ProxmoxHTTPRequest(method, url string, body io.Reader, respBody any) error
 
 	resp, err := httpClient.Do(req)
 	if err != nil {
-		return fmt.Errorf("ProxmoxHTTPRequest: error executing http request -> %w", err)
+		return nil, fmt.Errorf("ProxmoxHTTPRequest: error executing http request -> %w", err)
 	}
+
+	if respBody == nil {
+		return resp.Body, nil
+	}
+
 	defer func() {
 		_, _ = io.Copy(io.Discard, resp.Body)
 		resp.Body.Close()
 	}()
 
 	rawBody, err := io.ReadAll(resp.Body)
 	if err != nil {
-		return fmt.Errorf("ProxmoxHTTPRequest: error getting body content -> %w", err)
+		return nil, fmt.Errorf("ProxmoxHTTPRequest: error getting body content -> %w", err)
 	}
 
-	if respBody != nil {
-		err = json.Unmarshal(rawBody, respBody)
-		if err != nil {
-			return fmt.Errorf("ProxmoxHTTPRequest: error json unmarshal body content (%s) -> %w", string(rawBody), err)
-		}
+	err = json.Unmarshal(rawBody, respBody)
+	if err != nil {
+		return nil, fmt.Errorf("ProxmoxHTTPRequest: error json unmarshal body content (%s) -> %w", string(rawBody), err)
 	}
 
-	return nil
+	return nil, nil
 }
diff --git a/internal/syslog/windows.go b/internal/syslog/windows.go
@@ -6,6 +6,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
+	"io"
 	"log"
 	"net/http"
 	"os"
@@ -46,12 +47,16 @@ func (l *Logger) logToServer(level string, msg string) {
 		return
 	}
 
-	_ = agent.ProxmoxHTTPRequest(
+	body, err := agent.ProxmoxHTTPRequest(
 		http.MethodPost,
 		"/api2/json/d2d/agent-log",
 		bytes.NewBuffer(reqBody),
 		nil,
 	)
+	if err == nil {
+		_, _ = io.Copy(io.Discard, body)
+		body.Close()
+	}
 }
 
 func (l *Logger) Infof(format string, v ...any) {