aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGavin Andresen <gavinandresen@gmail.com>2012-08-26 17:08:18 -0400
committerLuke Dashjr <luke-jr+git@utopios.org>2012-08-27 18:57:15 +0000
commit7b66ece1e594782bd1310edda8bcc27015976e6f (patch)
tree11807b53091b8faaa119f581f0c70e9949f21d3a /src
parentf31f7770d983eb85d8804c49654fc1f97b55ef7d (diff)
Alert system DoS prevention
This fixes two alert system vulnerabilities found by Sergio Lerner; you could send peers unlimited numbers of invalid alert message to try to either fill up their debug.log with messages and/or keep their CPU busy checking signatures. Fixed by disconnecting/banning peers if they send 10 or more bad (invalid/expired/cancelled) alerts.
Diffstat (limited to 'src')
-rw-r--r--src/main.cpp25
-rw-r--r--src/main.h2
2 files changed, 20 insertions, 7 deletions
diff --git a/src/main.cpp b/src/main.cpp
index ecf2fafc89..0237106dcb 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2796,14 +2796,27 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
CAlert alert;
vRecv >> alert;
- if (alert.ProcessAlert())
+ uint256 alertHash = alert.GetHash();
+ if (pfrom->setKnown.count(alertHash) == 0)
{
- // Relay
- pfrom->setKnown.insert(alert.GetHash());
+ if (alert.ProcessAlert())
{
- LOCK(cs_vNodes);
- BOOST_FOREACH(CNode* pnode, vNodes)
- alert.RelayTo(pnode);
+ // Relay
+ pfrom->setKnown.insert(alertHash);
+ {
+ LOCK(cs_vNodes);
+ BOOST_FOREACH(CNode* pnode, vNodes)
+ alert.RelayTo(pnode);
+ }
+ }
+ else {
+ // Small DoS penalty so peers that send us lots of
+ // duplicate/expired/invalid-signature/whatever alerts
+ // eventually get banned.
+ // This isn't a Misbehaving(100) (immediate ban) because the
+ // peer might be an older or different implementation with
+ // a different signature key, etc.
+ pfrom->Misbehaving(10);
}
}
}
diff --git a/src/main.h b/src/main.h
index b9a1945861..e562cec7c4 100644
--- a/src/main.h
+++ b/src/main.h
@@ -1554,7 +1554,7 @@ public:
uint256 GetHash() const
{
- return SerializeHash(*this);
+ return Hash(this->vchMsg.begin(), this->vchMsg.end());
}
bool IsInEffect() const