ban LegacyVersion CRDS

anza-xyz · Feb 4, 2025 · 518f1b4 · 518f1b4
1 parent fa70b00
commit 518f1b4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/gossip/src/crds_data.rs b/gossip/src/crds_data.rs
@@ -89,7 +89,7 @@ impl Sanitize for CrdsData {
                 }
                 val.sanitize()
             }
-            CrdsData::LegacyVersion(version) => version.sanitize(),
+            CrdsData::LegacyVersion(_) => Err(SanitizeError::InvalidValue),
             CrdsData::Version(version) => version.sanitize(),
             CrdsData::NodeInstance(node) => node.sanitize(),
             CrdsData::DuplicateShred(ix, shred) => {

diff --git a/gossip/src/protocol.rs b/gossip/src/protocol.rs
@@ -154,10 +154,10 @@ impl Sanitize for Protocol {
             Protocol::PullRequest(filter, val) => {
                 filter.sanitize()?;
                 // PullRequest is only allowed to have ContactInfo in its CrdsData
-                if let CrdsData::LegacyContactInfo(_) | CrdsData::ContactInfo(_) = val.data() {
-                    return val.sanitize();
+                match val.data() {
+                    CrdsData::LegacyContactInfo(_) | CrdsData::ContactInfo(_) => val.sanitize(),
+                    _ => Err(SanitizeError::InvalidValue),
                 }
-                return Err(SanitizeError::InvalidValue);
             }
             Protocol::PullResponse(_, val) => {
                 // PullResponse is allowed to carry anything in its CrdsData, except for deprecated fields