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

* HTTP Proxy:

Browse Source 
- Fix address helper conflicts caused by last checkin
      - Use B32 instead of random hostname for conflict link
This commit is contained in:
zzz
2010-03-02 22:50:46 +00:00
parent 5a539f0619
commit 45ca459ceb
1 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
View File

@@ -425,6 +425,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
// Key contains data, lets not ignore it // Key contains data, lets not ignore it
if (ahelperKey != null) { if (ahelperKey != null) {
// ahelperKey will be validated later
// Host resolvable only with addresshelper // Host resolvable only with addresshelper
if ( (host == null) || ("i2p".equals(host)) ) if ( (host == null) || ("i2p".equals(host)) )
@@ -434,12 +435,18 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
} else { } else {
// Host resolvable from database, verify addresshelper key // Host resolvable from database, verify addresshelper key
// Silently bypass correct keys, otherwise alert // Silently bypass correct keys, otherwise alert
if (!host.equals(ahelperKey)) String destB64 = null;
try {
Destination dest = I2PTunnel.destFromName(host);
if (dest != null)
destB64 = dest.toBase64();
} catch (DataFormatException dfe) {}
if (destB64 != null && !destB64.equals(ahelperKey))
{ {
// Conflict: handle when URL reconstruction done // Conflict: handle when URL reconstruction done
ahelperConflict = true; ahelperConflict = true;
if (_log.shouldLog(Log.WARN)) if (_log.shouldLog(Log.WARN))
_log.warn(getPrefix(requestId) + "Addresshelper key conflict for site [" + destination + "], trusted key [" + host + "], specified key [" + ahelperKey + "]."); _log.warn(getPrefix(requestId) + "Addresshelper key conflict for site [" + destination + "], trusted key [" + destB64 + "], specified key [" + ahelperKey + "].");
} }
} }
} }
@@ -461,15 +468,23 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
{ {
if (out != null) { if (out != null) {
long alias = I2PAppContext.getGlobalContext().random().nextLong(); // convert ahelperKey to b32
String alias = getHostName(ahelperKey);
if (alias.equals("i2p")) {
// bad ahelperKey
byte[] header = getErrorPage("dnfb", ERR_DESTINATION_UNKNOWN);
writeErrorMessage(header, out, targetRequest, false, destination, null);
} else {
String trustedURL = protocol + uriPath + urlEncoding; String trustedURL = protocol + uriPath + urlEncoding;
String conflictURL = protocol + alias + ".i2p/?" + initialFragments; // Fixme - any path is lost
String conflictURL = protocol + alias + '/' + urlEncoding;
byte[] header = getErrorPage("ahelper-conflict", ERR_AHELPER_CONFLICT); byte[] header = getErrorPage("ahelper-conflict", ERR_AHELPER_CONFLICT);
out.write(header); out.write(header);
out.write(_("To visit the destination in your host database, click <a href=\"{0}\">here</a>. To visit the conflicting addresshelper link by temporarily giving it a random alias, click <a href=\"{1}\">here</a>.", trustedURL, conflictURL).getBytes("UTF-8")); out.write(_("To visit the destination in your host database, click <a href=\"{0}\">here</a>. To visit the conflicting addresshelper destination, click <a href=\"{1}\">here</a>.", trustedURL, conflictURL).getBytes("UTF-8"));
out.write(("<p></div>").getBytes()); out.write(("<p></div>").getBytes());
writeFooter(out); writeFooter(out);
} }
}
s.close(); s.close();
return; return;
} }