From 58574b7372cc9dd224ef04aaa438578f72e69a77 Mon Sep 17 00:00:00 2001
From: Jae Kwon <jae@tendermint.com>
Date: Fri, 9 Nov 2018 15:45:50 -0800
Subject: [PATCH] Require addressbook to only store addresses with valid ID

---
 p2p/netaddress.go   | 12 ++++++++++++
 p2p/pex/addrbook.go |  4 ++++
 p2p/pex/errors.go   |  8 ++++++++
 3 files changed, 24 insertions(+)

diff --git a/p2p/netaddress.go b/p2p/netaddress.go
index ec9a0ea7..298ebf0d 100644
--- a/p2p/netaddress.go
+++ b/p2p/netaddress.go
@@ -218,10 +218,22 @@ func (na *NetAddress) Routable() bool {
 // For IPv4 these are either a 0 or all bits set address. For IPv6 a zero
 // address or one that matches the RFC3849 documentation address format.
 func (na *NetAddress) Valid() bool {
+	if string(na.ID) != "" {
+		data, err := hex.DecodeString(string(na.ID))
+		if err != nil || len(data) != IDByteLength {
+			return false
+		}
+	}
 	return na.IP != nil && !(na.IP.IsUnspecified() || na.RFC3849() ||
 		na.IP.Equal(net.IPv4bcast))
 }
 
+// HasID returns true if the address has an ID.
+// NOTE: It does not check whether the ID is valid or not.
+func (na *NetAddress) HasID() bool {
+	return string(na.ID) != ""
+}
+
 // Local returns true if it is a local address.
 func (na *NetAddress) Local() bool {
 	return na.IP.IsLoopback() || zero4.Contains(na.IP)
diff --git a/p2p/pex/addrbook.go b/p2p/pex/addrbook.go
index 61710bbf..405a4628 100644
--- a/p2p/pex/addrbook.go
+++ b/p2p/pex/addrbook.go
@@ -652,6 +652,10 @@ func (a *addrBook) addAddress(addr, src *p2p.NetAddress) error {
 		return ErrAddrBookInvalidAddr{addr}
 	}
 
+	if !addr.HasID() {
+		return ErrAddrBookInvalidAddrNoID{addr}
+	}
+
 	// TODO: we should track ourAddrs by ID and by IP:PORT and refuse both.
 	if _, ok := a.ourAddrs[addr.String()]; ok {
 		return ErrAddrBookSelf{addr}
diff --git a/p2p/pex/errors.go b/p2p/pex/errors.go
index fbee748a..1f44ceee 100644
--- a/p2p/pex/errors.go
+++ b/p2p/pex/errors.go
@@ -54,3 +54,11 @@ type ErrAddrBookInvalidAddr struct {
 func (err ErrAddrBookInvalidAddr) Error() string {
 	return fmt.Sprintf("Cannot add invalid address %v", err.Addr)
 }
+
+type ErrAddrBookInvalidAddrNoID struct {
+	Addr *p2p.NetAddress
+}
+
+func (err ErrAddrBookInvalidAddrNoID) Error() string {
+	return fmt.Sprintf("Cannot add address with no ID %v", err.Addr)
+}