TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-10-10 09:45:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

tailcfg: move NodeKey type to types/key.

Browse Source 
This leaves behind a type alias and associated constructor, to allow
for gradual switchover.

Updates #3206.

Signed-off-by: David Anderson <danderson@tailscale.com>
This commit is contained in:
David Anderson
2021-10-29 16:02:38 -07:00
parent 15d329b4fa
commit ff16e58d23
5 changed files with 121 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
tailcfg/tailcfg_test.go
View File

@@ -5,7 +5,6 @@
package tailcfg
import (
"bytes"
"encoding"
"encoding/json"
"reflect"
@@ -265,13 +264,13 @@ func TestNodeEqual(t *testing.T) {
true,
},
{
&Node{Key: NodeKeyFromNodePublic(n1)},
&Node{Key: NodeKeyFromNodePublic(key.NewNode().Public())},
&Node{Key: n1.AsNodeKey()},
&Node{Key: key.NewNode().Public().AsNodeKey()},
false,
},
{
&Node{Key: NodeKeyFromNodePublic(n1)},
&Node{Key: NodeKeyFromNodePublic(n1)},
&Node{Key: n1.AsNodeKey()},
&Node{Key: n1.AsNodeKey()},
true,
},
{
@@ -408,52 +407,6 @@ func TestNetInfoFields(t *testing.T) {
}
}
func TestNodeKeyMarshal(t *testing.T) {
var k1, k2 NodeKey
for i := range k1 {
k1[i] = byte(i)
}
testKey(t, "nodekey:", k1, &k2)
}
func TestNodeKeyRoundTrip(t *testing.T) {
serialized := `{
"Pub":"nodekey:50d20b455ecf12bc453f83c2cfdb2a24925d06cf2598dcaa54e91af82ce9f765"
}`
// Carefully check that the expected serialized data decodes and
// re-encodes to the expected keys. These types are serialized to
// disk all over the place and need to be stable.
pub := NodeKey{
0x50, 0xd2, 0xb, 0x45, 0x5e, 0xcf, 0x12, 0xbc, 0x45, 0x3f, 0x83,
0xc2, 0xcf, 0xdb, 0x2a, 0x24, 0x92, 0x5d, 0x6, 0xcf, 0x25, 0x98,
0xdc, 0xaa, 0x54, 0xe9, 0x1a, 0xf8, 0x2c, 0xe9, 0xf7, 0x65,
}
type key struct {
Pub NodeKey
}
var a key
if err := json.Unmarshal([]byte(serialized), &a); err != nil {
t.Fatal(err)
}
if a.Pub != pub {
t.Errorf("wrong deserialization of public key, got %#v want %#v", a.Pub, pub)
}
bs, err := json.MarshalIndent(a, "", " ")
if err != nil {
t.Fatal(err)
}
var b bytes.Buffer
json.Indent(&b, []byte(serialized), "", " ")
if got, want := string(bs), b.String(); got != want {
t.Error("json serialization doesn't roundtrip")
}
}
func TestDiscoKeyMarshal(t *testing.T) {
var k1, k2 DiscoKey
for i := range k1 {