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

NTCP2: Catch bad IV exception

Browse Source
This commit is contained in:
zzz
2018-08-19 18:56:59 +00:00
parent da476be75e
commit a846271cd4
5 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
history.txt
View File

@ -1,3 +1,6 @@
2018-08-19 zzz
* NTCP2: Catch bad IV exception
2018-08-16 zzz
* i2ptunnel: Change read timeout defaults now that streaming timeout works

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 = 24;
public final static long BUILD = 25;
/** for example "-test" */
public final static String EXTRA = "-rc";

14
router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java
View File

@ -242,16 +242,22 @@ public class NTCPConnection implements Closeable {
* Caller MUST call transport.establishing(this) after construction.
*
* @param version must be 1 or 2
* @throws DataFormatException if there's a problem with the address
*/
public NTCPConnection(RouterContext ctx, NTCPTransport transport, RouterIdentity remotePeer,
RouterAddress remAddr, int version) {
RouterAddress remAddr, int version) throws DataFormatException {
this(ctx, transport, remAddr, false);
_remotePeer = remotePeer;
_version = version;
if (version == 1)
if (version == 1) {
_establishState = new OutboundEstablishState(ctx, transport, this);
else
_establishState = new OutboundNTCP2State(ctx, transport, this);
} else {
try {
_establishState = new OutboundNTCP2State(ctx, transport, this);
} catch (IllegalArgumentException iae) {
throw new DataFormatException("bad address? " + remAddr, iae);
}
}
}
/**

19
router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java
View File

@ -29,6 +29,7 @@ import java.util.concurrent.ConcurrentHashMap;
import net.i2p.crypto.SigType;
import net.i2p.data.Base64;
import net.i2p.data.DataFormatException;
import net.i2p.data.DataHelper;
import net.i2p.data.Hash;
import net.i2p.data.router.RouterAddress;
@ -334,12 +335,18 @@ public class NTCPTransport extends TransportImpl {
if (addr != null) {
newVersion = getNTCPVersion(addr);
if (newVersion != 0) {
con = new NTCPConnection(_context, this, ident, addr, newVersion);
establishing(con);
//if (_log.shouldLog(Log.DEBUG))
// _log.debug("Send on a new con: " + con + " at " + addr + " for " + ih);
// Note that outbound conns go in the map BEFORE establishment
_conByIdent.put(ih, con);
try {
con = new NTCPConnection(_context, this, ident, addr, newVersion);
establishing(con);
//if (_log.shouldLog(Log.DEBUG))
// _log.debug("Send on a new con: " + con + " at " + addr + " for " + ih);
// Note that outbound conns go in the map BEFORE establishment
_conByIdent.put(ih, con);
} catch (DataFormatException dfe) {
if (_log.shouldWarn())
_log.warn("bad address? " + target, dfe);
fail = true;
}
} else {
fail = true;
}

3
router/java/src/net/i2p/router/transport/ntcp/OutboundNTCP2State.java
View File

@ -94,6 +94,9 @@ class OutboundNTCP2State implements EstablishState {
CORRUPT
}
/**
* @throws IllegalArgumentException on bad address in the con
*/
public OutboundNTCP2State(RouterContext ctx, NTCPTransport transport, NTCPConnection con) {
_context = ctx;
_log = ctx.logManager().getLog(getClass());