mirror of
https://github.com/syncthing/syncthing.git
synced 2026-05-18 22:03:11 -04:00
This updates our logging framework from legacy freetext strings using the `log` package to structured log entries using `log/slog`. I have updated all INFO or higher level entries, but not yet DEBUG (😓)... So, at a high level: There is a slight change in log levels, effectively adding a new warning level: - DEBUG is still debug (ideally not for users but developers, though this is something we need to work on) - INFO is still info, though I've added more data here, effectively making Syncthing more verbose by default (more on this below) - WARNING is a new log level that is different from the _old_ WARNING (more below) - ERROR is what was WARNING before -- problems that must be dealt with, and also bubbled as a popup in the GUI. A new feature is that the logging level can be set per package to something other than just debug or info, and hence I feel that we can add a bit more things into INFO while moving some (in fact, most) current INFO level warnings into WARNING. For example, I think it's justified to get a log of synced files in INFO and sync failures in WARNING. These are things that have historically been tricky to debug properly, and having more information by default will be useful to many, while still making it possible get close to told level of inscrutability by setting the log level to WARNING. I'd like to get to a stage where DEBUG is never necessary to just figure out what's going on, as opposed to trying to narrow down a likely bug. Code wise: - Our logging object, generally known as `l` in each package, is now a new adapter object that provides the old API on top of the newer one. (This should go away once all old log entries are migrated.) This is only for `l.Debugln` and `l.Debugf`. - There is a new level tracker that keeps the log level for each package. - There is a nested setup of handlers, since the structure mandated by `log/slog` is slightly convoluted (imho). We do this because we need to do formatting at a "medium" level internally so we can buffer log lines in text format but with separate timestamp and log level for the API/GUI to consume. - The `debug` API call becomes a `loglevels` API call, which can set the log level to `DEBUG`, `INFO`, `WARNING` or `ERROR` per package. The GUI is updated to handle this. - Our custom `sync` package provided some debugging of mutexes quite strongly integrated into the old logging framework, only turned on when `STTRACE` was set to certain values at startup, etc. It's been a long time since this has been useful; I removed it. - The `STTRACE` env var remains and can be used the same way as before, while additionally permitting specific log levels to be specified, `STTRACE=model:WARN,scanner:DEBUG`. - There is a new command line option `--log-level=INFO` to set the default log level. - The command line options `--log-flags` and `--verbose` go away, but are currently retained as hidden & ignored options since we set them by default in some of our startup examples and Syncthing would otherwise fail to start. Sample format messages: ``` 2009-02-13 23:31:30 INF A basic info line (attr1="val with spaces" attr2=2 attr3="val\"quote" a=a log.pkg=slogutil) 2009-02-13 23:31:30 INF An info line with grouped values (attr1=val1 foo.attr2=2 foo.bar.attr3=3 a=a log.pkg=slogutil) 2009-02-13 23:31:30 INF An info line with grouped values via logger (foo.attr1=val1 foo.attr2=2 a=a log.pkg=slogutil) 2009-02-13 23:31:30 INF An info line with nested grouped values via logger (bar.foo.attr1=val1 bar.foo.attr2=2 a=a log.pkg=slogutil) 2009-02-13 23:31:30 WRN A warning entry (a=a log.pkg=slogutil) 2009-02-13 23:31:30 ERR An error (a=a log.pkg=slogutil) ``` --------- Co-authored-by: Ross Smith II <ross@smithii.com>
359 lines
8.6 KiB
Go
359 lines
8.6 KiB
Go
// Copyright (C) 2014 The Syncthing Authors.
|
|
//
|
|
// This Source Code Form is subject to the terms of the Mozilla Public
|
|
// License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
|
// You can obtain one at https://mozilla.org/MPL/2.0/.
|
|
|
|
package discover
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"encoding/binary"
|
|
"encoding/hex"
|
|
"errors"
|
|
"fmt"
|
|
"io"
|
|
"log/slog"
|
|
"net"
|
|
"net/url"
|
|
"strconv"
|
|
"time"
|
|
|
|
"github.com/thejerf/suture/v4"
|
|
"google.golang.org/protobuf/proto"
|
|
|
|
"github.com/syncthing/syncthing/internal/gen/discoproto"
|
|
"github.com/syncthing/syncthing/internal/slogutil"
|
|
"github.com/syncthing/syncthing/lib/beacon"
|
|
"github.com/syncthing/syncthing/lib/events"
|
|
"github.com/syncthing/syncthing/lib/protocol"
|
|
"github.com/syncthing/syncthing/lib/rand"
|
|
"github.com/syncthing/syncthing/lib/svcutil"
|
|
)
|
|
|
|
type localClient struct {
|
|
*suture.Supervisor
|
|
myID protocol.DeviceID
|
|
addrList AddressLister
|
|
name string
|
|
evLogger events.Logger
|
|
|
|
beacon beacon.Interface
|
|
localBcastStart time.Time
|
|
localBcastTick <-chan time.Time
|
|
forcedBcastTick chan time.Time
|
|
|
|
*cache
|
|
}
|
|
|
|
const (
|
|
BroadcastInterval = 30 * time.Second
|
|
CacheLifeTime = 3 * BroadcastInterval
|
|
Magic = uint32(0x2EA7D90B) // same as in BEP
|
|
v13Magic = uint32(0x7D79BC40) // previous version
|
|
)
|
|
|
|
func NewLocal(id protocol.DeviceID, addr string, addrList AddressLister, evLogger events.Logger) (FinderService, error) {
|
|
c := &localClient{
|
|
Supervisor: suture.New("local", svcutil.SpecWithDebugLogger()),
|
|
myID: id,
|
|
addrList: addrList,
|
|
evLogger: evLogger,
|
|
localBcastTick: time.NewTicker(BroadcastInterval).C,
|
|
forcedBcastTick: make(chan time.Time),
|
|
localBcastStart: time.Now(),
|
|
cache: newCache(),
|
|
}
|
|
|
|
host, port, err := net.SplitHostPort(addr)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
if host == "" {
|
|
// A broadcast client
|
|
c.name = "IPv4 local"
|
|
bcPort, err := strconv.Atoi(port)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
c.beacon = beacon.NewBroadcast(bcPort)
|
|
} else {
|
|
// A multicast client
|
|
c.name = "IPv6 local"
|
|
c.beacon = beacon.NewMulticast(addr)
|
|
}
|
|
c.Add(c.beacon)
|
|
c.Add(svcutil.AsService(c.recvAnnouncements, fmt.Sprintf("%s/recv", c)))
|
|
|
|
c.Add(svcutil.AsService(c.sendLocalAnnouncements, fmt.Sprintf("%s/sendLocal", c)))
|
|
|
|
return c, nil
|
|
}
|
|
|
|
// Lookup returns a list of addresses the device is available at.
|
|
func (c *localClient) Lookup(_ context.Context, device protocol.DeviceID) (addresses []string, err error) {
|
|
if cache, ok := c.Get(device); ok {
|
|
if time.Since(cache.when) < CacheLifeTime {
|
|
addresses = cache.Addresses
|
|
}
|
|
}
|
|
|
|
return
|
|
}
|
|
|
|
func (c *localClient) String() string {
|
|
return c.name
|
|
}
|
|
|
|
func (c *localClient) Error() error {
|
|
return c.beacon.Error()
|
|
}
|
|
|
|
// announcementPkt appends the local discovery packet to send to msg. Returns
|
|
// true if the packet should be sent, false if there is nothing useful to
|
|
// send.
|
|
func (c *localClient) announcementPkt(instanceID int64, msg []byte) ([]byte, bool) {
|
|
addrs := c.addrList.AllAddresses()
|
|
|
|
// remove all addresses which are not dialable
|
|
addrs = filterUndialableLocal(addrs)
|
|
|
|
// do not leak relay tokens to discovery
|
|
addrs = sanitizeRelayAddresses(addrs)
|
|
|
|
if len(addrs) == 0 {
|
|
// Nothing to announce
|
|
return msg, false
|
|
}
|
|
|
|
pkt := &discoproto.Announce{
|
|
Id: c.myID[:],
|
|
Addresses: addrs,
|
|
InstanceId: instanceID,
|
|
}
|
|
bs, _ := proto.Marshal(pkt)
|
|
|
|
if pktLen := 4 + len(bs); cap(msg) < pktLen {
|
|
msg = make([]byte, 0, pktLen)
|
|
}
|
|
msg = msg[:4]
|
|
binary.BigEndian.PutUint32(msg, Magic)
|
|
msg = append(msg, bs...)
|
|
|
|
return msg, true
|
|
}
|
|
|
|
func (c *localClient) sendLocalAnnouncements(ctx context.Context) error {
|
|
var msg []byte
|
|
var ok bool
|
|
instanceID := rand.Int63()
|
|
for {
|
|
if msg, ok = c.announcementPkt(instanceID, msg[:0]); ok {
|
|
c.beacon.Send(msg)
|
|
}
|
|
|
|
select {
|
|
case <-c.localBcastTick:
|
|
case <-c.forcedBcastTick:
|
|
case <-ctx.Done():
|
|
return ctx.Err()
|
|
}
|
|
}
|
|
}
|
|
|
|
func (c *localClient) recvAnnouncements(ctx context.Context) error {
|
|
b := c.beacon
|
|
warnedAbout := make(map[string]bool)
|
|
for {
|
|
select {
|
|
case <-ctx.Done():
|
|
return ctx.Err()
|
|
default:
|
|
}
|
|
|
|
buf, addr := b.Recv()
|
|
if addr == nil {
|
|
continue
|
|
}
|
|
if len(buf) < 4 {
|
|
slog.DebugContext(ctx, "received short packet", "address", addr.String())
|
|
continue
|
|
}
|
|
|
|
magic := binary.BigEndian.Uint32(buf)
|
|
switch magic {
|
|
case Magic:
|
|
// All good
|
|
|
|
case v13Magic:
|
|
// Old version
|
|
if !warnedAbout[addr.String()] {
|
|
slog.ErrorContext(ctx, "Incompatible (v0.13) local discovery packet - upgrade that device to connect", slogutil.Address(addr))
|
|
warnedAbout[addr.String()] = true
|
|
}
|
|
continue
|
|
|
|
default:
|
|
slog.DebugContext(ctx, "Incorrect magic", "magic", magic, "address", addr)
|
|
continue
|
|
}
|
|
|
|
var pkt discoproto.Announce
|
|
err := proto.Unmarshal(buf[4:], &pkt)
|
|
if err != nil && !errors.Is(err, io.EOF) {
|
|
slog.DebugContext(ctx, "Failed to unmarshal local announcement", "address", addr, slogutil.Error(err), "packet", hex.Dump(buf[4:]))
|
|
continue
|
|
}
|
|
|
|
id, _ := protocol.DeviceIDFromBytes(pkt.Id)
|
|
slog.DebugContext(ctx, "Received local announcement", "address", addr, "device", id)
|
|
|
|
var newDevice bool
|
|
if !bytes.Equal(pkt.Id, c.myID[:]) {
|
|
newDevice = c.registerDevice(addr, &pkt)
|
|
}
|
|
|
|
if newDevice {
|
|
// Force a transmit to announce ourselves, if we are ready to do
|
|
// so right away.
|
|
select {
|
|
case c.forcedBcastTick <- time.Now():
|
|
default:
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
func (c *localClient) registerDevice(src net.Addr, device *discoproto.Announce) bool {
|
|
// Remember whether we already had a valid cache entry for this device.
|
|
// If the instance ID has changed the remote device has restarted since
|
|
// we last heard from it, so we should treat it as a new device.
|
|
|
|
id, err := protocol.DeviceIDFromBytes(device.Id)
|
|
if err != nil {
|
|
l.Debugf("discover: Failed to parse device ID %x: %v", device.Id, err)
|
|
return false
|
|
}
|
|
|
|
ce, existsAlready := c.Get(id)
|
|
isNewDevice := !existsAlready || time.Since(ce.when) > CacheLifeTime || ce.instanceID != device.InstanceId
|
|
|
|
// Any empty or unspecified addresses should be set to the source address
|
|
// of the announcement. We also skip any addresses we can't parse.
|
|
|
|
l.Debugln("discover: Registering addresses for", id)
|
|
var validAddresses []string
|
|
for _, addr := range device.Addresses {
|
|
u, err := url.Parse(addr)
|
|
if err != nil {
|
|
continue
|
|
}
|
|
|
|
tcpAddr, err := net.ResolveTCPAddr("tcp", u.Host)
|
|
if err != nil {
|
|
continue
|
|
}
|
|
|
|
if len(tcpAddr.IP) == 0 || tcpAddr.IP.IsUnspecified() {
|
|
srcAddr, err := net.ResolveTCPAddr("tcp", src.String())
|
|
if err != nil {
|
|
continue
|
|
}
|
|
|
|
// Do not use IPv6 source address if requested scheme is tcp4
|
|
if u.Scheme == "tcp4" && srcAddr.IP.To4() == nil {
|
|
continue
|
|
}
|
|
|
|
// Do not use IPv4 source address if requested scheme is tcp6
|
|
if u.Scheme == "tcp6" && srcAddr.IP.To4() != nil {
|
|
continue
|
|
}
|
|
|
|
host, _, err := net.SplitHostPort(src.String())
|
|
if err != nil {
|
|
continue
|
|
}
|
|
u.Host = net.JoinHostPort(host, strconv.Itoa(tcpAddr.Port))
|
|
l.Debugf("discover: Reconstructed URL is %v", u)
|
|
validAddresses = append(validAddresses, u.String())
|
|
l.Debugf("discover: Replaced address %v in %s to get %s", tcpAddr.IP, addr, u.String())
|
|
} else {
|
|
validAddresses = append(validAddresses, addr)
|
|
l.Debugf("discover: Accepted address %s verbatim", addr)
|
|
}
|
|
}
|
|
|
|
c.Set(id, CacheEntry{
|
|
Addresses: validAddresses,
|
|
when: time.Now(),
|
|
found: true,
|
|
instanceID: device.InstanceId,
|
|
})
|
|
|
|
if isNewDevice {
|
|
c.evLogger.Log(events.DeviceDiscovered, map[string]interface{}{
|
|
"device": id.String(),
|
|
"addrs": validAddresses,
|
|
})
|
|
}
|
|
|
|
return isNewDevice
|
|
}
|
|
|
|
// filterUndialableLocal returns the list of addresses after removing any
|
|
// localhost, multicast, broadcast or port-zero addresses.
|
|
func filterUndialableLocal(addrs []string) []string {
|
|
filtered := addrs[:0]
|
|
for _, addr := range addrs {
|
|
u, err := url.Parse(addr)
|
|
if err != nil {
|
|
continue
|
|
}
|
|
|
|
tcpAddr, err := net.ResolveTCPAddr("tcp", u.Host)
|
|
if err != nil {
|
|
continue
|
|
}
|
|
|
|
switch {
|
|
case len(tcpAddr.IP) == 0:
|
|
case tcpAddr.Port == 0:
|
|
case tcpAddr.IP.IsGlobalUnicast(), tcpAddr.IP.IsLinkLocalUnicast(), tcpAddr.IP.IsUnspecified():
|
|
filtered = append(filtered, addr)
|
|
}
|
|
}
|
|
return filtered
|
|
}
|
|
|
|
func sanitizeRelayAddresses(addrs []string) []string {
|
|
filtered := addrs[:0]
|
|
allowlist := []string{"id"}
|
|
|
|
for _, addr := range addrs {
|
|
u, err := url.Parse(addr)
|
|
if err != nil {
|
|
continue
|
|
}
|
|
|
|
if u.Scheme == "relay" {
|
|
s := url.Values{}
|
|
q := u.Query()
|
|
|
|
for _, w := range allowlist {
|
|
if q.Has(w) {
|
|
s.Add(w, q.Get(w))
|
|
}
|
|
}
|
|
|
|
u.RawQuery = s.Encode()
|
|
addr = u.String()
|
|
}
|
|
|
|
filtered = append(filtered, addr)
|
|
}
|
|
return filtered
|
|
}
|