octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-01-02 14:42:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(stdiscosrv): handle announcements properly :p (#9881)

Browse Source 
Further protobuf refactor damage, also adding some better debugging
This commit is contained in:
Jakob Borg 2024-12-19 21:43:46 +01:00 committed by GitHub
parent 4355dc69ea
commit b5a7879eca
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
cmd/stdiscosrv/apisrv.go
View File

@ -120,7 +120,9 @@ func (s *apiSrv) Serve(ctx context.Context) error {
ReadTimeout: httpReadTimeout, ReadTimeout: httpReadTimeout,
WriteTimeout: httpWriteTimeout, WriteTimeout: httpWriteTimeout,
MaxHeaderBytes: httpMaxHeaderBytes, MaxHeaderBytes: httpMaxHeaderBytes,
ErrorLog: log.New(io.Discard, "", 0), }
if !debug {
srv.ErrorLog = log.New(io.Discard, "", 0)
} }
go func() { go func() {
@ -196,7 +198,7 @@ func (s *apiSrv) handleGET(w http.ResponseWriter, req *http.Request) {
deviceID, err := protocol.DeviceIDFromString(req.URL.Query().Get("device")) deviceID, err := protocol.DeviceIDFromString(req.URL.Query().Get("device"))
if err != nil { if err != nil {
if debug { if debug {
log.Println(reqID, "bad device param") log.Println(reqID, "bad device param:", err)
} }
lookupRequestsTotal.WithLabelValues("bad_request").Inc() lookupRequestsTotal.WithLabelValues("bad_request").Inc()
w.Header().Set("Retry-After", errorRetryAfterString()) w.Header().Set("Retry-After", errorRetryAfterString())
@ -281,6 +283,9 @@ func (s *apiSrv) handlePOST(remoteAddr *net.TCPAddr, w http.ResponseWriter, req
addresses := fixupAddresses(remoteAddr, ann.Addresses) addresses := fixupAddresses(remoteAddr, ann.Addresses)
if len(addresses) == 0 { if len(addresses) == 0 {
if debug {
log.Println(reqID, "no addresses")
}
announceRequestsTotal.WithLabelValues("bad_request").Inc() announceRequestsTotal.WithLabelValues("bad_request").Inc()
w.Header().Set("Retry-After", errorRetryAfterString()) w.Header().Set("Retry-After", errorRetryAfterString())
http.Error(w, "Bad Request", http.StatusBadRequest) http.Error(w, "Bad Request", http.StatusBadRequest)
@ -288,6 +293,9 @@ func (s *apiSrv) handlePOST(remoteAddr *net.TCPAddr, w http.ResponseWriter, req
} }
if err := s.handleAnnounce(deviceID, addresses); err != nil { if err := s.handleAnnounce(deviceID, addresses); err != nil {
if debug {
log.Println(reqID, "handle:", err)
}
announceRequestsTotal.WithLabelValues("internal_error").Inc() announceRequestsTotal.WithLabelValues("internal_error").Inc()
w.Header().Set("Retry-After", errorRetryAfterString()) w.Header().Set("Retry-After", errorRetryAfterString())
http.Error(w, "Internal Server Error", http.StatusInternalServerError) http.Error(w, "Internal Server Error", http.StatusInternalServerError)
@ -298,6 +306,9 @@ func (s *apiSrv) handlePOST(remoteAddr *net.TCPAddr, w http.ResponseWriter, req
w.Header().Set("Reannounce-After", reannounceAfterString()) w.Header().Set("Reannounce-After", reannounceAfterString())
w.WriteHeader(http.StatusNoContent) w.WriteHeader(http.StatusNoContent)
if debug {
log.Println(reqID, "announced", deviceID, addresses)
}
} }
func (s *apiSrv) Stop() { func (s *apiSrv) Stop() {
@ -315,8 +326,10 @@ func (s *apiSrv) handleAnnounce(deviceID protocol.DeviceID, addresses []string)
dbAddrs := make([]*discosrv.DatabaseAddress, len(addresses)) dbAddrs := make([]*discosrv.DatabaseAddress, len(addresses))
for i := range addresses { for i := range addresses {
dbAddrs[i].Address = addresses[i] dbAddrs[i] = &discosrv.DatabaseAddress{
dbAddrs[i].Expires = expire Address: addresses[i],
Expires: expire,
}
} }
seen := now.UnixNano() seen := now.UnixNano()
@ -327,7 +340,7 @@ func (s *apiSrv) handleAnnounce(deviceID protocol.DeviceID, addresses []string)
} }
func handlePing(w http.ResponseWriter, _ *http.Request) { func handlePing(w http.ResponseWriter, _ *http.Request) {
w.WriteHeader(204) w.WriteHeader(http.StatusNoContent)
} }
func certificateBytes(req *http.Request) ([]byte, error) { func certificateBytes(req *http.Request) ([]byte, error) {