Merge branch 'bug15515_024' into maint-0.2.4

This commit is contained in:
Nick Mathewson 2015-04-03 09:36:59 -04:00
commit 01e4bc80cd
3 changed files with 21 additions and 0 deletions

4
changes/bug15515 Normal file
View File

@ -0,0 +1,4 @@
o Minor features (DoS-resistance):
- Make it harder for attackers to overwhelm hidden services with
introductions, by blocking multiple introduction requests on the
same circuit. Resolves ticket #15515.

View File

@ -3157,6 +3157,9 @@ typedef struct or_circuit_t {
* to the specification? */
unsigned int remaining_relay_early_cells : 4;
/* We have already received an INTRODUCE1 cell on this circuit. */
unsigned int already_received_introduce1 : 1;
/** True iff this circuit was made with a CREATE_FAST cell. */
unsigned int is_first_hop : 1;

View File

@ -149,6 +149,20 @@ rend_mid_introduce(or_circuit_t *circ, const uint8_t *request,
goto err;
}
/* We have already done an introduction on this circuit but we just
received a request for another one. We block it since this might
be an attempt to DoS a hidden service (#15515). */
if (circ->already_received_introduce1) {
log_fn(LOG_PROTOCOL_WARN, LD_REND,
"Blocking multiple introductions on the same circuit. "
"Someone might be trying to attack a hidden service through "
"this relay.");
circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_TORPROTOCOL);
return -1;
}
circ->already_received_introduce1 = 1;
/* We could change this to MAX_HEX_NICKNAME_LEN now that 0.0.9.x is
* obsolete; however, there isn't much reason to do so, and we're going
* to revise this protocol anyway.