Add option to enforce identical app name in pings #206
Conversation
mennopruijssers
left a comment
There was a problem hiding this comment.
As stated before: I strongly suggest implementing some integration tests in ringpop-common as well.
| SelfEvict SelfEvictOptions | ||
|
|
||
| // If set to true, ping requests without identical app name return error | ||
| RequiresAppInPing bool |
There was a problem hiding this comment.
The name of this field doesn't really reflect the behaviour. RequiresIdenticalAppName might make more sense. The fact that this is enforced during pings is an implementation detail
There was a problem hiding this comment.
Oh, it is actually handled as a RequiresAppInPing ping_handler.go:41...
Either change behaviour and name or the comment above
swim/node.go
Outdated
| PingRatio: .4, | ||
| }, | ||
|
|
||
| RequiresAppInPing: false, |
There was a problem hiding this comment.
not needed: the zero value of a bool is already false.
swim/ping_handler.go
Outdated
|
|
||
| if req.App == "" { | ||
| if node.requiresAppInPing { | ||
| node.logger.Warnf("Rejected ping from unknown ringpop app %s", req.App) |
There was a problem hiding this comment.
req.App will always be empty here.
swim/ping_handler.go
Outdated
| } | ||
| } else { | ||
| if req.App != node.app { | ||
| node.logger.Warnf("Rejected ping from wrong ringpop app %s", req.App) |
There was a problem hiding this comment.
normally we would use something like node.logger.WithField("app", req.App).Warn("Rejected ping from wrong ringpop app"). That way searching in ES is easier because all the messages are the same.
swim/ping_handler.go
Outdated
| Changes: changes, | ||
| Source: node.Address(), | ||
| SourceIncarnation: node.Incarnation(), | ||
| App: node.app, |
There was a problem hiding this comment.
This is the reason why the integration tests are failing due to a json-schema validation error. You only added app to ping-request while also sending in the ping-response here.
mennopruijssers
left a comment
There was a problem hiding this comment.
two comments left, but looks good to me (if build passes now ;))
swim/ping_handler.go
Outdated
| if req.App == "" { | ||
| if node.requiresAppInPing { | ||
| node.logger.Warnf("Rejected ping from unknown ringpop app %s", req.App) | ||
| node.logger.WithFields("req", req).Warnf("Rejected ping from unknown ringpop app") |
There was a problem hiding this comment.
Don't add the full req. It could be huge (due to Changes). Source might be enough.
swim/ping_handler.go
Outdated
| } else { | ||
| if req.App != node.app { | ||
| node.logger.Warnf("Rejected ping from wrong ringpop app %s", req.App) | ||
| node.logger.WithFields("req", req).Warn("Rejected ping from wrong ringpop app") |
There was a problem hiding this comment.
Same but also consider adding req.App
Always reject pings from wrong app name
d82e843 to
a2e53a1
Compare
Always reject pings from wrong app name