marek/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

I2CP: Prevent NPE when router receives messages without prior session (ticket #1503)

Browse Source
This commit is contained in:
zzz
2015-03-29 13:45:14 +00:00
parent 83c3152b5d
commit 9a8fa246a9
3 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
history.txt
View File

@ -1,3 +1,6 @@
2015-03-29 zzz
* I2CP: Prevent NPE (ticket #1503)
2015-03-25 zzz
* i2ptunnel HTTP client: Replace all getBytes() calls
with a Writer or getBytes("UTF-8") (ticket #457)

2
router/java/src/net/i2p/router/RouterVersion.java
View File

@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */
public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 12;
public final static long BUILD = 13;
/** for example "-test" */
public final static String EXTRA = "-rc";

31
router/java/src/net/i2p/router/client/ClientMessageEventListener.java
View File

@ -306,6 +306,13 @@ class ClientMessageEventListener implements I2CPMessageReader.I2CPMessageEventLi
*
*/
private void handleSendMessage(SendMessageMessage message) {
SessionConfig cfg = _runner.getConfig();
if (cfg == null) {
if (_log.shouldLog(Log.ERROR))
_log.error("SendMessage w/o session");
_runner.disconnectClient("SendMessage w/o session");
return;
}
if (_log.shouldLog(Log.DEBUG))
_log.debug("handleSendMessage called");
long beforeDistribute = _context.clock().now();
@ -370,7 +377,14 @@ class ClientMessageEventListener implements I2CPMessageReader.I2CPMessageEventLi
_runner.disconnectClient("Invalid CreateLeaseSetMessage");
return;
}
Destination dest = _runner.getConfig().getDestination();
SessionConfig cfg = _runner.getConfig();
if (cfg == null) {
if (_log.shouldLog(Log.ERROR))
_log.error("CreateLeaseSet w/o session");
_runner.disconnectClient("CreateLeaseSet w/o session");
return;
}
Destination dest = cfg.getDestination();
Destination ndest = message.getLeaseSet().getDestination();
if (!dest.equals(ndest)) {
if (_log.shouldLog(Log.ERROR))
@ -447,19 +461,26 @@ class ClientMessageEventListener implements I2CPMessageReader.I2CPMessageEventLi
* ClientConnectionRunner.sessionEstablished(). Those can't be changed later.
*/
private void handleReconfigureSession(ReconfigureSessionMessage message) {
SessionConfig cfg = _runner.getConfig();
if (cfg == null) {
if (_log.shouldLog(Log.ERROR))
_log.error("ReconfigureSession w/o session");
_runner.disconnectClient("ReconfigureSession w/o session");
return;
}
if (_log.shouldLog(Log.INFO))
_log.info("Updating options - old: " + _runner.getConfig() + " new: " + message.getSessionConfig());
if (!message.getSessionConfig().getDestination().equals(_runner.getConfig().getDestination())) {
_log.info("Updating options - old: " + cfg + " new: " + message.getSessionConfig());
if (!message.getSessionConfig().getDestination().equals(cfg.getDestination())) {
_log.error("Dest mismatch");
sendStatusMessage(SessionStatusMessage.STATUS_INVALID);
_runner.stopRunning();
return;
}
_runner.getConfig().getOptions().putAll(message.getSessionConfig().getOptions());
cfg.getOptions().putAll(message.getSessionConfig().getOptions());
Hash dest = _runner.getDestHash();
ClientTunnelSettings settings = new ClientTunnelSettings(dest);
Properties props = new Properties();
props.putAll(_runner.getConfig().getOptions());
props.putAll(cfg.getOptions());
settings.readFromProperties(props);
_context.tunnelManager().setInboundSettings(dest,
settings.getInboundSettings());