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

Installer: Require Java 8 (ticket #2511)

Browse Source 
Jetty 9.3.28 (ticket #2098)
This breaks Debian builds, fixes to follow
This commit is contained in:
zzz
2020-05-27 16:08:54 +00:00
parent 27e422f81d
commit 03b1a4dfc0
70 changed files with 52 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/routerconsole/java/build.xml
View File

@ -48,7 +48,7 @@
<!-- only used if not set by a higher build.xml -->
<property name="javac.compilerargs" value="" />
<property name="javac.version" value="1.7" />
<property name="javac.version" value="1.8" />
<property name="manifest.classpath.name" value="Class-Path" />
<target name="compile" depends="prepare, depend, dependVersion">

2
apps/routerconsole/java/src/net/i2p/router/web/HostCheckHandler.java
View File

@ -15,7 +15,7 @@ import net.i2p.util.Log;
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.

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

@ -22,6 +22,7 @@ import java.util.Set;
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.ClientApp;
@ -360,17 +361,20 @@ public class RouterConsoleRunner implements RouterApp {
log.logAlways(net.i2p.util.Log.WARN, s);
System.out.println("Warning: " + s);
if (noJava8) {
s = "Java 8 or higher will be required in a future release, please upgrade Java";
s = "Java 8 or higher is required, please upgrade Java";
log.logAlways(net.i2p.util.Log.WARN, s);
System.out.println("Warning: " + s);
}
if (noPack200) {
s = "Pack200 is required for plugins and automatic updates, please upgrade Java";
if (SystemVersion.isJava(14))
s = "Pack200 is required for some plugins, please consider downgrading Java to 13 or lower";
else
s = "Pack200 is required for some plugins, please consider upgrading Java";
log.logAlways(net.i2p.util.Log.WARN, s);
System.out.println("Warning: " + s);
}
if (openARM) {
s = "OpenJDK 7/8 are not recommended for ARM. Use OpenJDK 9 (or higher) or Oracle Java 8 (or higher)";
s = "OpenJDK 8 is not recommended for ARM. Use OpenJDK 9 (or higher) or Oracle Java 8 (or higher)";
log.logAlways(net.i2p.util.Log.WARN, s);
System.out.println("Warning: " + s);
}
@ -1081,8 +1085,8 @@ public class RouterConsoleRunner implements RouterApp {
}
@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);