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

Data: Consolidate offline key check

Browse Source 
i2ptunnel: Prevent registration auth if key offline
This commit is contained in:
zzz
2019-03-09 11:47:03 +00:00
parent 409207e02d
commit d6a53cc3a6
5 changed files with 20 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/i2ptunnel/jsp/register.jsp
View File

@ -127,6 +127,8 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
SigningPrivateKey spk = editBean.getSigningPrivateKey(curTunnel);
if (spk == null) {
%><tr><td class="infohelp"><%=intl._t("Destination signing key is not available. Start the tunnel.")%></td></tr><%
} else if (spk.isOffline()) {
%><tr><td class="infohelp"><%=intl._t("Destination signing key is offline. Use CLI tools on the offline machine.")%></td></tr><%
} else {
valid = true;
OrderedProperties props = new OrderedProperties();

15
apps/sam/java/src/net/i2p/sam/SAMUtils.java
View File

@ -117,7 +117,7 @@ class SAMUtils {
SigType dtype = d.getSigningPublicKey().getType();
SigningPrivateKey spk = new SigningPrivateKey(dtype);
spk.readBytes(destKeyStream);
if (isOffline(spk)) {
if (spk.isOffline()) {
// offlineExpiration
DataHelper.readLong(destKeyStream, 4);
int itype = (int) DataHelper.readLong(destKeyStream, 2);
@ -140,19 +140,6 @@ class SAMUtils {
return destKeyStream.available() == 0;
}
/**
* @since 0.9.39
*/
private static boolean isOffline(SigningPrivateKey spk) {
byte[] data = spk.getData();
for (int i = 0; i < data.length; i++) {
if (data[i] != 0)
return false;
}
return true;
}
/**
* Resolved the specified hostname.
*

15
core/java/src/net/i2p/client/impl/I2PSessionImpl.java
View File

@ -577,7 +577,7 @@ public abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2
SigType dtype = _myDestination.getSigningPublicKey().getType();
_signingPrivateKey = new SigningPrivateKey(dtype);
_signingPrivateKey.readBytes(destKeyStream);
if (isOffline(_signingPrivateKey)) {
if (_signingPrivateKey.isOffline()) {
_offlineExpiration = DataHelper.readLong(destKeyStream, 4) * 1000;;
int itype = (int) DataHelper.readLong(destKeyStream, 2);
SigType type = SigType.getByCode(itype);
@ -593,19 +593,6 @@ public abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2
}
}
/**
* Constant time
* @since 0.9.38
*/
private static boolean isOffline(SigningPrivateKey spk) {
byte b = 0;
byte[] data = spk.getData();
for (int i = 0; i < data.length; i++) {
b |= data[i];
}
return b == 0;
}
/**
* Does this session have offline and transient keys?
* @since 0.9.38

15
core/java/src/net/i2p/data/PrivateKeyFile.java
View File

@ -620,19 +620,6 @@ public class PrivateKeyFile {
//// offline methods
/**
* Constant time
* @since 0.9.38
*/
private static boolean isOffline(SigningPrivateKey spk) {
byte b = 0;
byte[] data = spk.getData();
for (int i = 0; i < data.length; i++) {
b |= data[i];
}
return b == 0;
}
/**
* Does this session have offline and transient keys?
* @since 0.9.38
@ -646,7 +633,7 @@ public class PrivateKeyFile {
* @since 0.9.38
*/
public void setOfflineData(long expires, SigningPublicKey transientPub, Signature sig, SigningPrivateKey transientPriv) {
if (!isOffline(signingPrivKey)) {
if (!signingPrivKey.isOffline()) {
SigType type = getSigningPrivKey().getType();
byte[] dbytes = new byte[type.getPrivkeyLen()];
signingPrivKey = new SigningPrivateKey(type, dbytes);

15
core/java/src/net/i2p/data/SigningPrivateKey.java
View File

@ -100,6 +100,21 @@ public class SigningPrivateKey extends SimpleDataStructure {
return Blinding.blind(this, alpha);
}
/**
* Constant time
* @return true if all zeros
* @since 0.9.39 moved from PrivateKeyFile
*/
public boolean isOffline() {
if (_data == null)
return true;
byte b = 0;
for (int i = 0; i < _data.length; i++) {
b |= _data[i];
}
return b == 0;
}
/**
* @since 0.9.8
*/