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

Plugins: Fix loading of webapp configuration classes

Browse Source 
on Jetty 9.4 by whitelisting them as allowed server classes
(ticket #2385)
This commit is contained in:
zzz
2019-01-18 11:35:36 +00:00
parent 6ca383071b
commit b4e2619c3b
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/routerconsole/java/src/net/i2p/router/web/WebAppStarter.java
View File

@ -139,8 +139,11 @@ public class WebAppStarter {
if (classNames.length == 0) if (classNames.length == 0)
classNames = wac.getDefaultConfigurationClasses(); classNames = wac.getDefaultConfigurationClasses();
String[] newClassNames = new String[classNames.length + 1]; String[] newClassNames = new String[classNames.length + 1];
for (int j = 0; j < classNames.length; j++) for (int j = 0; j < classNames.length; j++) {
newClassNames[j] = classNames[j]; newClassNames[j] = classNames[j];
// fix for Jetty 9.4 ticket #2385
wac.prependServerClass("-" + classNames[j]);
}
newClassNames[classNames.length] = WebAppConfiguration.class.getName(); newClassNames[classNames.length] = WebAppConfiguration.class.getName();
wac.setConfigurationClasses(newClassNames); wac.setConfigurationClasses(newClassNames);
} }

4
history.txt
View File

@ -1,4 +1,8 @@
2019-01-18 zzz
* Plugins: Fix loading of webapp configuration classes (ticket #2385)
2019-01-15 zzz 2019-01-15 zzz
* Debian: AppArmor updates (ticket #2319)
* SusiMail: * SusiMail:
- Fix sending mail with attachments (ticket #2373) - Fix sending mail with attachments (ticket #2373)
- Fix deleting attachments from drafts - Fix deleting attachments from drafts

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 = 17; public final static long BUILD = 18;
/** for example "-test" */ /** for example "-test" */
public final static String EXTRA = "-rc"; public final static String EXTRA = "-rc";