diff --git a/apps/i2ptunnel/jsp/editClient.jsp b/apps/i2ptunnel/jsp/editClient.jsp index 5fbc62dd4..3ac7d5454 100644 --- a/apps/i2ptunnel/jsp/editClient.jsp +++ b/apps/i2ptunnel/jsp/editClient.jsp @@ -56,7 +56,7 @@ input.default { width: 1px; height: 1px; visibility: hidden; } %>

<%=intl._t("New proxy settings")%>

<% } %> - + <% // these are four keys that are generated automatically on first save, diff --git a/apps/i2ptunnel/jsp/editServer.jsp b/apps/i2ptunnel/jsp/editServer.jsp index 4a0a7eabf..ac3eb48e3 100644 --- a/apps/i2ptunnel/jsp/editServer.jsp +++ b/apps/i2ptunnel/jsp/editServer.jsp @@ -56,7 +56,7 @@ input.default { width: 1px; height: 1px; visibility: hidden; } %>

<%=intl._t("New server settings")%>

<% } %> - + <% // these are four keys that are generated automatically on first save, diff --git a/apps/i2ptunnel/jsp/index.jsp b/apps/i2ptunnel/jsp/index.jsp index da05b233a..9e2c06492 100644 --- a/apps/i2ptunnel/jsp/index.jsp +++ b/apps/i2ptunnel/jsp/index.jsp @@ -60,6 +60,7 @@ <% if (indexBean.isInitialized()) { + String nextNonce = net.i2p.i2ptunnel.web.IndexBean.getNextNonce(); %>
@@ -67,12 +68,12 @@
<%=intl._t("Tunnel Wizard")%> - <%=intl._t("Stop All")%> - <%=intl._t("Start All")%> - <%=intl._t("Restart All")%> + <%=intl._t("Stop All")%> + <%=intl._t("Start All")%> + <%=intl._t("Restart All")%> <%-- //this is really bad because it stops and restarts all tunnels, which is probably not what you want - <%=intl._t("Reload Config")%> + <%=intl._t("Reload Config")%> --%>
@@ -152,17 +153,17 @@ switch (indexBean.getTunnelStatus(curServer)) { case IndexBean.STARTING: %>
<%=intl._t("Starting...")%>
- <%=intl._t("Stop")%> + <%=intl._t("Stop")%> <% break; case IndexBean.RUNNING: %>
<%=intl._t("Running")%>
- <%=intl._t("Stop")%> + <%=intl._t("Stop")%> <% break; case IndexBean.NOT_RUNNING: %>
<%=intl._t("Stopped")%>
- <%=intl._t("Start")%> + <%=intl._t("Start")%> <% break; } @@ -275,22 +276,22 @@ switch (indexBean.getTunnelStatus(curClient)) { case IndexBean.STARTING: %>
<%=intl._t("Starting...")%>
- <%=intl._t("Stop")%> + <%=intl._t("Stop")%> <% break; case IndexBean.STANDBY: %>
<%=intl._t("Standby")%>
- <%=intl._t("Stop")%> + <%=intl._t("Stop")%> <% break; case IndexBean.RUNNING: %>
<%=intl._t("Running")%>
- <%=intl._t("Stop")%> + <%=intl._t("Stop")%> <% break; case IndexBean.NOT_RUNNING: %>
<%=intl._t("Stopped")%>
- <%=intl._t("Start")%> + <%=intl._t("Start")%> <% break; } diff --git a/apps/i2ptunnel/jsp/wizard.jsp b/apps/i2ptunnel/jsp/wizard.jsp index 6541ffc17..fefd8a877 100644 --- a/apps/i2ptunnel/jsp/wizard.jsp +++ b/apps/i2ptunnel/jsp/wizard.jsp @@ -92,7 +92,7 @@ } %> - +
diff --git a/apps/jetty/java/src/net/i2p/servlet/filters/XSSRequestWrapper.java b/apps/jetty/java/src/net/i2p/servlet/filters/XSSRequestWrapper.java index 54975964b..8d16e5953 100644 --- a/apps/jetty/java/src/net/i2p/servlet/filters/XSSRequestWrapper.java +++ b/apps/jetty/java/src/net/i2p/servlet/filters/XSSRequestWrapper.java @@ -84,11 +84,10 @@ public class XSSRequestWrapper extends HttpServletRequestWrapper { * Parameter names starting with "nofilter_" will not be filtered. */ @Override - @SuppressWarnings({"unchecked", "rawtypes"}) - public Map getParameterMap() { - Map rv = new HashMap(); - for (Enumeration keys = getParameterNames(); keys.hasMoreElements(); ) { - String k = (String) keys.nextElement(); + public Map getParameterMap() { + Map rv = new HashMap(); + for (Enumeration keys = getParameterNames(); keys.hasMoreElements(); ) { + String k = keys.nextElement(); String[] v = getParameterValues(k); if (v != null) rv.put(k, v); diff --git a/apps/routerconsole/jsp/configui.jsp b/apps/routerconsole/jsp/configui.jsp index 73d0ec565..96f7bf84c 100644 --- a/apps/routerconsole/jsp/configui.jsp +++ b/apps/routerconsole/jsp/configui.jsp @@ -31,7 +31,7 @@ input.default { <%@include file="formhandler.jsi" %>

<%=uihelper._t("Router Console Theme")%>

- + <% diff --git a/apps/routerconsole/jsp/console.jsp b/apps/routerconsole/jsp/console.jsp index 1cff1e369..c61025795 100644 --- a/apps/routerconsole/jsp/console.jsp +++ b/apps/routerconsole/jsp/console.jsp @@ -10,7 +10,7 @@ <%@include file="summaryajax.jsi" %> <% - String consoleNonce = intl.getNonce(); + String consoleNonce = net.i2p.router.web.CSSHelper.getNonce(); %> <%@include file="summary.jsi" %> diff --git a/apps/routerconsole/jsp/css.jsi b/apps/routerconsole/jsp/css.jsi index 50c70d875..edae86240 100644 --- a/apps/routerconsole/jsp/css.jsi +++ b/apps/routerconsole/jsp/css.jsi @@ -37,7 +37,7 @@ } String conNonceParam = request.getParameter("consoleNonce"); - if (intl.getNonce().equals(conNonceParam)) { + if (net.i2p.router.web.CSSHelper.getNonce().equals(conNonceParam)) { intl.setLang(request.getParameter("lang")); intl.setNews(request.getParameter("news")); } diff --git a/apps/routerconsole/jsp/home.jsp b/apps/routerconsole/jsp/home.jsp index ec00c6b08..eb9887e97 100644 --- a/apps/routerconsole/jsp/home.jsp +++ b/apps/routerconsole/jsp/home.jsp @@ -8,7 +8,7 @@ <%@include file="summaryajax.jsi" %> <% - String consoleNonce = intl.getNonce(); + String consoleNonce = net.i2p.router.web.CSSHelper.getNonce(); %> " /> diff --git a/apps/routerconsole/jsp/summaryframe.jsp b/apps/routerconsole/jsp/summaryframe.jsp index 3107bb96a..290e37043 100644 --- a/apps/routerconsole/jsp/summaryframe.jsp +++ b/apps/routerconsole/jsp/summaryframe.jsp @@ -23,7 +23,7 @@ if (!shutdownSoon) { if (d == null || "".equals(d)) { // set below - } else if (intl.getNonce().equals(conNonceParam)) { + } else if (net.i2p.router.web.CSSHelper.getNonce().equals(conNonceParam)) { d = net.i2p.data.DataHelper.stripHTML(d); // XSS intl.setRefresh(d); intl.setDisableRefresh(d); diff --git a/core/java/src/net/i2p/kademlia/KBucketSet.java b/core/java/src/net/i2p/kademlia/KBucketSet.java index a2d0610a6..0d5daa223 100644 --- a/core/java/src/net/i2p/kademlia/KBucketSet.java +++ b/core/java/src/net/i2p/kademlia/KBucketSet.java @@ -628,6 +628,7 @@ public class KBucketSet { * @param data size <= SDS length, else throws IAE * Can be 1 bigger if top byte is zero */ + @SuppressWarnings("unchecked") private T makeKey(byte[] data) { int len = _us.length(); int dlen = data.length;