forked from I2P_Developers/i2p.i2p
propagate from branch 'i2p.i2p.zzz.jetty7' (head 12e512b792594fe6a291ad3ab303fca30228391b)
to branch 'i2p.i2p' (head f3775dd82af85ba335258bd9f0fc06131a1daaa9)
This commit is contained in:
@@ -65,10 +65,12 @@ class HTTPResponseOutputStream extends FilterOutputStream {
|
||||
_buf1[0] = (byte)c;
|
||||
write(_buf1, 0, 1);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void write(byte buf[]) throws IOException {
|
||||
write(buf, 0, buf.length);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void write(byte buf[], int off, int len) throws IOException {
|
||||
if (_headerWritten) {
|
||||
@@ -181,6 +183,7 @@ class HTTPResponseOutputStream extends FilterOutputStream {
|
||||
_gzip = true;
|
||||
} else if ("proxy-authenticate".equals(lcKey)) {
|
||||
// filter this hop-by-hop header; outproxy authentication must be configured in I2PTunnelHTTPClient
|
||||
// see e.g. http://blog.c22.cc/2013/03/11/privoxy-proxy-authentication-credential-exposure-cve-2013-2503/
|
||||
} else {
|
||||
if ("content-length".equals(lcKey)) {
|
||||
// save for compress decision on server side
|
||||
@@ -272,7 +275,7 @@ class HTTPResponseOutputStream extends FilterOutputStream {
|
||||
while ( (read = _in.read(buf)) != -1) {
|
||||
if (_log.shouldLog(Log.DEBUG))
|
||||
_log.debug("Read " + read + " and writing it to the browser/streams");
|
||||
; _out.write(buf, 0, read);
|
||||
_out.write(buf, 0, read);
|
||||
_out.flush();
|
||||
written += read;
|
||||
}
|
||||
|
||||
@@ -49,10 +49,10 @@ public class PcapWriter {
|
||||
0, 2, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, (byte) 0xff, (byte) 0xff, 0, 0, 0, 1 };
|
||||
|
||||
/** dummy macs and ethertype */
|
||||
/** dummy macs, IPv4 ethertype */
|
||||
private static final byte[] MAC_HEADER = { 1, 2, 3, 4, 5, 6,
|
||||
1, 2, 3, 4, 5, 6,
|
||||
(byte) 0x80, 0 };
|
||||
(byte) 0x08, 0 };
|
||||
private static final byte[] IP_HEADER_1 = { 0x45, 0 }; // the length goes after this
|
||||
private static final byte[] IP_HEADER_2 = { 0x12, 0x34, 0x40, 0, 64, 6 }; // ID, flags, TTL and TCP
|
||||
private static final byte[] UNK_IP = { (byte) 0xff, 0, 0, 0};
|
||||
|
||||
@@ -105,20 +105,19 @@ public class ElGamalAESEngine {
|
||||
boolean wasExisting = false;
|
||||
if (key != null) {
|
||||
//if (_log.shouldLog(Log.DEBUG)) _log.debug("Key is known for tag " + st);
|
||||
long id = _context.random().nextLong();
|
||||
if (_log.shouldLog(Log.DEBUG))
|
||||
_log.debug(id + ": Decrypting existing session encrypted with tag: " + st.toString() + ": key: " + key.toBase64() + ": " + data.length + " bytes " /* + Base64.encode(data, 0, 64) */ );
|
||||
_log.debug("Decrypting existing session encrypted with tag: " + st.toString() + ": key: " + key.toBase64() + ": " + data.length + " bytes " /* + Base64.encode(data, 0, 64) */ );
|
||||
|
||||
decrypted = decryptExistingSession(data, key, targetPrivateKey, foundTags, usedKey, foundKey);
|
||||
if (decrypted != null) {
|
||||
_context.statManager().updateFrequency("crypto.elGamalAES.decryptExistingSession");
|
||||
if ( (!foundTags.isEmpty()) && (_log.shouldLog(Log.DEBUG)) )
|
||||
_log.debug(id + ": ElG/AES decrypt success with " + st + ": found tags: " + foundTags);
|
||||
_log.debug("ElG/AES decrypt success with " + st + ": found tags: " + foundTags);
|
||||
wasExisting = true;
|
||||
} else {
|
||||
_context.statManager().updateFrequency("crypto.elGamalAES.decryptFailed");
|
||||
if (_log.shouldLog(Log.WARN)) {
|
||||
_log.warn(id + ": ElG decrypt fail: known tag [" + st + "], failed decrypt");
|
||||
_log.warn("ElG decrypt fail: known tag [" + st + "], failed decrypt");
|
||||
}
|
||||
}
|
||||
} else {
|
||||
@@ -568,6 +567,7 @@ public class ElGamalAESEngine {
|
||||
* - random bytes, padding the total size to greater than paddedSize with a mod 16 = 0
|
||||
* </pre>
|
||||
*
|
||||
* @param target unused, this is AES encrypt only using the session key and tag
|
||||
* @param tagsForDelivery session tags to be associated with the key or null;
|
||||
* 200 max enforced at receiver
|
||||
*/
|
||||
|
||||
@@ -94,7 +94,7 @@ END
|
||||
|
||||
// Icon with lowest ID value placed first to ensure application icon
|
||||
// remains consistent on all systems.
|
||||
IDI_ICON1 ICON "start.ico"
|
||||
IDI_ICON1 ICON "../../resources/start.ico"
|
||||
#endif // English (U.S.) resources
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
||||
@@ -19,10 +19,10 @@ Proxy-Connection: close
|
||||
<h3>Warning: Eepsite Not Found in Addressbook</h3>
|
||||
<p>
|
||||
The eepsite was not found in your router's addressbook.
|
||||
Check the link or find a BASE64 address.
|
||||
If you have the BASE64 address, paste it into your userhosts.txt using
|
||||
<a href="http://127.0.0.1:7657/susidns/addressbook.jsp?book=master">SusiDNS</a>,
|
||||
use a BASE64 address helper, or use a jump service link below.
|
||||
Check the link or find a Base 32 or Base 64 address.
|
||||
If you have the Base 64 address,
|
||||
<a href="http://127.0.0.1:7657/susidns/addressbook.jsp?book=router">add it to your addressbook</a>.
|
||||
Otherwise, find a Base 32 or address helper link, or use a jump service link below.
|
||||
</p>
|
||||
<p>
|
||||
Seeing this page often? See <a href="http://www.i2p2.i2p/faq.html#subscriptions">the FAQ</a>
|
||||
|
||||
@@ -20,8 +20,8 @@ Proxy-Connection: close
|
||||
<p>
|
||||
Die Eepseite konnte nicht im Adressbuch des Routers gefunden werden.
|
||||
Überprüfen Sie den Link oder finden Sie eine BASIS64-Adresse!
|
||||
Wenn Sie eine BASIS64-Adresse haben, fügen Sie diese unter folgendem Link zu Ihrer userhosts.txt hinzu:
|
||||
<a href="http://127.0.0.1:7657/susidns/addressbook.jsp?book=master">SusiDNS</a>,
|
||||
Wenn Sie eine BASIS64-Adresse haben, fügen Sie diese unter folgendem Link zu Ihrer hosts.txt hinzu:
|
||||
<a href="http://127.0.0.1:7657/susidns/addressbook.jsp?book=router">SusiDNS</a>,
|
||||
benutzen Sie einen BASIS64-Adresshelfer oder einen der folgenden Sprungdienste:
|
||||
</p>
|
||||
<p>
|
||||
|
||||
@@ -19,10 +19,10 @@ Proxy-Connection: close
|
||||
<h3>Avertissement I2P: site eep non trouvé dans le carnet d'adresses</h3>
|
||||
<p>
|
||||
Le site eep n'était pas dans le carnet d'adresses de votre routeur.
|
||||
Vérifiez le lien ou trouvez l'adresse BASE64.
|
||||
Si vous avez l'adresse BASE64, reportez-la dans votre fichier userhosts.txt en passant par
|
||||
<a href="http://127.0.0.1:7657/susidns/addressbook.jsp?book=master">SusiDNS</a>,
|
||||
utilisez un lien d'adresse BASE64, ou un service de saut (jump) en lien ci-dessous.
|
||||
Vérifiez le lien ou trouvez l'adresse Base 64.
|
||||
Si vous avez l'adresse Base 64, reportez-la dans votre fichier hosts.txt en passant par
|
||||
<a href="http://127.0.0.1:7657/susidns/addressbook.jsp?book=router">SusiDNS</a>,
|
||||
utilisez un lien d'adresse Base 64, ou un service de saut (jump) en lien ci-dessous.
|
||||
</p>
|
||||
<p>
|
||||
Si vous voyez cette page souvent: lisez la <a href="http://www.i2p2.i2p/faq_fr.html#subscriptions">faq</a> pour obtenir
|
||||
|
||||
@@ -19,10 +19,10 @@ Proxy-Connection: close
|
||||
<h3>Waarschuwing: Eepsite Niet Gevonden in Adresboek</h3>
|
||||
<p>
|
||||
De eepsite was niet gevonden in je router's adresboek.
|
||||
Controlleer de link of zoek een BASE64 adres.
|
||||
Indien je een BASE64 adres hebt, plak het in je userhosts.txt via
|
||||
<a href="http://127.0.0.1:7657/susidns/addressbook.jsp?book=master">SusiDNS</a>,
|
||||
gebruikt een BASE64 adres helper, of gebruik een jump service link hieronder.
|
||||
Controlleer de link of zoek een Base 64 adres.
|
||||
Indien je een Base 64 adres hebt, plak het in je hosts.txt via
|
||||
<a href="http://127.0.0.1:7657/susidns/addressbook.jsp?book=router">SusiDNS</a>,
|
||||
gebruikt een Base 64 adres helper, of gebruik een jump service link hieronder.
|
||||
</p>
|
||||
<p>
|
||||
Zie je deze pagina vaak? Lees <a href="http://www.i2p2.i2p/faq.html#subscriptions">de FAQ</a>
|
||||
|
||||
@@ -25,7 +25,7 @@ Proxy-Connection: close
|
||||
Попробуйте воспользоваться jump-сервисами (блок ссылок в конце этой страницы). Если кто-то уже добавил этот сайт в jump-сервис, Вы получите addresshelper-ссылку, по которой сможете перейти на сайт.
|
||||
</p>
|
||||
<p>
|
||||
Если ни один из jump-сервисов не помог, попробуйте найти BASE64-адрес этого сайта. Добавьте BASE64-адрес в Ваш файл userhosts.txt используя <a href="http://127.0.0.1:7657/susidns/addressbook.jsp?book=master">SusiDNS</a>.
|
||||
Если ни один из jump-сервисов не помог, попробуйте найти Base 64-адрес этого сайта. Добавьте Base 64-адрес в Ваш файл hosts.txt используя <a href="http://127.0.0.1:7657/susidns/addressbook.jsp?book=router">SusiDNS</a>.
|
||||
</p>
|
||||
<p>
|
||||
Часто видите эту страницу? Загляните в <a href="http://www.i2p2.i2p/faq.html#subscriptions">соответствующий раздел FAQ</a> за помощью по <a href="http://127.0.0.1:7657/susidns/config.jsp">настройке автоматической подписки</a> на адреса новых сайтов.
|
||||
|
||||
@@ -19,10 +19,10 @@ Proxy-Connection: close
|
||||
<h3>警告: 地址簿中的找不到此站点</h3>
|
||||
<p>
|
||||
您所访问的匿名站点(的目标密钥)不存在于您路由器的地址簿中。
|
||||
检查链接，或寻找对应的BASE64地址.
|
||||
如果您知道对应的BASE64地址请通过
|
||||
<a href="http://127.0.0.1:7657/susidns/addressbook.jsp?book=master">SusiDNS</a>
|
||||
将其复制入您的 userhosts.txt 中，直接使用 BASE64 地址访问，或使用下面的跳转链接。<br><br>
|
||||
检查链接，或寻找对应的Base 64地址.
|
||||
如果您知道对应的Base 64地址请通过
|
||||
<a href="http://127.0.0.1:7657/susidns/addressbook.jsp?book=router">SusiDNS</a>
|
||||
将其复制入您的 hosts.txt 中，直接使用 Base 64 地址访问，或使用下面的跳转链接。<br><br>
|
||||
经常见到此页面? 请参见 <a href="http://www.i2p2.i2p/faq.html#subscriptions"> FAQ 常见问答</a>
|
||||
中的 <a href="http://127.0.0.1:7657/susidns/config.jsp">添加更多订阅到地址簿中</a>。
|
||||
</p>
|
||||
|
||||
@@ -222,17 +222,9 @@ public class DatabaseLookupMessage extends FastI2NPMessageImpl {
|
||||
curIndex += Hash.HASH_LENGTH;
|
||||
//_fromHash = new Hash(fromData);
|
||||
|
||||
boolean tunnelSpecified = false;
|
||||
switch (data[curIndex]) {
|
||||
case DataHelper.BOOLEAN_TRUE:
|
||||
tunnelSpecified = true;
|
||||
break;
|
||||
case DataHelper.BOOLEAN_FALSE:
|
||||
tunnelSpecified = false;
|
||||
break;
|
||||
default:
|
||||
throw new I2NPMessageException("Tunnel must be explicitly specified (or not)");
|
||||
}
|
||||
// as of 0.9.6, ignore other 7 bits of the flag byte
|
||||
// TODO store the whole flag byte
|
||||
boolean tunnelSpecified = (data[curIndex] & 0x01) != 0;
|
||||
curIndex++;
|
||||
|
||||
if (tunnelSpecified) {
|
||||
@@ -277,13 +269,14 @@ public class DatabaseLookupMessage extends FastI2NPMessageImpl {
|
||||
curIndex += Hash.HASH_LENGTH;
|
||||
System.arraycopy(_fromHash.getData(), 0, out, curIndex, Hash.HASH_LENGTH);
|
||||
curIndex += Hash.HASH_LENGTH;
|
||||
// TODO allow specification of the other 7 bits of the flag byte
|
||||
if (_replyTunnel != null) {
|
||||
out[curIndex++] = DataHelper.BOOLEAN_TRUE;
|
||||
out[curIndex++] = 0x01;
|
||||
byte id[] = DataHelper.toLong(4, _replyTunnel.getTunnelId());
|
||||
System.arraycopy(id, 0, out, curIndex, 4);
|
||||
curIndex += 4;
|
||||
} else {
|
||||
out[curIndex++] = DataHelper.BOOLEAN_FALSE;
|
||||
out[curIndex++] = 0x00;
|
||||
}
|
||||
if ( (_dontIncludePeers == null) || (_dontIncludePeers.isEmpty()) ) {
|
||||
out[curIndex++] = 0x0;
|
||||
|
||||
@@ -78,6 +78,7 @@ public class HandleDatabaseLookupMessageJob extends JobImpl {
|
||||
return;
|
||||
}
|
||||
|
||||
// TODO only look up once, then check type
|
||||
LeaseSet ls = getContext().netDb().lookupLeaseSetLocally(_message.getSearchKey());
|
||||
if (ls != null) {
|
||||
// We have to be very careful here to decide whether or not to send out the leaseSet,
|
||||
|
||||
Reference in New Issue
Block a user