TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-25 19:15:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

util/deephash: disambiguate hashing of AppendTo (#2483)

Browse Source 
Prepend size to AppendTo output.

Fixes #2443

Signed-off-by: Joe Tsai <joetsai@digital-static.net>
This commit is contained in:
Joe Tsai 2021-07-21 11:29:08 -07:00 committed by GitHub
parent 23ad028414
commit d666bd8533
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
util/deephash/deephash.go
View File

@ -147,8 +147,10 @@ func (h *hasher) print(v reflect.Value) (acyclic bool) {
// Use AppendTo methods, if available and cheap. // Use AppendTo methods, if available and cheap.
if v.CanAddr() && v.Type().Implements(appenderToType) { if v.CanAddr() && v.Type().Implements(appenderToType) {
a := v.Addr().Interface().(appenderTo) a := v.Addr().Interface().(appenderTo)
scratch := a.AppendTo(h.scratch[:0]) size := h.scratch[:8]
w.Write(scratch) record := a.AppendTo(size)
binary.LittleEndian.PutUint64(record, uint64(len(record)-len(size)))
w.Write(record)
return true return true
} }
} }

8
util/deephash/deephash_test.go
View File

@ -22,6 +22,12 @@
"tailscale.com/wgengine/wgcfg" "tailscale.com/wgengine/wgcfg"
) )
type appendBytes []byte
func (p appendBytes) AppendTo(b []byte) []byte {
return append(b, p...)
}
func TestHash(t *testing.T) { func TestHash(t *testing.T) {
type tuple [2]interface{} type tuple [2]interface{}
type iface struct{ X interface{} } type iface struct{ X interface{} }
@ -31,6 +37,8 @@ type iface struct{ X interface{
in tuple in tuple
wantEq bool wantEq bool
}{ }{
{in: tuple{[]appendBytes{{}, {0, 0, 0, 0, 0, 0, 0, 1}}, []appendBytes{{}, {0, 0, 0, 0, 0, 0, 0, 1}}}, wantEq: true},
{in: tuple{[]appendBytes{{}, {0, 0, 0, 0, 0, 0, 0, 1}}, []appendBytes{{0, 0, 0, 0, 0, 0, 0, 1}, {}}}, wantEq: false},
{in: tuple{iface{MyBool(true)}, iface{MyBool(true)}}, wantEq: true}, {in: tuple{iface{MyBool(true)}, iface{MyBool(true)}}, wantEq: true},
{in: tuple{iface{true}, iface{MyBool(true)}}, wantEq: false}, {in: tuple{iface{true}, iface{MyBool(true)}}, wantEq: false},
{in: tuple{iface{MyHeader{}}, iface{MyHeader{}}}, wantEq: true}, {in: tuple{iface{MyHeader{}}, iface{MyHeader{}}}, wantEq: true},