Your message dated Thu, 13 Dec 2018 13:50:06 +0000
with message-id <[email protected]>
and subject line Bug#916177: fixed in i2p 0.9.37-2
has caused the Debian Bug report #916177,
regarding i2p: FTBFS with Jetty 9.4
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
916177: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=916177
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Source: i2p
Severity: serious
Tags: patch sid buster
Justification: FTBFS
Hi,
The jetty9 package has been updated to the version 9.4 and it breaks i2p.
Could you pleased review and apply the patch attached? It fixes the build
failure but it's untested at run time.
Thank you,
Emmanuel Bourg
--- a/apps/jetty/java/src/net/i2p/jetty/JettyXmlConfigurationParser.java
+++ b/apps/jetty/java/src/net/i2p/jetty/JettyXmlConfigurationParser.java
@@ -43,9 +43,9 @@
private static XmlParser initParser()
{
XmlParser parser = new XmlParser();
- URL config60 = Loader.getResource(XmlConfiguration.class,
"org/eclipse/jetty/xml/configure_6_0.dtd");
- URL config76 =
Loader.getResource(XmlConfiguration.class,"org/eclipse/jetty/xml/configure_7_6.dtd");
- URL config90 =
Loader.getResource(XmlConfiguration.class,"org/eclipse/jetty/xml/configure_9_0.dtd");
+ URL config60 =
Loader.getResource("org/eclipse/jetty/xml/configure_6_0.dtd");
+ URL config76 =
Loader.getResource("org/eclipse/jetty/xml/configure_7_6.dtd");
+ URL config90 =
Loader.getResource("org/eclipse/jetty/xml/configure_9_0.dtd");
parser.redirectEntity("configure.dtd",config90);
parser.redirectEntity("configure_1_0.dtd",config60);
parser.redirectEntity("configure_1_1.dtd",config60);
--- a/apps/jetty/java/src/net/i2p/servlet/I2PDefaultServlet.java
+++ b/apps/jetty/java/src/net/i2p/servlet/I2PDefaultServlet.java
@@ -132,7 +132,6 @@
*
* Get the resource list as a HTML directory listing.
*/
- @Override
protected void sendDirectory(HttpServletRequest request,
HttpServletResponse response,
Resource resource,
--- a/apps/jetty/java/src/net/i2p/jetty/I2PRequestLog.java
+++ b/apps/jetty/java/src/net/i2p/jetty/I2PRequestLog.java
@@ -317,7 +317,7 @@
buf.append(request.getMethod());
buf.append(' ');
- request.getUri().writeTo(u8buf);
+ u8buf.append(request.getHttpURI().toString());
buf.append(' ');
buf.append(request.getProtocol());
--- a/apps/routerconsole/java/src/net/i2p/router/web/HostCheckHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/HostCheckHandler.java
@@ -15,7 +15,7 @@
import net.i2p.util.PortMapper;
import org.eclipse.jetty.server.Request;
-import org.eclipse.jetty.servlets.gzip.GzipHandler;
+import org.eclipse.jetty.server.handler.gzip.GzipHandler;
/**
* Block certain Host headers to prevent DNS rebinding attacks.
--- a/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java
@@ -22,6 +22,7 @@
import java.util.SortedSet;
import java.util.StringTokenizer;
import java.util.concurrent.LinkedBlockingQueue;
+import javax.servlet.ServletRequest;
import net.i2p.I2PAppContext;
import net.i2p.app.ClientAppManager;
@@ -46,6 +47,7 @@
import org.eclipse.jetty.security.HashLoginService;
import org.eclipse.jetty.security.ConstraintMapping;
import org.eclipse.jetty.security.ConstraintSecurityHandler;
+import org.eclipse.jetty.security.UserStore;
import org.eclipse.jetty.security.authentication.DigestAuthenticator;
import org.eclipse.jetty.server.AbstractConnector;
import org.eclipse.jetty.server.ConnectionFactory;
@@ -932,6 +934,8 @@
} else {
HashLoginService realm = new
CustomHashLoginService(JETTY_REALM, context.getContextPath(),
ctx.logManager().getLog(RouterConsoleRunner.class));
+ UserStore userStore = new UserStore();
+ realm.setUserStore(userStore);
sec.setLoginService(realm);
sec.setAuthenticator(authenticator);
String[] role = new String[] {JETTY_ROLE};
@@ -939,7 +943,7 @@
String user = e.getKey();
String pw = e.getValue();
Credential cred =
Credential.getCredential(MD5_CREDENTIAL_TYPE + pw);
- realm.putUser(user, cred, role);
+ userStore.addUser(user, cred, role);
Constraint constraint = new Constraint(user, JETTY_ROLE);
constraint.setAuthenticate(true);
ConstraintMapping cm = new ConstraintMapping();
@@ -959,7 +963,7 @@
try {
// each char truncated to 8 bytes
String user2 = new String(b2, "ISO-8859-1");
- realm.putUser(user2, cred, role);
+ userStore.addUser(user2, cred, role);
constraint = new Constraint(user2, JETTY_ROLE);
constraint.setAuthenticate(true);
cm = new ConstraintMapping();
@@ -970,7 +974,7 @@
// each UTF-8 byte as a char
// this is what chrome does
String user3 = new String(b1, "ISO-8859-1");
- realm.putUser(user3, cred, role);
+ userStore.addUser(user3, cred, role);
constraint = new Constraint(user3, JETTY_ROLE);
constraint.setAuthenticate(true);
cm = new ConstraintMapping();
@@ -1045,8 +1049,8 @@
}
@Override
- public UserIdentity login(String username, Object credentials) {
- UserIdentity rv = super.login(username, credentials);
+ public UserIdentity login(String username, Object credentials,
ServletRequest request) {
+ UserIdentity rv = super.login(username, credentials, request);
if (rv == null)
//_log.logAlways(net.i2p.util.Log.WARN, "Console
authentication failed, webapp: " + _webapp + ", user: " + username);
_log.logAlways(net.i2p.util.Log.WARN, "Console authentication
failed, user: " + username);
--- a/apps/routerconsole/java/src/net/i2p/router/web/LocaleWebAppHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/LocaleWebAppHandler.java
@@ -85,9 +85,9 @@
String testPath = pathInContext.substring(0, len - 4) +
'_' + lang + ".jsp";
// Do we have a servlet for the new path that isn't the
catchall *.jsp?
@SuppressWarnings("rawtypes")
- Map.Entry servlet =
_wac.getServletHandler().getHolderEntry(testPath);
+ org.eclipse.jetty.http.pathmap.MappedResource servlet =
_wac.getServletHandler().getMappedServlet(testPath);
if (servlet != null) {
- String servletPath = (String) servlet.getKey();
+ String servletPath =
servlet.getPathSpec().getDeclaration();
if (servletPath != null &&
!servletPath.startsWith("*")) {
// success!!
//System.err.println("Servlet is: " + servletPath);
--- End Message ---
--- Begin Message ---
Source: i2p
Source-Version: 0.9.37-2
We believe that the bug you reported is fixed in the latest version of
i2p, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Masayuki Hatta <[email protected]> (supplier of updated i2p package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Thu, 13 Dec 2018 15:15:46 +0900
Source: i2p
Binary: i2p libjbigi-jni i2p-doc i2p-router
Architecture: source all amd64
Version: 0.9.37-2
Distribution: unstable
Urgency: medium
Maintainer: Masayuki Hatta <[email protected]>
Changed-By: Masayuki Hatta <[email protected]>
Description:
i2p - Invisible Internet Project (I2P) - anonymous network
i2p-doc - Invisible Internet Project (I2P) - developer documentation
i2p-router - Invisible Internet Project (I2P) - router
libjbigi-jni - Invisible Internet Project (I2P) - libjbigi library
Closes: 916177
Changes:
i2p (0.9.37-2) unstable; urgency=medium
.
* d/p/0002: Fixed FTBFS with Jetty 9.4, thanks Emmanuel Bourg!
- closes: #916177
[ Ondřej Nový ]
* d/control: Removing redundant Priority field in binary package
* d/changelog: Remove trailing whitespaces
Checksums-Sha1:
649446e949f809a348ac4da17f6e453314c8d0c9 2166 i2p_0.9.37-2.dsc
cae1c409b3feee4ee5216948a28d7b240a8a147c 54772 i2p_0.9.37-2.debian.tar.xz
fe942c0f03311c30f51019ba6f92a68e9112b64d 3324816 i2p-doc_0.9.37-2_all.deb
f8084b3c762e0debfb5c981634eb134372345994 9368004 i2p-router_0.9.37-2_all.deb
e2e6f26ad0dbe511f8a419cf0f1d4d7f3dd07e7c 65588 i2p_0.9.37-2_all.deb
a0661697eceedad263588b7954da0593eda5d123 11598 i2p_0.9.37-2_amd64.buildinfo
a8d79bf6a1c23d1a6c82c2fc59ced2fcaeb2ada1 13988
libjbigi-jni-dbgsym_0.9.37-2_amd64.deb
24165a8f717d3ebab528b0886d939e3c9050d46f 5092 libjbigi-jni_0.9.37-2_amd64.deb
Checksums-Sha256:
6099e1e11a1aabb782d052df7b2bd7bdf898e89a513a5a7fab8d85d9de03603d 2166
i2p_0.9.37-2.dsc
645358f28906bbd1cb352c12666001c8f15ee24a52fb0ed8f72876b735cbe687 54772
i2p_0.9.37-2.debian.tar.xz
acc330eec8ff51b8b6bd240679352268a3c799eaf6abc8c6fb4e010412415c64 3324816
i2p-doc_0.9.37-2_all.deb
1b5533e5c34549ae5a236c56ca3dc737013a274589ed2d5aea6269300317c76a 9368004
i2p-router_0.9.37-2_all.deb
60129c8f0e05038987ec7b989aeaf004a3726911ce930bd13e09438bc1db1440 65588
i2p_0.9.37-2_all.deb
21fcd7e5cd753e7def779ee1e64dbe4bdc7b4186bf25e95638f73660fab24bea 11598
i2p_0.9.37-2_amd64.buildinfo
fbb7d2cd6e0385f477efea083b0154e69a9e18263d2f48763c4cf0a0a010c21a 13988
libjbigi-jni-dbgsym_0.9.37-2_amd64.deb
8e84d5715939a291f147a2f5b0eaeef357a0ba89bf4582ded8503da381c234da 5092
libjbigi-jni_0.9.37-2_amd64.deb
Files:
48375b5c5705ce52045db0b232d5d145 2166 net optional i2p_0.9.37-2.dsc
c7dd810b2803ba7d235cdd77f5f73604 54772 net optional i2p_0.9.37-2.debian.tar.xz
a9de48b1fab08f3c45dd7a1c83654849 3324816 doc optional i2p-doc_0.9.37-2_all.deb
cf6bfdbdf08ed4da3a06f302431fb58d 9368004 net optional
i2p-router_0.9.37-2_all.deb
c438b84f9fbb6727016a518c281cf8f7 65588 net optional i2p_0.9.37-2_all.deb
b132ea6530ad0fb9963b92207754c92b 11598 net optional
i2p_0.9.37-2_amd64.buildinfo
8167f11418f2cfd2c1c8c976b2b1e829 13988 debug optional
libjbigi-jni-dbgsym_0.9.37-2_amd64.deb
d7e2523ad96be51a7d85f7048431bbb0 5092 java optional
libjbigi-jni_0.9.37-2_amd64.deb
-----BEGIN PGP SIGNATURE-----
iQJGBAEBCgAwFiEEZDzS6N3LAPjxWBIb3a4SYm4UEDUFAlwSYJcSHG1oYXR0YUBk
ZWJpYW4ub3JnAAoJEN2uEmJuFBA1FI8P+gKeXtpJfFlxr9njuxW24CSYISOKofQu
pEBm607VnTqKWm7fYEOf+emXJ+atW+gyZ4BsxdnQcoWrWGlhIH5BhU+uHjyW3VIG
XhISOJwfA01ENiXeHCHMh3P/iWBTxOT0ZYjGz4bcZlBPAKClpNai0Z4NYr17B6g3
SOI7XpVB7lwpr7d0XMAtlE23+OOSgeHsZmowNVyP9hD9lNJPfxGZZ0BmzZsqoksX
nlcgoikBq2G4OfJdJz8+xpCmcKgDrgjxvf18EFt3YiqyGwivwY0A4sokL0212Mna
SsV/9wFatZU+YMALdi89LG3XCpuspl4d1JTtCJBAfVDoWSnRMOO3XQVibz2Igq8g
EyS8PtNLs/canU3+zda2Wk56+pED7oc3G1D5IFq+EgCyKHGCcvS3tspp03UPlzbV
HdeD3BZvsJW4/OfQkyw+93tYge1wyvqGSqxaPdc7IhFsNq6mNYw/HoQTRI6KQRDq
QHJ2q7wxcy0JdXfTKUlkjNF67DhoebK0BmztaUpftnPxVK16hheFbKtqog/IM45W
LV0bQrUumeAeSA+r15/foPr9BFHYFqHbVeCATpluLuA9LsAJWg9fEMdf1nmKrZ/m
zmcliCnx1NHtQV1BSpuI/O0cKpC7jT6XHO+it8OFFdU3AtGg2ubcy6ESqJENVJCK
rcm0ZFDLdUlJ
=TR2J
-----END PGP SIGNATURE-----
--- End Message ---
