dandri/i2p.i2p
1
0
Fork 0
mirror of https://github.com/i2p/i2p.i2p.git synced 2026-06-06 11:01:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

I2CP: Prevent loopback messages to same session (i2pd Github #2005)

Browse Source
This commit is contained in:
zzz
2024-01-15 10:35:29 +00:00
parent ba39f58800
commit f337c1b3c9
7 changed files with 34 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
router/java/src/net/i2p/router/client/ClientConnectionRunner.java
+1 -1
View File
@@ -806,7 +806,7 @@ class ClientConnectionRunner {
// the following blocks as described above
Destination fromDest = getDestination(message.getSessionId());
if (fromDest != null)
_manager.distributeMessage(fromDest, dest, payload,
_manager.distributeMessage(this, fromDest, dest, payload,
id, message.getNonce(), expiration, flags);
// else log error?
//long timeToDistribute = _context.clock().now() - beforeDistribute;
router/java/src/net/i2p/router/client/ClientManager.java
+13 -14
View File
@@ -451,11 +451,13 @@ class ClientManager {
/**
* Distribute message to a local or remote destination.
*
* @param sender non-null
* @param msgId the router's ID for this message
* @param messageNonce the client's ID for this message
* @param flags ignored for local
*/
void distributeMessage(Destination fromDest, Destination toDest, Payload payload,
void distributeMessage(ClientConnectionRunner sender, Destination fromDest, Destination toDest, Payload payload,
MessageId msgId, long messageNonce, long expiration, int flags) {
ClientConnectionRunner runner;
if (_ctx.getBooleanProperty(PROP_DISABLE_LOOPBACK)) {
@@ -467,22 +469,19 @@ class ClientManager {
if (runner != null) {
if (_log.shouldLog(Log.DEBUG))
_log.debug("Message " + msgId + " is targeting a local destination. distribute it as such");
ClientConnectionRunner sender = getRunner(fromDest);
if (sender == null) {
// sender went away
return;
if (runner != sender) {
// run this inline so we don't clog up the job queue
Job j = new DistributeLocal(toDest, runner, sender, fromDest, payload, msgId, messageNonce);
//_ctx.jobQueue().addJob(j);
j.runJob();
} else {
if (_log.shouldWarn())
_log.warn("Loopback attempt from client " + fromDest.getHash());
int rc = MessageStatusMessage.STATUS_SEND_FAILURE_LOOPBACK;
sender.updateMessageDeliveryStatus(fromDest, msgId, messageNonce, rc);
}
// run this inline so we don't clog up the job queue
Job j = new DistributeLocal(toDest, runner, sender, fromDest, payload, msgId, messageNonce);
//_ctx.jobQueue().addJob(j);
j.runJob();
} else if (!_metaDests.isEmpty() && _metaDests.contains(toDest)) {
// meta dests don't have runners but are local, and you can't send to them
ClientConnectionRunner sender = getRunner(fromDest);
if (sender == null) {
// sender went away
return;
}
int rc = MessageStatusMessage.STATUS_SEND_FAILURE_BAD_LEASESET;
sender.updateMessageDeliveryStatus(fromDest, msgId, messageNonce, rc);
} else {