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

Console: Fix compile error with Jetty 9.2.22 (ticket #2019)

Browse Source
This commit is contained in:
zzz
2017-07-15 13:57:40 +00:00
parent 0b85bffeff
commit d4a139f215
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java
View File

@ -118,6 +118,8 @@ public class RouterConsoleRunner implements RouterApp {
private static final String JETTY_ROLE = "routerAdmin"; private static final String JETTY_ROLE = "routerAdmin";
public static final String PROP_CONSOLE_PW = "routerconsole.auth." + JETTY_REALM; public static final String PROP_CONSOLE_PW = "routerconsole.auth." + JETTY_REALM;
public static final String PROP_PW_ENABLE = "routerconsole.auth.enable"; 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 ROUTERCONSOLE = "routerconsole";
public static final String PREFIX = "webapps."; public static final String PREFIX = "webapps.";
@ -883,7 +885,7 @@ public class RouterConsoleRunner implements RouterApp {
for (Map.Entry<String, String> e : userpw.entrySet()) { for (Map.Entry<String, String> e : userpw.entrySet()) {
String user = e.getKey(); String user = e.getKey();
String pw = e.getValue(); String pw = e.getValue();
Credential cred = Credential.getCredential(MD5.__TYPE + pw); Credential cred = Credential.getCredential(MD5_CREDENTIAL_TYPE + pw);
realm.putUser(user, cred, role); realm.putUser(user, cred, role);
Constraint constraint = new Constraint(user, JETTY_ROLE); Constraint constraint = new Constraint(user, JETTY_ROLE);
constraint.setAuthenticate(true); constraint.setAuthenticate(true);

3
history.txt
View File

@ -1,3 +1,6 @@
2017-07-15 zzz
* Console: Fix compile error with Jetty 9.2.22 (ticket #2019)
2017-07-13 zzz 2017-07-13 zzz
* Crypto: Preserve CRT parameters for RSA private keys (ticket #2005) * Crypto: Preserve CRT parameters for RSA private keys (ticket #2005)
* Various fixes after review * Various fixes after review

2
router/java/src/net/i2p/router/RouterVersion.java
View File

@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */ /** deprecated */
public final static String ID = "Monotone"; public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION; public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 19; public final static long BUILD = 20;
/** for example "-test" */ /** for example "-test" */
public final static String EXTRA = "-rc"; public final static String EXTRA = "-rc";