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

NTCP2: Publish outbound address after transition to firewalled

Browse Source 
Fix exception thrower
This commit is contained in:
zzz
2018-08-26 12:05:49 +00:00
parent 3adbea9c76
commit db54edc36d
5 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
router/java/src/com/southernstorm/noise/protocol/Noise.java
View File

@@ -22,6 +22,7 @@
package com.southernstorm.noise.protocol;
import java.lang.reflect.InvocationTargetException;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
@@ -128,7 +129,11 @@ public final class Noise {
// java since 1.7; android since API 19
Class<?> c = Class.forName("javax.crypto.AEADBadTagException");
throw (BadPaddingException)(c.getDeclaredConstructor().newInstance());
} catch (Exception e) {
} catch (ClassNotFoundException e) {
} catch (InstantiationException e) {
} catch (IllegalAccessException e) {
} catch (InvocationTargetException e) {
} catch (NoSuchMethodException e) {
}
throw new BadPaddingException();
}

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

12
router/java/src/net/i2p/router/transport/ntcp/InboundEstablishState.java
View File

@@ -949,9 +949,13 @@ class InboundEstablishState extends EstablishBase implements NTCP2Payload.Payloa
*/
public void gotRI(RouterInfo ri, boolean isHandshake, boolean flood) throws DataFormatException {
// Validate Alice static key
String s = null;
// find address with matching version
List<RouterAddress> addrs = ri.getTargetAddresses(NTCPTransport.STYLE, NTCPTransport.STYLE2);
if (addrs.isEmpty()) {
_msg3p2FailReason = NTCPConnection.REASON_S_MISMATCH;
throw new DataFormatException("no NTCP in RI: " + ri);
}
String s = null;
for (RouterAddress addr : addrs) {
String v = addr.getOption("v");
if (v == null ||
@@ -964,19 +968,19 @@ class InboundEstablishState extends EstablishBase implements NTCP2Payload.Payloa
}
if (s == null) {
_msg3p2FailReason = NTCPConnection.REASON_S_MISMATCH;
throw new DataFormatException("no s in RI");
throw new DataFormatException("no s in RI: " + ri);
}
byte[] sb = Base64.decode(s);
if (sb == null || sb.length != KEY_SIZE) {
_msg3p2FailReason = NTCPConnection.REASON_S_MISMATCH;
throw new DataFormatException("bad s in RI");
throw new DataFormatException("bad s in RI: " + ri);
}
byte[] nb = new byte[32];
// compare to the _handshakeState
_handshakeState.getRemotePublicKey().getPublicKey(nb, 0);
if (!DataHelper.eqCT(sb, 0, nb, 0, KEY_SIZE)) {
_msg3p2FailReason = NTCPConnection.REASON_S_MISMATCH;
throw new DataFormatException("s mismatch in RI");
throw new DataFormatException("s mismatch in RI: " + ri);
}
_aliceIdent = ri.getIdentity();
Hash h = _aliceIdent.calculateHash();

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

@@ -1528,7 +1528,13 @@ public class NTCPTransport extends TransportImpl {
// we are still firewalled (SW firewall, bad UPnP indication, etc.)
if (_log.shouldLog(Log.INFO))
_log.info("old host: " + ohost + " config: " + name + " new: null");
newAddr = null;
if (_enableNTCP2) {
// addNTCP2Options() called below
newProps.clear();
newAddr = new RouterAddress(STYLE2, newProps, NTCP2_OUTBOUND_COST);
} else {
newAddr = null;
}
changed = true;
}