I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

* KeyManager:

Browse Source 
- Don't write router key backup when leaseSet keys are updated
      - Synchronize to prevent concurrent writes (thanks Galen!)
      - Backup keys every 7 days instead of every 5 minutes
This commit is contained in:
zzz
2008-07-07 14:07:59 +00:00
parent e0dcf82697
commit 53e2e0d1c9
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
router/java/src/net/i2p/router/KeyManager.java
View File

@ -30,6 +30,8 @@ import net.i2p.util.Log;
/** /**
* Maintain all of the key pairs for the router. * Maintain all of the key pairs for the router.
* Router keys are written to files in a backup directory.
* LeaseSet keys are not written to files.
* *
*/ */
public class KeyManager { public class KeyManager {
@ -48,7 +50,10 @@ public class KeyManager {
private final static String KEYFILE_PUBLIC_ENC = "publicEncryption.key"; private final static String KEYFILE_PUBLIC_ENC = "publicEncryption.key";
private final static String KEYFILE_PRIVATE_SIGNING = "privateSigning.key"; private final static String KEYFILE_PRIVATE_SIGNING = "privateSigning.key";
private final static String KEYFILE_PUBLIC_SIGNING = "publicSigning.key"; private final static String KEYFILE_PUBLIC_SIGNING = "publicSigning.key";
private final static long DELAY = 5*60*1000; // Doesn't seem like we need to periodically back up,
// since we don't store leaseSet keys,
// but for now just make it a long time.
private final static long DELAY = 7*24*60*60*1000;
public KeyManager(RouterContext context) { public KeyManager(RouterContext context) {
_context = context; _context = context;
@ -100,8 +105,6 @@ public class KeyManager {
synchronized (_leaseSetKeys) { synchronized (_leaseSetKeys) {
_leaseSetKeys.put(dest.calculateHash(), keys); _leaseSetKeys.put(dest.calculateHash(), keys);
} }
if (dest != null)
queueWrite();
} }
private void queueWrite() { private void queueWrite() {
@ -119,8 +122,6 @@ public class KeyManager {
synchronized (_leaseSetKeys) { synchronized (_leaseSetKeys) {
rv = (LeaseSetKeys)_leaseSetKeys.remove(dest.calculateHash()); rv = (LeaseSetKeys)_leaseSetKeys.remove(dest.calculateHash());
} }
if (dest != null)
queueWrite();
return rv; return rv;
} }
@ -169,14 +170,14 @@ public class KeyManager {
syncVerificationKey(keyDir); syncVerificationKey(keyDir);
} }
private void syncPrivateKey(File keyDir) { private synchronized void syncPrivateKey(File keyDir) {
File keyFile = new File(keyDir, KeyManager.KEYFILE_PRIVATE_ENC); File keyFile = new File(keyDir, KeyManager.KEYFILE_PRIVATE_ENC);
boolean exists = (_privateKey != null); boolean exists = (_privateKey != null);
if (!exists) if (!exists)
_privateKey = new PrivateKey(); _privateKey = new PrivateKey();
_privateKey = (PrivateKey)syncKey(keyFile, _privateKey, exists); _privateKey = (PrivateKey)syncKey(keyFile, _privateKey, exists);
} }
private void syncPublicKey(File keyDir) { private synchronized void syncPublicKey(File keyDir) {
File keyFile = new File(keyDir, KeyManager.KEYFILE_PUBLIC_ENC); File keyFile = new File(keyDir, KeyManager.KEYFILE_PUBLIC_ENC);
boolean exists = (_publicKey != null); boolean exists = (_publicKey != null);
if (!exists) if (!exists)
@ -184,14 +185,14 @@ public class KeyManager {
_publicKey = (PublicKey)syncKey(keyFile, _publicKey, exists); _publicKey = (PublicKey)syncKey(keyFile, _publicKey, exists);
} }
private void syncSigningKey(File keyDir) { private synchronized void syncSigningKey(File keyDir) {
File keyFile = new File(keyDir, KeyManager.KEYFILE_PRIVATE_SIGNING); File keyFile = new File(keyDir, KeyManager.KEYFILE_PRIVATE_SIGNING);
boolean exists = (_signingPrivateKey != null); boolean exists = (_signingPrivateKey != null);
if (!exists) if (!exists)
_signingPrivateKey = new SigningPrivateKey(); _signingPrivateKey = new SigningPrivateKey();
_signingPrivateKey = (SigningPrivateKey)syncKey(keyFile, _signingPrivateKey, exists); _signingPrivateKey = (SigningPrivateKey)syncKey(keyFile, _signingPrivateKey, exists);
} }
private void syncVerificationKey(File keyDir) { private synchronized void syncVerificationKey(File keyDir) {
File keyFile = new File(keyDir, KeyManager.KEYFILE_PUBLIC_SIGNING); File keyFile = new File(keyDir, KeyManager.KEYFILE_PUBLIC_SIGNING);
boolean exists = (_signingPublicKey != null); boolean exists = (_signingPublicKey != null);
if (!exists) if (!exists)