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

* DatabaseLookupmessage:

Browse Source 
- Add support for requesting an encrypted reply
* NetDB:
  - Add support for encrypted DatabaseSearchReplyMessage and DatabaseStoreMessage
    in response to a DatabaseLookupMessage
* PRNG: Cleanups using Collections.singletonMap()
* Router utils: New RemovableSingletonSet
* TransientSessionKeyManager:
  - Support variable expiration for inbound tag sets
  - Several efficiency improvements
* VersionComparator: Add static method, use most places
This commit is contained in:
zzz
2013-05-26 17:25:02 +00:00
parent 1bd4937a4b
commit e394d3d4c5
24 changed files with 373 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/src/gnu/crypto/prng/AsyncFortunaStandalone.java
View File

@ -1,6 +1,6 @@
package gnu.crypto.prng;
import java.util.HashMap;
import java.util.Collections;
import java.util.Map;
import java.util.concurrent.LinkedBlockingQueue;
@ -77,8 +77,7 @@ public class AsyncFortunaStandalone extends FortunaStandalone implements Runnabl
/** the seed is only propogated once the prng is started with startup() */
@Override
public void seed(byte val[]) {
Map props = new HashMap(1);
props.put(SEED, val);
Map props = Collections.singletonMap(SEED, val);
init(props);
//fillBlock();
}

5
core/java/src/gnu/crypto/prng/FortunaStandalone.java
View File

@ -48,7 +48,7 @@ import java.io.Serializable;
import java.security.InvalidKeyException;
import java.security.MessageDigest;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Collections;
import java.util.Map;
import net.i2p.crypto.CryptixAESKeyCache;
@ -131,8 +131,7 @@ public class FortunaStandalone extends BasePRNGStandalone implements Serializabl
}
public void seed(byte val[]) {
Map props = new HashMap(1);
props.put(SEED, val);
Map props = Collections.singletonMap(SEED, val);
init(props);
fillBlock();
}

16
core/java/src/net/i2p/crypto/SessionKeyManager.java
View File

