goldcollection
/
muwire
mirror of https://github.com/zlatinb/muwire
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

null checks on unitialized core, html escaping, move scriptst to <head>, thanks zzz

pull/34/head
Zlatin Balevsky 2019-12-05 12:19:10 +00:00
parent edd4a1ff4b
commit beab2be713
7 changed files with 60 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
webui/src/main/java/com/muwire/webui/DownloadServlet.java
View File

@ -38,13 +38,17 @@ public class DownloadServlet extends HttpServlet {
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
if (downloadManager == null) {
resp.sendError(403, "Not initialized");
return;
}
StringBuilder sb = new StringBuilder();
sb.append("<?xml version='1.0' encoding='UTF-8'?>");
sb.append("<Downloads>");
downloadManager.getDownloaders().forEach(d -> {
sb.append("<Download>");
sb.append("<InfoHash>").append(Base64.encode(d.getInfoHash().getRoot())).append("</InfoHash>");
sb.append("<Name>").append(d.getFile().getName()).append("</Name>");
sb.append("<Name>").append(DataHelper.escapeHTML(d.getFile().getName())).append("</Name>");
sb.append("<State>").append(d.getCurrentState().toString()).append("</State>");
int speed = d.speed();
sb.append("<Speed>").append(DataHelper.formatSize2Decimal(speed)).append("B/sec").append("</Speed>");
@ -70,6 +74,10 @@ public class DownloadServlet extends HttpServlet {
});
sb.append("</Downloads>");
resp.setContentType("text/xml");
resp.setCharacterEncoding("UTF-8");
resp.setDateHeader("Expires", 0);
resp.setHeader("Pragma", "no-cache");
resp.setHeader("Cache-Control", "no-store, max-age=0, no-cache, must-revalidate");
resp.getWriter().write(sb.toString());
resp.getWriter().flush();
}
@ -80,7 +88,15 @@ public class DownloadServlet extends HttpServlet {
String infoHashB64 = req.getParameter("infoHash");
InfoHash infoHash = new InfoHash(Base64.decode(infoHashB64));
String action = req.getParameter("action");
if (action == null) {
resp.sendError(403, "Bad action param");
return;
}
if (action.equals("start")) {
if (core == null) {
resp.sendError(403, "Not initialized");
return;
}
UUID uuid = UUID.fromString(req.getParameter("uuid"));
Set<UIResultEvent> results = searchManager.getResults().get(uuid).getByInfoHash(infoHash);
@ -95,6 +111,10 @@ public class DownloadServlet extends HttpServlet {
Thread.sleep(100);
} catch (InterruptedException e) {}
} else if (action.equals("cancel")) {
if (downloadManager == null) {
resp.sendError(403, "Not initialized");
return;
}
downloadManager.getDownloaders().stream().filter(d -> d.getInfoHash().equals(infoHash)).findAny().
ifPresent(d -> {
d.cancel();

39
webui/src/main/java/com/muwire/webui/SearchServlet.java
View File

@ -24,6 +24,10 @@ public class SearchServlet extends HttpServlet {
@Override
protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
if (searchManager == null) {
resp.sendError(403, "Not initialized");
return;
}
String search = req.getParameter("search");
searchManager.newSearch(search);
resp.sendRedirect("/MuWire/Home.jsp");
@ -34,25 +38,33 @@ public class SearchServlet extends HttpServlet {
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
String section = req.getParameter("section");
if (section == null) {
resp.sendError(403, "Bad section param");
return;
}
StringBuilder sb = new StringBuilder();
sb.append("<?xml version='1.0' encoding='UTF-8'?>");
if (section.equals("groupBySender")) {
if (searchManager == null) {
resp.sendError(403, "Not initialized");
return;
}
sb.append("<Searches>");
for (SearchResults results : searchManager.getResults().values()) {
sb.append("<Search>");
sb.append("<uuid>").append(results.getUUID()).append("</uuid>");
sb.append("<Query>").append(results.getSearch()).append("</Query>");
sb.append("<Query>").append(DataHelper.escapeHTML(results.getSearch())).append("</Query>");
Map<Persona, Set<UIResultEvent>> bySender = results.getBySender();
sb.append("<ResultsBySender>");
bySender.forEach((sender, resultsFromSender) -> {
sb.append("<ResultsFromSender>");
sb.append("<Sender>");
sb.append(sender.getHumanReadableName());
sb.append(DataHelper.escapeHTML(sender.getHumanReadableName()));
sb.append("</Sender>");
resultsFromSender.forEach(result -> {
sb.append("<Result>");
sb.append("<Name>");
sb.append(result.getName());
sb.append(DataHelper.escapeHTML(result.getName()));
sb.append("</Name>");
sb.append("<Size>");
sb.append(DataHelper.formatSize2Decimal(result.getSize(), false)).append("B");
@ -70,22 +82,26 @@ public class SearchServlet extends HttpServlet {
}
sb.append("</Searches>");
} else if (section.equals("groupByFile")) {
if (searchManager == null) {
resp.sendError(403, "Not initialized");
return;
}
sb.append("<Searches>");
for (SearchResults results : searchManager.getResults().values()) {
sb.append("<Search>");
sb.append("<uuid>").append(results.getUUID()).append("</uuid>");
sb.append("<Query>").append(results.getSearch()).append("</Query>");
sb.append("<Query>").append(DataHelper.escapeHTML(results.getSearch())).append("</Query>");
Map<InfoHash, Set<UIResultEvent>> byInfohash = results.getByInfoHash();
sb.append("<ResultsByFile>");
byInfohash.forEach((infoHash, resultSet) -> {
sb.append("<ResultsForFile>");
UIResultEvent first = resultSet.iterator().next();
sb.append("<InfoHash>").append(Base64.encode(infoHash.getRoot())).append("</InfoHash>");
sb.append("<Name>").append(first.getName()).append("</Name>");
sb.append("<Name>").append(DataHelper.escapeHTML(first.getName())).append("</Name>");
sb.append("<Size>").append(DataHelper.formatSize2Decimal(first.getSize(), false)).append("B").append("</Size>");
resultSet.forEach(result -> {
sb.append("<Result>");
sb.append("<Sender>").append(result.getSender().getHumanReadableName()).append("</Sender>");
sb.append("<Sender>").append(DataHelper.escapeHTML(result.getSender().getHumanReadableName())).append("</Sender>");
sb.append("</Result>");
});
sb.append("</ResultsForFile>");
@ -95,11 +111,22 @@ public class SearchServlet extends HttpServlet {
}
sb.append("</Searches>");
} else if (section.equals("connectionsCount")) {
if (connectionCounter == null) {
resp.sendError(403, "Not initialized");
return;
}
sb.append("<Connections>");
sb.append(connectionCounter.getConnections());
sb.append("</Connections>");
} else {
resp.sendError(403, "Bad section param");
return;
}
resp.setContentType("text/xml");
resp.setCharacterEncoding("UTF-8");
resp.setDateHeader("Expires", 0);
resp.setHeader("Pragma", "no-cache");
resp.setHeader("Cache-Control", "no-store, max-age=0, no-cache, must-revalidate");
resp.getWriter().write(sb.toString());
resp.flushBuffer();
}

2
webui/src/main/js/conncount.js
View File

@ -5,7 +5,7 @@ function refreshConnectionsCount() {
var connections = this.responseXML.getElementsByTagName("Connections");
var count = connections[0].childNodes[0].nodeValue
var connectionCountSpan = document.getElementById("connectionsCount");
var countString = "Connections: "+count;
var countString = ""+count;
connectionCountSpan.innerHTML = countString;
}
}

2
webui/src/main/webapp/Downloads.jsp
View File

@ -15,8 +15,8 @@
<html>
<head>
<%@include file="css.jsi"%>
</head>
<script src="js/download.js" type="text/javascript"></script>
</head>
<body onload="initConnectionsCount(); initDownloads();">
<%@include file="header.jsi"%>
<p>Downloads:</p>

2
webui/src/main/webapp/Home.jsp
View File

@ -19,8 +19,8 @@
<html>
<head>
<%@include file="css.jsi"%>
</head>
<script src="js/search.js" type="text/javascript"></script>
</head>
<%@include file="header.jsi"%>
<% if (groupBy.equals("sender")) { %>
<body onload="initConnectionsCount();initGroupBySender();">

2
webui/src/main/webapp/header.jsi
View File

@ -6,7 +6,7 @@
<div class="subtitle">
${persona}
<br>
<span id="connectionsCount">Connections : 0</span>
Connections: <span id="connectionsCount">0</span>
<br>
<% if ("Home".equals(pagetitle)) { %>
<form action="/MuWire/Search" method="post">

4
webui/src/main/webapp/initcode.jsi
View File

@ -1,5 +1,5 @@
<%
MuWireClient client = (MuWireClient) application.getAttribute("mwClient");
String persona = client.getCore().getMe().getHumanReadableName();
String version = client.getCore().getVersion();
String persona = client != null ? net.i2p.data.DataHelper.escapeHTML(client.getCore().getMe().getHumanReadableName()) : "";
String version = client != null ? client.getCore().getVersion() : "";
%>