Mirrors/bitslinger
6
0
Fork 0
mirror of https://github.com/xen0bit/bitslinger.git synced 2024-06-29 18:21:32 +00:00
Code Issues Projects Releases Wiki Activity

fix attach/detach HTTP proxy

Browse Source 
closeResponse was hanging infinitely trying to resolve nil resp. Add Failed proxy comms warning to slog context with UUID so it makes sense when connecting/disconnecting proxy at-will
This commit is contained in:
Remy 2022-01-31 21:56:24 -05:00
parent f56fbe9c9f
commit 58de1efd54
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bitslinger.go
View File

@ -281,12 +281,14 @@ func receivePayloadWS(w http.ResponseWriter, r *http.Request) {
}
func closeResponse(resp *http.Response) {
slog := log.With().Str("caller", resp.Request.Header.Get("Packet-Uuid")).Logger()
err := resp.Body.Close()
if err != nil {
slog.Debug().Err(err).Caller().Msg("failed close response body...")
if resp != nil {
slog := log.With().Str("caller", resp.Request.Header.Get("Packet-Uuid")).Logger()
err := resp.Body.Close()
if err != nil {
slog.Debug().Err(err).Caller().Msg("failed close response body...")
}
slog.Trace().Interface("status", resp.StatusCode).Msg("httpModeHandler done")
}
slog.Trace().Interface("status", resp.StatusCode).Msg("httpModeHandler done")
}
func httpModeHandler(pckt manager.Packet) {
@ -301,7 +303,7 @@ func httpModeHandler(pckt manager.Packet) {
return
}
req.Header.Add("Packet-Uuid", pckt.UUID())
slog.Trace().Interface("body", hexEncodedPayload).Msg("Sending HTTP Request")
slog.Trace().Interface("body", string(hexEncodedPayload)).Msg("Sending HTTP Request")
resp, err := httpClient.Do(req)
defer closeResponse(resp)