@ -150,11 +150,19 @@ public class SessionKeyManager {
}
/**
* Accept the given tags and associate them with the given key for decryption
*
* Accept the given tags and associate them with the given key for decryption,
* with the default expiration.
*/
public void tagsReceived(SessionKey key, Set<SessionTag> sessionTags) { // nop
}
public void tagsReceived(SessionKey key, Set<SessionTag> sessionTags) {}
/**
* Accept the given tags and associate them with the given key for decryption,
* with specified expiration.
*
* @param expire time from now
* @since 0.9.7
*/
public void tagsReceived(SessionKey key, Set<SessionTag> sessionTags, long expire) {}
/**
* Determine if we have received a session key associated with the given session tag,

132
core/java/src/net/i2p/crypto/TransientSessionKeyManager.java
View File

@ -89,9 +89,8 @@ public class TransientSessionKeyManager extends SessionKeyManager {
private final int _lowThreshold;
/**
* Let session tags sit around for this long before expiring them. We can now have such a large
* value since there is the persistent session key manager. This value is for outbound tags -
* inbound tags are managed by SESSION_LIFETIME_MAX_MS
* Let outbound session tags sit around for this long before expiring them.
* Inbound tag expiration is set by SESSION_LIFETIME_MAX_MS
*/
private final static long SESSION_TAG_DURATION_MS = 12 * 60 * 1000;
@ -99,6 +98,8 @@ public class TransientSessionKeyManager extends SessionKeyManager {
* Keep unused inbound session tags around for this long (a few minutes longer than
* session tags are used on the outbound side so that no reasonable network lag
* can cause failed decrypts)
*
* This is also the max idle time for an outbound session.
*/
private final static long SESSION_LIFETIME_MAX_MS = SESSION_TAG_DURATION_MS + 3 * 60 * 1000;
@ -499,11 +500,22 @@ public class TransientSessionKeyManager extends SessionKeyManager {
/**
* Accept the given tags and associate them with the given key for decryption
*
* @param sessionTags modifiable; NOT copied
*/
@Override
public void tagsReceived(SessionKey key, Set<SessionTag> sessionTags) {
int overage = 0;
TagSet tagSet = new TagSet(sessionTags, key, _context.clock().now(), _rcvTagSetID.incrementAndGet());
tagsReceived(key, sessionTags, SESSION_LIFETIME_MAX_MS);
}
/**
* Accept the given tags and associate them with the given key for decryption
*
* @param sessionTags modifiable; NOT copied
*/
@Override
public void tagsReceived(SessionKey key, Set<SessionTag> sessionTags, long expire) {
TagSet tagSet = new TagSet(sessionTags, key, _context.clock().now() + expire,
_rcvTagSetID.incrementAndGet());
if (_log.shouldLog(Log.INFO))
_log.info("Received " + tagSet);
TagSet old = null;
@ -513,7 +525,6 @@ public class TransientSessionKeyManager extends SessionKeyManager {
//if (_log.shouldLog(Log.DEBUG))
// _log.debug("Receiving tag " + tag + " in tagSet: " + tagSet);
old = _inboundTagSets.put(tag, tagSet);
overage = _inboundTagSets.size() - MAX_INBOUND_SESSION_TAGS;
if (old != null) {
if (!old.getAssociatedKey().equals(tagSet.getAssociatedKey())) {
_inboundTagSets.remove(tag);
@ -546,6 +557,7 @@ public class TransientSessionKeyManager extends SessionKeyManager {
}
}
int overage = _inboundTagSets.size() - MAX_INBOUND_SESSION_TAGS;
if (overage > 0)
clearExcess(overage);
@ -573,25 +585,23 @@ public class TransientSessionKeyManager extends SessionKeyManager {
_log.log(Log.CRIT, "TOO MANY SESSION TAGS! Starting cleanup, overage = " + overage);
List<TagSet> removed = new ArrayList(toRemove);
synchronized (_inboundTagSets) {
for (Iterator<TagSet> iter = _inboundTagSets.values().iterator(); iter.hasNext(); ) {
TagSet set = iter.next();
for (TagSet set : _inboundTagSets.values()) {
int size = set.getTags().size();
if (size > 1000)
absurd++;
if (size > 100)
large++;
if (now - set.getDate() > SESSION_LIFETIME_MAX_MS)
if (now >= set.getDate())
old++;
else if (now - set.getDate() < 1*60*1000)
else if (set.getDate() - now > 10*60*1000)
recent++;
if ((removed.size() < (toRemove)) || (now - set.getDate() > SESSION_LIFETIME_MAX_MS))
if ((removed.size() < (toRemove)) || (now >= set.getDate()))
removed.add(set);
}
for (int i = 0; i < removed.size(); i++) {
TagSet cur = removed.get(i);
for (Iterator<SessionTag> iter = cur.getTags().iterator(); iter.hasNext(); ) {
SessionTag tag = iter.next();
for (SessionTag tag : cur.getTags()) {
_inboundTagSets.remove(tag);
tags++;
}
@ -616,21 +626,21 @@ public class TransientSessionKeyManager extends SessionKeyManager {
*/
@Override
public SessionKey consumeTag(SessionTag tag) {
//if (false) aggressiveExpire();
TagSet tagSet;
synchronized (_inboundTagSets) {
TagSet tagSet = _inboundTagSets.remove(tag);
tagSet = _inboundTagSets.remove(tag);
if (tagSet == null) {
if (_log.shouldLog(Log.DEBUG))
_log.debug("Cannot consume IB " + tag + " as it is not known");
return null;
}
tagSet.consume(tag);
SessionKey key = tagSet.getAssociatedKey();
if (_log.shouldLog(Log.DEBUG))
_log.debug("IB Tag consumed: " + tag + " from: " + tagSet);
return key;
}
SessionKey key = tagSet.getAssociatedKey();
if (_log.shouldLog(Log.DEBUG))
_log.debug("IB Tag consumed: " + tag + " from: " + tagSet);
return key;
}
private OutboundSession getSession(PublicKey target) {
@ -660,44 +670,28 @@ public class TransientSessionKeyManager extends SessionKeyManager {
/**
* Aggressively expire inbound tag sets and outbound sessions
*
* @return number of tag sets expired
* @return number of tag sets expired (bogus as it overcounts inbound)
*/
private int aggressiveExpire() {
int removed = 0;
int remaining = 0;
long now = _context.clock().now();
StringBuilder buf = null;
//StringBuilder bufSummary = null;
if (_log.shouldLog(Log.DEBUG)) {
buf = new StringBuilder(128);
buf.append("Expiring inbound: ");
//bufSummary = new StringBuilder(1024);
}
synchronized (_inboundTagSets) {
for (Iterator<SessionTag> iter = _inboundTagSets.keySet().iterator(); iter.hasNext();) {
SessionTag tag = iter.next();
TagSet ts = _inboundTagSets.get(tag);
long age = now - ts.getDate();
if (age > SESSION_LIFETIME_MAX_MS) {
//if (ts.getDate() < now - SESSION_LIFETIME_MAX_MS) {
for (Iterator<TagSet> iter = _inboundTagSets.values().iterator(); iter.hasNext();) {
TagSet ts = iter.next();
// for inbound tagsets, getDate() is the expire time
if (ts.getDate() <= now) {
iter.remove();
// bug, this counts inbound tags, not tag sets
removed++;
if (buf != null)
buf.append(tag).append(" @ age ").append(DataHelper.formatDuration(age));
//} else if (false && (bufSummary != null) ) {
// bufSummary.append("\nTagSet: " + ts + ", key: " + ts.getAssociatedKey()
// + ": tag: " + tag);
}
}
remaining = _inboundTagSets.size();
}
_context.statManager().addRateData("crypto.sessionTagsRemaining", remaining, 0);
if ( (buf != null) && (removed > 0) )
_log.debug(buf.toString());
//if (bufSummary != null)
// _log.debug("Cleaning up with remaining: " + bufSummary.toString());
//_log.warn("Expiring tags: [" + tagsToDrop + "]");
if (removed > 0 && _log.shouldLog(Log.DEBUG))
_log.debug("Expired inbound: " + removed);
synchronized (_outboundSessions) {
for (Iterator<OutboundSession> iter = _outboundSessions.values().iterator(); iter.hasNext();) {
@ -722,10 +716,12 @@ public class TransientSessionKeyManager extends SessionKeyManager {
Set<TagSet> inbound = getInboundTagSets();
Map<SessionKey, Set<TagSet>> inboundSets = new HashMap(inbound.size());
// Build a map of the inbound tag sets, grouped by SessionKey
for (Iterator<TagSet> iter = inbound.iterator(); iter.hasNext();) {
TagSet ts = iter.next();
if (!inboundSets.containsKey(ts.getAssociatedKey())) inboundSets.put(ts.getAssociatedKey(), new HashSet());
for (TagSet ts : inbound) {
Set<TagSet> sets = inboundSets.get(ts.getAssociatedKey());
if (sets == null) {
sets = new HashSet();
inboundSets.put(ts.getAssociatedKey(), sets);
}
sets.add(ts);
}
int total = 0;
@ -741,8 +737,12 @@ public class TransientSessionKeyManager extends SessionKeyManager {
TagSet ts = siter.next();
int size = ts.getTags().size();
total += size;
buf.append("<li><b>ID: ").append(ts.getID())
.append(" Received:</b> ").append(DataHelper.formatDuration2(now - ts.getDate())).append(" ago with ");
buf.append("<li><b>ID: ").append(ts.getID());
long expires = ts.getDate() - now;
if (expires > 0)
buf.append(" Expires in:</b> ").append(DataHelper.formatDuration2(expires)).append(" with ");
else
buf.append(" Expired:</b> ").append(DataHelper.formatDuration2(0 - expires)).append(" ago with ");
buf.append(size).append('/').append(ts.getOriginalSize()).append(" tags remaining</li>");
}
buf.append("</ul></td></tr>\n");
@ -802,7 +802,10 @@ public class TransientSessionKeyManager extends SessionKeyManager {
*/
private static class TagSetComparator implements Comparator<TagSet> {
public int compare(TagSet l, TagSet r) {
return (int) (l.getDate() - r.getDate());
int rv = (int) (l.getDate() - r.getDate());
if (rv != 0)
return rv;
return l.hashCode() - r.hashCode();
}
}
@ -1088,6 +1091,9 @@ public class TransientSessionKeyManager extends SessionKeyManager {
/** did we get an ack for this tagset? Only for outbound tagsets */
private boolean _acked;
/**
* @param date For inbound: when the TagSet will expire; for outbound: creation time
*/
public TagSet(Set<SessionTag> tags, SessionKey key, long date, int id) {
if (key == null) throw new IllegalArgumentException("Missing key");
if (tags == null) throw new IllegalArgumentException("Missing tags");
@ -1104,7 +1110,9 @@ public class TransientSessionKeyManager extends SessionKeyManager {
//}
}
/** when the tag set was created */
/**
* For inbound: when the TagSet will expire; for outbound: creation time
*/
public long getDate() {
return _date;
}
@ -1135,23 +1143,29 @@ public class TransientSessionKeyManager extends SessionKeyManager {
}
/**
* Let's do this without counting the elements first.
* For outbound only.
* Caller must synch.
* @return a tag or null
*/
public SessionTag consumeNext() {
SessionTag first;
try {
first = _sessionTags.iterator().next();
} catch (NoSuchElementException nsee) {
Iterator<SessionTag> iter = _sessionTags.iterator();
if (!iter.hasNext())
return null;
}
_sessionTags.remove(first);
SessionTag first = iter.next();
iter.remove();
return first;
}
//public Exception getCreatedBy() { return _createdBy; }
/**
* For outbound only.
*/
public void setAcked() { _acked = true; }
/**
* For outbound only.
*/
public boolean getAcked() { return _acked; }
/****** this will return a dup if two in the same ms, so just use java

2
core/java/src/net/i2p/crypto/TrustedUpdate.java
View File

@ -302,7 +302,7 @@ riCe6OlAEiNpcc6mMyIYYWFICbrDFTrDR3wXqwc/Jkcx6L5VVWoagpSzbo3yGhc=
* version, otherwise <code>false</code>.
*/
public static final boolean needsUpdate(String currentVersion, String newVersion) {
return (new VersionComparator()).compare(currentVersion, newVersion) < 0;
return VersionComparator.comp(currentVersion, newVersion) < 0;
}
/** @return success */

2
core/java/src/net/i2p/util/SystemVersion.java
View File

@ -56,7 +56,7 @@ public abstract class SystemVersion {
if (_isAndroid) {
_oneDotSix = _androidSDK >= 9;
} else {
_oneDotSix = (new VersionComparator()).compare(System.getProperty("java.version"), "1.6") >= 0;
_oneDotSix = VersionComparator.comp(System.getProperty("java.version"), "1.6") >= 0;
}
}

8
core/java/src/net/i2p/util/VersionComparator.java
View File

@ -11,9 +11,15 @@ import java.util.Comparator;
*/
public class VersionComparator implements Comparator<String> {
@Override
public int compare(String l, String r) {
return comp(l, r);
}
/**
* To avoid churning comparators
* @since 0.9.7
*/
public static int comp(String l, String r) {
if (l.equals(r))
return 0;