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

SAM: Support offline keys

Browse Source
This commit is contained in:
zzz
2019-02-07 20:27:42 +00:00
parent 7544d0a590
commit 3ba0fcf6da
3 changed files with 52 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/sam/java/src/net/i2p/sam/SAMMessageSession.java
View File

@@ -45,7 +45,8 @@ abstract class SAMMessageSession implements SAMMessageSess {
/**
* Initialize a new SAM message-based session.
*
* @param dest Base64-encoded destination and private keys (same format as PrivateKeyFile)
* @param dest Base64-encoded destination and private keys,
* and optional offline signature section (same format as PrivateKeyFile)
* @param props Properties to setup the I2P session
* @throws IOException
* @throws DataFormatException
@@ -58,7 +59,8 @@ abstract class SAMMessageSession implements SAMMessageSess {
/**
* Initialize a new SAM message-based session.
*
* @param destStream Input stream containing the destination and private keys (same format as PrivateKeyFile)
* @param destStream Input stream containing the binary destination and private keys,
* and optional offline signature section (same format as PrivateKeyFile)
* @param props Properties to setup the I2P session
* @throws IOException
* @throws DataFormatException

8
apps/sam/java/src/net/i2p/sam/SAMStreamSession.java
View File

@@ -85,7 +85,8 @@ class SAMStreamSession implements SAMMessageSess {
*
* Caller MUST call start().
*
* @param dest Base64-encoded destination and private keys (same format as PrivateKeyFile)
* @param dest Base64-encoded destination and private keys,
* and optional offline signature section (same format as PrivateKeyFile)
* @param dir Session direction ("RECEIVE", "CREATE" or "BOTH") or "__v3__" if extended by SAMv3StreamSession
* @param props Properties to setup the I2P session
* @param recv Object that will receive incoming data
@@ -101,7 +102,10 @@ class SAMStreamSession implements SAMMessageSess {
/**
* Create a new SAM STREAM session.
*
* @param destStream Input stream containing the destination and private keys (same format as PrivateKeyFile)
* Caller MUST call start().
*
* @param destStream Input stream containing the binary destination and private keys,
* and optional offline signature section (same format as PrivateKeyFile)
* @param dir Session direction ("RECEIVE", "CREATE" or "BOTH") or "__v3__" if extended by SAMv3StreamSession
* @param props Properties to setup the I2P session
* @param recv Object that will receive incoming data

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

@@ -23,9 +23,12 @@ import net.i2p.client.naming.NamingService;
import net.i2p.crypto.SigType;
import net.i2p.data.Base64;
import net.i2p.data.DataFormatException;
import net.i2p.data.DataHelper;
import net.i2p.data.Destination;
import net.i2p.data.PrivateKey;
import net.i2p.data.Signature;
import net.i2p.data.SigningPrivateKey;
import net.i2p.data.SigningPublicKey;
/**
* Miscellaneous utility methods used by SAM protocol handlers.
@@ -95,7 +98,10 @@ class SAMUtils {
****/
/**
* Check whether a base64-encoded {dest,privkey,signingprivkey} is valid
* Check whether a base64-encoded {dest,privkey,signingprivkey[,offlinesig]} is valid
*
* This only checks that the length is correct. It does not validate
* for pubkey/privkey match, or check the signatures.
*
* @param dest The base64-encoded destination and keys to be checked (same format as PrivateKeyFile)
* @return true if valid
@@ -106,18 +112,46 @@ class SAMUtils {
return false;
ByteArrayInputStream destKeyStream = new ByteArrayInputStream(b);
try {
Destination d = Destination.create(destKeyStream);
new PrivateKey().readBytes(destKeyStream);
SigningPrivateKey spk = new SigningPrivateKey(d.getSigningPublicKey().getType());
spk.readBytes(destKeyStream);
} catch (DataFormatException e) {
Destination d = Destination.create(destKeyStream);
new PrivateKey().readBytes(destKeyStream);
SigType dtype = d.getSigningPublicKey().getType();
SigningPrivateKey spk = new SigningPrivateKey(dtype);
spk.readBytes(destKeyStream);
if (isOffline(spk)) {
// offlineExpiration
DataHelper.readLong(destKeyStream, 4);
int itype = (int) DataHelper.readLong(destKeyStream, 2);
SigType type = SigType.getByCode(itype);
if (type == null)
return false;
SigningPublicKey transientSigningPublicKey = new SigningPublicKey(type);
transientSigningPublicKey.readBytes(destKeyStream);
Signature offlineSignature = new Signature(dtype);
offlineSignature.readBytes(destKeyStream);
// replace spk
spk = new SigningPrivateKey(type);
spk.readBytes(destKeyStream);
}
} catch (DataFormatException e) {
return false;
} catch (IOException e) {
} catch (IOException e) {
return false;
}
}
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.