From d4a139f2154fc3070f04f7fc6c7e1ce4045a7326 Mon Sep 17 00:00:00 2001 From: zzz Date: Sat, 15 Jul 2017 13:57:40 +0000 Subject: [PATCH] Console: Fix compile error with Jetty 9.2.22 (ticket #2019) --- .../java/src/net/i2p/router/web/RouterConsoleRunner.java | 4 +++- history.txt | 3 +++ router/java/src/net/i2p/router/RouterVersion.java | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java b/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java index 5aefb1588..e77d150f7 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java @@ -118,6 +118,8 @@ public class RouterConsoleRunner implements RouterApp { private static final String JETTY_ROLE = "routerAdmin"; public static final String PROP_CONSOLE_PW = "routerconsole.auth." + JETTY_REALM; public static final String PROP_PW_ENABLE = "routerconsole.auth.enable"; + /** from Jetty Credential.java */ + private static final String MD5_CREDENTIAL_TYPE = "MD5:"; public static final String ROUTERCONSOLE = "routerconsole"; public static final String PREFIX = "webapps."; @@ -883,7 +885,7 @@ public class RouterConsoleRunner implements RouterApp { for (Map.Entry e : userpw.entrySet()) { String user = e.getKey(); String pw = e.getValue(); - Credential cred = Credential.getCredential(MD5.__TYPE + pw); + Credential cred = Credential.getCredential(MD5_CREDENTIAL_TYPE + pw); realm.putUser(user, cred, role); Constraint constraint = new Constraint(user, JETTY_ROLE); constraint.setAuthenticate(true); diff --git a/history.txt b/history.txt index 962e8447b..f164aaf95 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,6 @@ +2017-07-15 zzz + * Console: Fix compile error with Jetty 9.2.22 (ticket #2019) + 2017-07-13 zzz * Crypto: Preserve CRT parameters for RSA private keys (ticket #2005) * Various fixes after review diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 987fc2f75..78754ef28 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,7 +18,7 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 19; + public final static long BUILD = 20; /** for example "-test" */ public final static String EXTRA = "-rc";