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

Console: Fix /viewlicense for Debian packages

Browse Source
This commit is contained in:
zzz
2020-02-28 18:49:20 +00:00
parent 8cf241f6da
commit 53118fa9c6
1 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
apps/routerconsole/jsp/viewlicense.jsp
View File

@@ -13,12 +13,31 @@ response.setDateHeader("Expires", 0);
response.addHeader("Cache-Control", "no-store, max-age=0, no-cache, must-revalidate");
response.addHeader("Pragma", "no-cache");
java.io.File base = net.i2p.I2PAppContext.getGlobalContext().getBaseDir();
java.io.File file = new java.io.File(base, "LICENSE.txt");
String name = "LICENSE.txt";
java.io.File file = new java.io.File(base, name);
if (!file.exists()) {
if (!net.i2p.util.SystemVersion.isWindows() && !net.i2p.util.SystemVersion.isMac()) {
// Debian package?
java.io.File b = new java.io.File("/usr/share/doc/i2p-router");
java.io.File f = new java.io.File(b, "copyright");
if (f.exists()) {
name = "copyright";
base = b;
file = f;
} else {
response.sendError(404, "Not Found");
return;
}
} else {
response.sendError(404, "Not Found");
return;
}
}
long length = file.length();
if (length > 0)
response.setHeader("Content-Length", Long.toString(length));
try {
net.i2p.util.FileUtil.readFile("LICENSE.txt", base.getAbsolutePath(), response.getOutputStream());
net.i2p.util.FileUtil.readFile(name, base.getAbsolutePath(), response.getOutputStream());
} catch (java.io.IOException ioe) {
// prevent 'Committed' IllegalStateException from Jetty
if (!response.isCommitted()) {