felixfoertsch/syncthing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 10 Wiki Activity

fix(strelaypoolsrv): correct remote address logging

Browse Source 
Signed-off-by: Jakob Borg <jakob@kastelo.net>
This commit is contained in:
Jakob Borg
2026-04-24 15:19:48 +02:00
parent 1a7825c7ec
commit a7f47d381e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/infra/strelaypoolsrv/main.go
+3 -3
View File
@@ -428,7 +428,7 @@ func handleRegister(w http.ResponseWriter, r *http.Request) {
newRelay.URL = uri.String() newRelay.URL = uri.String()
} else if host != rhost && relayCert == nil { } else if host != rhost && relayCert == nil {
if debug { if debug {
log.Println("IP address advertised does not match client IP address", r.RemoteAddr, uri) log.Println("IP address advertised does not match client IP address", rhost, uri)
} }
http.Error(w, fmt.Sprintf("IP advertised %s does not match client IP %s", host, rhost), http.StatusUnauthorized) http.Error(w, fmt.Sprintf("IP advertised %s does not match client IP %s", host, rhost), http.StatusUnauthorized)
return return
@@ -452,13 +452,13 @@ func handleRegister(w http.ResponseWriter, r *http.Request) {
case requests <- request{&newRelay, reschan, prometheus.NewTimer(relayTestActionsSeconds.WithLabelValues("queue"))}: case requests <- request{&newRelay, reschan, prometheus.NewTimer(relayTestActionsSeconds.WithLabelValues("queue"))}:
result := <-reschan result := <-reschan
if result.err != nil { if result.err != nil {
log.Println("Join from", r.RemoteAddr, "failed:", result.err) log.Println("Join from", rhost, "failed:", result.err)
globalBlocklist.AddError(rhost) globalBlocklist.AddError(rhost)
relayTestsTotal.WithLabelValues("failed").Inc() relayTestsTotal.WithLabelValues("failed").Inc()
http.Error(w, result.err.Error(), http.StatusBadRequest) http.Error(w, result.err.Error(), http.StatusBadRequest)
return return
} }
log.Println("Join from", r.RemoteAddr, "succeeded") log.Println("Join from", rhost, "succeeded")
globalBlocklist.ClearErrors(rhost) globalBlocklist.ClearErrors(rhost)
relayTestsTotal.WithLabelValues("success").Inc() relayTestsTotal.WithLabelValues("success").Inc()
w.Header().Set("Content-Type", "application/json; charset=utf-8") w.Header().Set("Content-Type", "application/json; charset=utf-8")