propagate from branch 'i2p.i2p' (head f672021bb9871a728005be3bd9581710738b9e5f)

to branch 'i2p.i2p.zzz.test' (head e115e218dbb666839e69fa1e1ba7378554b9874f)

apps/routerconsole/java/build.xml

@@ -89,7 +89,7 @@
         <!-- jar again to get the latest messages_*.class files -->
         <jar destfile="./build/routerconsole.jar" basedir="./build/obj" includes="**/*.class" update="true" />
     </target>
-    <target name="poupdate" depends="compile">
+    <target name="poupdate" depends="build">
         <ant target="war" />
         <!-- Update the messages_*.po files.
              We need to supply the bat file for windows, and then change the fail property to true -->

apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java

@@ -232,7 +232,7 @@ public class ConfigNetHandler extends FormHandler {
 
             if (_requireIntroductions) {
                 _context.router().setConfigSetting(UDPTransport.PROP_FORCE_INTRODUCERS, "true");
-                addFormNotice(_("Requiring SSU introduers"));
+                addFormNotice(_("Requiring SSU introducers"));
             } else {
                 _context.router().removeConfigSetting(UDPTransport.PROP_FORCE_INTRODUCERS);
             }

apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java

@@ -36,10 +36,10 @@ public class ConfigUIHelper extends HelperBase {
          return rv;
     }
 
-    private static final String langs[] = {"de", "en", "fr", "nl", "se", "zh"};
-    private static final String flags[] = {"de", "us", "fr", "nl", "se", "cn"};
+    private static final String langs[] = {"de", "en", "fr", "nl", "ru", "sv", "zh"};
+    private static final String flags[] = {"de", "us", "fr", "nl", "ru", "se", "cn"};
     private static final String xlangs[] = {_x("German"), _x("English"), _x("French"),
-                                            _x("Dutch"), _x("Swedish"), _x("Chinese")};
+                                            _x("Dutch"), _x("Russian"), _x("Swedish"), _x("Chinese")};
 
     /** todo sort by translated string */
     public String getLangSettings() {

apps/routerconsole/java/src/net/i2p/router/web/NetDbHelper.java

@@ -4,6 +4,7 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 
+import net.i2p.data.DataHelper;
 
 public class NetDbHelper extends HelperBase {
     private String _routerPrefix;
@@ -12,7 +13,11 @@ public class NetDbHelper extends HelperBase {
     
     public NetDbHelper() {}
     
-    public void setRouter(String r) { _routerPrefix = r; }
+    public void setRouter(String r) {
+        if (r != null)
+            _routerPrefix = DataHelper.stripHTML(r);  // XSS
+    }
+
     public void setFull(String f) {
         try {
             _full = Integer.parseInt(f);

apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java

@@ -46,13 +46,13 @@ class ProfileOrganizerRenderer {
             Hash peer = (Hash)iter.next();
             if (_organizer.getUs().equals(peer)) continue;
             PeerProfile prof = _organizer.getProfile(peer);
-            if (_organizer.isWellIntegrated(peer)) {
-                integratedPeers.add(prof);
-            } else {
+            //if (_organizer.isWellIntegrated(peer)) {
+            //    integratedPeers.add(prof);
+            //} else {
                 RouterInfo info = _context.netDb().lookupRouterInfoLocally(peer);
                 if (info != null && info.getCapabilities().indexOf("f") >= 0)
                     integratedPeers.add(prof);
-            }
+            //}
             if (prof.getLastSendSuccessful() <= hideBefore) {
                 older++;
                 continue;

apps/routerconsole/jsp/config.jsp

@@ -32,15 +32,18 @@
    <div class="wideload"><p><table><tr><td><input style="text-align: right; width: 5em;" name="inboundrate" type="text" size="5" maxlength="5" value="<jsp:getProperty name="nethelper" property="inboundRate" />" />
           <%=intl._("KBps In")%>
         </td><td>(<jsp:getProperty name="nethelper" property="inboundRateBits" />)</td>
+<% /********
 <!-- let's keep this simple...
  bursting up to
     <input name="inboundburstrate" type="text" size="5" value="<jsp:getProperty name="nethelper" property="inboundBurstRate" />" /> KBps for
     <jsp:getProperty name="nethelper" property="inboundBurstFactorBox" /><br>
 -->
+*********/ %>
     </tr><tr>
         <td><input style="text-align: right; width: 5em;" name="outboundrate" type="text" size="5" maxlength="5" value="<jsp:getProperty name="nethelper" property="outboundRate" />" />
          <%=intl._("KBps Out")%>
         </td><td>(<jsp:getProperty name="nethelper" property="outboundRateBits" />)</td>
+<% /********
 <!-- let's keep this simple...
  bursting up to
     <input name="outboundburstrate" type="text" size="2" value="<jsp:getProperty name="nethelper" property="outboundBurstRate" />" /> KBps for
@@ -48,6 +51,7 @@
  <i>KBps = kilobytes per second = 1024 bytes per second = 8192 bits per second.<br>
     A negative rate sets the default.</i><br>
 -->
+*********/ %>
     </tr><tr>
         <td><jsp:getProperty name="nethelper" property="sharePercentageBox" /> <%=intl._("Share")%></td>
         <td>(<jsp:getProperty name="nethelper" property="shareRateBits" />)
@@ -121,6 +125,7 @@
  </p><p><b><%=intl._("UDP Configuration:")%></b><br>
  <%=intl._("UDP port:")%>
  <input name ="udpPort" type="text" size="5" maxlength="5" value="<jsp:getProperty name="nethelper" property="configuredUdpPort" />" /><br>
+<% /********
 <!-- let's keep this simple...
 <input type="checkbox" class="optbox" name="requireIntroductions" value="true" <jsp:getProperty name="nethelper" property="requireIntroductionsChecked" /> />
  Require SSU introductions
@@ -128,6 +133,7 @@
  </p><p>
  Current External UDP address: <i><jsp:getProperty name="nethelper" property="udpAddress" /></i><br>
 -->
+*********/ %>
  </p><p>
  <b><%=intl._("TCP Configuration")%>:</b><br>
  <%=intl._("Externally reachable hostname or IP address")%>:<br>
@@ -163,10 +169,12 @@
    <%=intl._("Most of the options above are for special situations, for example where UPnP does not work correctly, or a firewall not under your control is doing harm.")%> 
    <%=intl._("Certain firewalls such as symmetric NATs may not work well with I2P.")%>
  </p>
+<% /********
 <!-- let's keep this simple...
 <input type="submit" name="recheckReachability" value="Check network reachability..." />
 </p>
 -->
+*********/ %>
 <p>
  <%=intl._("UPnP is used to communicate with Internet Gateway Devices (IGDs) to detect the external IP address and forward ports.")%>
    <%=intl._("UPnP support is beta, and may not work for any number of reasons")%>:

apps/routerconsole/jsp/configpeer.jsp

@@ -24,7 +24,7 @@
 
  <% String peer = "";
     if (request.getParameter("peer") != null)
-        peer = request.getParameter("peer");
+        peer = net.i2p.data.DataHelper.stripHTML(request.getParameter("peer"));  // XSS
  %>
  <div class="configure">
  <form action="configpeer.jsp" method="POST">

apps/routerconsole/jsp/i2ptunnel/index.jsp

@@ -3,5 +3,5 @@
 <meta http-equiv="pragma" content="no-cache" />
 </head>
 <body>
-The I2P Tunnel Manager is not currently running. Please visit the<a href="/configclients.jsp">Client Configuration</a> page to start it.
+The I2P Tunnel Manager is not currently running. Please visit the <a href="/configclients.jsp">Client Configuration</a> page to start it.
 </body></html>

apps/routerconsole/jsp/summary.jsi

@@ -11,7 +11,7 @@
         // pass the new delay parameter to the iframe
         newDelay = "?refresh=" + d;
     if (!"0".equals(d))
-        out.print("<iframe src=\"summaryframe.jsp" + newDelay + "\" height=\"1500\" width=\"200\" scrolling=\"auto\" frameborder=\"0\" title=\"sidepanel\">\n");
+        out.print("<iframe src=\"/summaryframe.jsp" + newDelay + "\" height=\"1500\" width=\"200\" scrolling=\"auto\" frameborder=\"0\" title=\"sidepanel\">\n");
 %>
 <div class="routersummary">
 <%@include file="summarynoframe.jsi" %>