mirror of
https://github.com/octoleo/syncthing.git
synced 2024-09-19 13:19:01 +00:00
Emit Node/Repo Rejected events on unknown nodes / repos.
This commit is contained in:
parent
b221e4d445
commit
6bbf1f9355
@ -846,6 +846,10 @@ next:
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
events.Default.Log(events.NodeRejected, map[string]string{
|
||||||
|
"node": remoteID.String(),
|
||||||
|
"address": conn.RemoteAddr().String(),
|
||||||
|
})
|
||||||
l.Infof("Connection from %s with unknown node ID %s; ignoring", conn.RemoteAddr(), remoteID)
|
l.Infof("Connection from %s with unknown node ID %s; ignoring", conn.RemoteAddr(), remoteID)
|
||||||
conn.Close()
|
conn.Close()
|
||||||
}
|
}
|
||||||
|
@ -20,10 +20,12 @@ const (
|
|||||||
NodeDiscovered
|
NodeDiscovered
|
||||||
NodeConnected
|
NodeConnected
|
||||||
NodeDisconnected
|
NodeDisconnected
|
||||||
|
NodeRejected
|
||||||
LocalIndexUpdated
|
LocalIndexUpdated
|
||||||
RemoteIndexUpdated
|
RemoteIndexUpdated
|
||||||
ItemStarted
|
ItemStarted
|
||||||
StateChanged
|
StateChanged
|
||||||
|
RepoRejected
|
||||||
|
|
||||||
AllEvents = ^EventType(0)
|
AllEvents = ^EventType(0)
|
||||||
)
|
)
|
||||||
@ -42,6 +44,8 @@ func (t EventType) String() string {
|
|||||||
return "NodeConnected"
|
return "NodeConnected"
|
||||||
case NodeDisconnected:
|
case NodeDisconnected:
|
||||||
return "NodeDisconnected"
|
return "NodeDisconnected"
|
||||||
|
case NodeRejected:
|
||||||
|
return "NodeRejected"
|
||||||
case LocalIndexUpdated:
|
case LocalIndexUpdated:
|
||||||
return "LocalIndexUpdated"
|
return "LocalIndexUpdated"
|
||||||
case RemoteIndexUpdated:
|
case RemoteIndexUpdated:
|
||||||
@ -50,6 +54,8 @@ func (t EventType) String() string {
|
|||||||
return "ItemStarted"
|
return "ItemStarted"
|
||||||
case StateChanged:
|
case StateChanged:
|
||||||
return "StateChanged"
|
return "StateChanged"
|
||||||
|
case RepoRejected:
|
||||||
|
return "RepoRejected"
|
||||||
default:
|
default:
|
||||||
return "Unknown"
|
return "Unknown"
|
||||||
}
|
}
|
||||||
|
@ -332,6 +332,10 @@ func (m *Model) Index(nodeID protocol.NodeID, repo string, fs []protocol.FileInf
|
|||||||
}
|
}
|
||||||
|
|
||||||
if !m.repoSharedWith(repo, nodeID) {
|
if !m.repoSharedWith(repo, nodeID) {
|
||||||
|
events.Default.Log(events.RepoRejected, map[string]string{
|
||||||
|
"repo": repo,
|
||||||
|
"node": nodeID.String(),
|
||||||
|
})
|
||||||
l.Warnf("Unexpected repository ID %q sent from node %q; ensure that the repository exists and that this node is selected under \"Share With\" in the repository configuration.", repo, nodeID)
|
l.Warnf("Unexpected repository ID %q sent from node %q; ensure that the repository exists and that this node is selected under \"Share With\" in the repository configuration.", repo, nodeID)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user