Update bionic, focal changelogs

Router: merge dev branches
Router: Disable updating the PeerManager when we recieve a router down a client tunnel
2023-12-20 14:50:37 -05:00 · 2023-12-19 23:38:57 -05:00 · 2023-12-19 22:21:16 -05:00
4 changed files with 21 additions and 9 deletions
--- a/debian-alt/bionic/changelog
+++ b/debian-alt/bionic/changelog
@ -1,3 +1,9 @@
+i2p (2.4.0-1~bionic+1) bionic; urgency=medium
+
+  * New upstream version 2.3.0
+
+ -- idk <hankhill19580@gmail.com>  Wed, 20 Dec 2023 19:28:05 +0000
+
 i2p (2.3.0-1~bionic+1) bionic; urgency=medium

  * New upstream version 2.3.0
--- a/debian-alt/focal/changelog
+++ b/debian-alt/focal/changelog
@ -1,3 +1,9 @@
+i2p (2.4.0-1ubuntu1) focal; urgency=medium
+
+  * New upstream version 2.4.0
+
+ -- idk <hankhill19580@gmail.com>  Wed, 20 Dec 2023 19:28:05 +0000
+
 i2p (2.3.0-1ubuntu1) focal; urgency=medium

  * New upstream version 2.3.0
--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,9 @@
+i2p (2.4.0-1ubuntu1) focal; urgency=medium
+
+  * New upstream version 2.4.0
+
+ -- idk <hankhill19580@gmail.com>  Wed, 20 Dec 2023 19:28:05 +0000
+
 i2p (2.3.0-1ubuntu1) focal; urgency=medium

  * New upstream version 2.3.0
--- a/router/java/src/net/i2p/router/tunnel/InboundMessageDistributor.java
+++ b/router/java/src/net/i2p/router/tunnel/InboundMessageDistributor.java
@ -130,15 +130,9 @@ class InboundMessageDistributor implements GarlicMessageReceiver.CloveReceiver {
                            return;
                        if (!ri.isValid())
                            return;
-                        RouterInfo oldri = _context.netDb().lookupRouterInfoLocally(key);
-                        // only update if RI is newer and non-ff
-                        if (oldri != null && oldri.getPublished() < ri.getPublished() &&
-                            ((FloodfillNetworkDatabaseFacade)_context.netDb()).isNotFloodfill(ri)) {
-                            if (_log.shouldLog(Log.WARN))
-                                _log.warn("Updating caps for RI " + key + " from \"" +
-                                          oldri.getCapabilities() + "\" to \"" + ri.getCapabilities() + '"');
-                            _context.peerManager().setCapabilities(key, ri.getCapabilities());
-                        }
+                        // RouterInfo oldri = _context.netDb().lookupRouterInfoLocally(key);
+                        // don't update caps if the RouterInfo came down a client tunnel, as it may be(Almost certainly is) malicious
+                        // and we deny RI storage in client DB's anyway
                        return;
                    } else if (dsm.getReplyToken() != 0) {
                        _context.statManager().addRateData("tunnel.dropDangerousClientTunnelMessage", 1, type);
Author	SHA1	Message	Date
eyedeekay	f76eeae117	Update bionic, focal changelogs	2023-12-20 14:50:37 -05:00
eyedeekay	acf0e021f8	Router: merge dev branches	2023-12-19 23:38:57 -05:00
eyedeekay	d5af41dae7	Router: Disable updating the PeerManager when we recieve a router down a client tunnel	2023-12-19 22:21:16 -05:00