diff --git a/apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java index e65f9ec90..8a1b92046 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java @@ -28,11 +28,13 @@ public class CSSHelper extends HelperBase { return url; } - /** change default language for the router but don't save it */ + /** change default language for the router AND save it */ public void setLang(String lang) { - // TODO: Protect with nonce or require POST - if (lang != null && lang.length() == 2) + // Protected with nonce in css.jsi + if (lang != null && lang.length() == 2 && !lang.equals(_context.getProperty(Messages.PROP_LANG))) { _context.router().setConfigSetting(Messages.PROP_LANG, lang); + _context.router().saveConfig(); + } } /** needed for conditional css loads for zh */ @@ -61,4 +63,13 @@ public class CSSHelper extends HelperBase { .append(""); return buf.toString(); } + + /** + * Should we allow a refreshing IFrame? + * @since 0.8.5 + */ + public boolean allowIFrame(String ua) { + return ua == null || !(ua.startsWith("Lynx") || ua.startsWith("w3m") || + ua.startsWith("ELinks") || ua.startsWith("Dillo")); + } } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ContentHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ContentHelper.java index 1853ff246..b56108be3 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ContentHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ContentHelper.java @@ -19,15 +19,14 @@ public class ContentHelper extends HelperBase { _startAtBeginning = Boolean.valueOf(""+moo).booleanValue(); } public void setLang(String l) { +/***** if((_lang == null || !_lang.equals(l)) && (l != null)) { //Set language for router console _lang = l; -/***** TODO - Temporary for 0.8.4 Needed for desktopgui. But there's no nonce protection. Move the following to CSSHelper setLang(), or disable completely, See comments in CSSHelper -*****/ if(_context == null) { setContextId(null); } @@ -39,6 +38,7 @@ public class ContentHelper extends HelperBase { _context.setProperty(Messages.PROP_LANG, _lang); } } +*****/ } public void setMaxLines(String lines) { diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java index 55c7b009c..e21102c7f 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java @@ -224,25 +224,21 @@ public class SummaryBarRenderer { System.setProperty("net.i2p.router.web.UpdateHandler.noncePrev", prev); System.setProperty("net.i2p.router.web.UpdateHandler.nonce", nonce+""); String uri = _helper.getRequestURI(); - buf.append("

\n"); + buf.append("\n"); buf.append("\n"); if (_helper.updateAvailable()) { buf.append("\n"); + // Note to translators: parameter is a version, e.g. "0.8.4" + .append(_("Download {0} Update", _helper.getUpdateVersion())) + .append("
\n"); } if (_helper.unsignedUpdateAvailable()) { buf.append("\n"); + // Note to translators: parameter is a date and time, e.g. "02-Mar 20:34 UTC" + //
is optional, to help the browser make the lines even in the button + // If the translation is shorter than the English, you should probably not include
+ .append(_("Download Unsigned
Update {0}", _helper.getUnsignedUpdateVersion())) + .append("
\n"); } buf.append("
\n"); } @@ -251,10 +247,9 @@ public class SummaryBarRenderer { - buf.append("

") - .append(ConfigRestartBean.renderStatus(_helper.getRequestURI(), _helper.getAction(), _helper.getConsoleNonce())) + buf.append(ConfigRestartBean.renderStatus(_helper.getRequestURI(), _helper.getAction(), _helper.getConsoleNonce())) - .append("

") .append(_("Peers")) @@ -456,4 +451,9 @@ public class SummaryBarRenderer { private String _(String s) { return Messages.getString(s, _context); } + + /** translate a string with a parameter */ + private String _(String s, Object o) { + return Messages.getString(s, o, _context); + } } diff --git a/apps/routerconsole/jsp/configlogging.jsp b/apps/routerconsole/jsp/configlogging.jsp index c87fd367d..bd80b8086 100644 --- a/apps/routerconsole/jsp/configlogging.jsp +++ b/apps/routerconsole/jsp/configlogging.jsp @@ -41,7 +41,7 @@
<%=intl._("('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss' = second, 'SSS' = millisecond)")%> <%=intl._("Max log file size")%>: - " >
+ " >
<%=intl._("Default log level")%>:
<%=intl._("(DEBUG and INFO are not recommended defaults, as they will drastically slow down your router)")%> diff --git a/apps/routerconsole/jsp/css.jsi b/apps/routerconsole/jsp/css.jsi index 613b32a67..e259d0707 100644 --- a/apps/routerconsole/jsp/css.jsi +++ b/apps/routerconsole/jsp/css.jsi @@ -26,7 +26,10 @@ " /> <% - intl.setLang(request.getParameter("lang")); + String conNonceParam = request.getParameter("consoleNonce"); + if (conNonceParam != null && conNonceParam.equals(System.getProperty("router.consoleNonce"))) { + intl.setLang(request.getParameter("lang")); + } %> console.css" rel="stylesheet" type="text/css"> <% diff --git a/apps/routerconsole/jsp/index.jsp b/apps/routerconsole/jsp/index.jsp index 6f29573e6..5aeeeea98 100644 --- a/apps/routerconsole/jsp/index.jsp +++ b/apps/routerconsole/jsp/index.jsp @@ -7,9 +7,11 @@ <%=intl.title("home")%> <% -if (System.getProperty("router.consoleNonce") == null) { - System.setProperty("router.consoleNonce", new java.util.Random().nextLong() + ""); -} + String consoleNonce = System.getProperty("router.consoleNonce"); + if (consoleNonce == null) { + consoleNonce = Long.toString(new java.util.Random().nextLong()); + System.setProperty("router.consoleNonce", consoleNonce); + } %> <%@include file="summary.jsi" %>

<%=intl._("I2P Router Console")%>

@@ -26,10 +28,25 @@ if (System.getProperty("router.consoleNonce") == null) {

+
+
+ English + عربية + 中文 + Deutsch + Français + Español + Português + Nederlands + Русский + Svenska +
+ +

<%=intl._("Welcome to I2P")%>

+
<% fpath = new java.io.File(net.i2p.I2PAppContext.getGlobalContext().getBaseDir(), "docs/readme.html"); %> - " /> " />
diff --git a/apps/routerconsole/jsp/summary.jsi b/apps/routerconsole/jsp/summary.jsi index 5a81e7af3..46cb366fe 100644 --- a/apps/routerconsole/jsp/summary.jsi +++ b/apps/routerconsole/jsp/summary.jsi @@ -1,27 +1,41 @@ -<% // put width here too to prevent bad layout at startup %> -<% // let's remove that for now since we're no longer using percentage width here %>
<% - // skip the iframe if refresh disabled - String d = request.getParameter("refresh"); - String newDelay = ""; - if (d == null || "".equals(d)) - d = intl.getRefresh(); - else { - d = net.i2p.data.DataHelper.stripHTML(d); // XSS - // pass the new delay parameter to the iframe - newDelay = "?refresh=" + d; + // The refresh delay, 0 to disable + String d = "0"; + boolean allowIFrame = intl.allowIFrame(request.getHeader("User-Agent")); + if (allowIFrame) { + // skip the iframe if refresh disabled + d = request.getParameter("refresh"); + String newDelay = ""; + if (d == null || "".equals(d)) + d = intl.getRefresh(); + else { + d = net.i2p.data.DataHelper.stripHTML(d); // XSS + // pass the new delay parameter to the iframe + newDelay = "?refresh=" + d; + } + if (!"0".equals(d)) + out.print("\n"); - } else { + } else if (allowIFrame) { // since we don't have an iframe this will reload the base page, and // the new delay will be passed to the iframe above out.print("
\n"); @@ -34,6 +48,8 @@ out.print(intl._("Enable")); out.print("\n"); out.print("
\n"); + } else { + out.print("\n"); } %> diff --git a/apps/routerconsole/jsp/summaryframe.jsp b/apps/routerconsole/jsp/summaryframe.jsp index e59fbd44f..d0eb8b72a 100644 --- a/apps/routerconsole/jsp/summaryframe.jsp +++ b/apps/routerconsole/jsp/summaryframe.jsp @@ -15,7 +15,9 @@ String action = request.getParameter("action"); String d = request.getParameter("refresh"); // Normal browsers send value, IE sends button label - boolean shutdownSoon = "shutdownImmediate".equals(action) || "restartImmediate".equals(action) || + boolean allowIFrame = intl.allowIFrame(request.getHeader("User-Agent")); + boolean shutdownSoon = (!allowIFrame) || + "shutdownImmediate".equals(action) || "restartImmediate".equals(action) || "Shutdown immediately".equals(action) || "Restart immediately".equals(action); if (!shutdownSoon) { if (d == null || "".equals(d)) { diff --git a/history.txt b/history.txt index fba494287..0c11021ed 100644 --- a/history.txt +++ b/history.txt @@ -1,8 +1,23 @@ +2011-03-08 zzz + * Console: + - Parameterize download button tags (ticket #425) + - Clean up summary bar HTML warnings + - Just display a summary bar link for text browsers + - Move welcome div from the readme files to index.jsp + - Require a nonce to change language + * i2psnark: + - More efficient metainfo handling, reduce instantiations + - Improved handling of storage errors + - Improved handling of duplicate file names + - More metainfo sanity checks + - Metadata transfer error handling improvements + - Code cleanup, remove dead and duplicated code + 2011-03-02 zzz * BuildHandler: - Limit request queue size - Concurrent request queue - - Remove dead code for queued rely handling + - Remove dead code for queued reply handling * OutNetMessage: Remove dead code * Tunnel cleanups, final, javadoc diff --git a/installer/resources/readme/readme.html b/installer/resources/readme/readme.html index 680a6c52b..a9eda7181 100644 --- a/installer/resources/readme/readme.html +++ b/installer/resources/readme/readme.html @@ -1,20 +1,4 @@
-
-
- English - عربية - 中文 - Deutsch - Français - Español - Português - Nederlands - Русский - Svenska -
- -

Welcome to the Invisible Internet

-
  • Starting Up…
    If you've just started I2P, the number of Active Peers indicated under the Peers section in the side panel on the left should start to grow over the next few minutes and you'll also see a Local Destination named Shared Clients listed there, and possibly other clients and servers depending on how I2P is configured (if not, see the troubleshooting section below). These Local Destinations provide connections on different ports (and sometimes protocols) to the I2P network, enabling your bittorrent, e-mail, web proxy and other services to function. Your Network Database indicates all known peers on the network. Additionally, you can monitor existing Peer Connections, and view existing Tunnels and their status. More information is available on the help page.
    • diff --git a/installer/resources/readme/readme_ar.html b/installer/resources/readme/readme_ar.html index 5de8e7891..67ef0d0ed 100644 --- a/installer/resources/readme/readme_ar.html +++ b/installer/resources/readme/readme_ar.html @@ -1,20 +1,4 @@
    -
    -
    - English - عربية - 中文 - Deutsch - Français - Español - Português - Nederlands - Русский - Svenska -
    - -

    مرحبا بكم في الانترنت الغير مرئية

    -

    عندما تقوم بتشغيل I2P ستبدأ الأرقام على يسار الشاشة في الازدياد خلال الدقائق التالية وستظهر عبارة Shared Clients (ان لم تظهر، انظر التعليمات اسفله). عندها يمكنك الحصول على عدة خدمات مثل تورنت، البريد الإلكتروني السري، وخدمات أخرى:

      diff --git a/installer/resources/readme/readme_de.html b/installer/resources/readme/readme_de.html index df0b506ce..0edc7751e 100644 --- a/installer/resources/readme/readme_de.html +++ b/installer/resources/readme/readme_de.html @@ -1,20 +1,4 @@
      -
      -
      - English - عربية - 中文 - Deutsch - Français - Español - Português - Nederlands - Русский - Svenska -
      - -

      Willkommen im I2P!

      -

      Wenn Du I2P gerade gestartet hast, sollten die "Aktiv:"-Zahlen links in den nächsten Minuten anwachsen. Du siehst dann dort ein als "versch. Klienten" bezeichnetes lokales Ziel gelistet (falls nicht, siehe unten). Sobald dieses erscheint, kannst Du:

        diff --git a/installer/resources/readme/readme_es.html b/installer/resources/readme/readme_es.html index 063743360..f6f2cd544 100644 --- a/installer/resources/readme/readme_es.html +++ b/installer/resources/readme/readme_es.html @@ -1,20 +1,4 @@
        -
        -
        - English - عربية - 中文 - Deutsch - Français - Español - Português - Nederlands - Русский - Svenska -
        - -

        ¡Bienvenido a I2P!

        -

        Si acabas de iniciar I2P, al observar el menú de la izquierda, deberías notar que los números al lado de "Activos:" subirán en los próximos minutos y luego verás allí un Destino llamado "clientes diferentes" (si no, ¡mira abajo!)
        Apenas aparezca esto, puedes:

          diff --git a/installer/resources/readme/readme_fr.html b/installer/resources/readme/readme_fr.html index c73d6322f..4fa9ec2a0 100644 --- a/installer/resources/readme/readme_fr.html +++ b/installer/resources/readme/readme_fr.html @@ -1,20 +1,4 @@
          -
          -
          - English - عربية - 中文 - Deutsch - Français - Español - Português - Nederlands - Русский - Svenska -
          - -

          Bienvenu sur I2P!

          -

          Si vous venez juste de lancer I2P, les chiffres sur la gauche à coté de Active devraient commencer à augmenter dans les prochaines minutes et vous verrez un "Shared client" en destination locale listés sur la gauche (si non, voir plus bas). Une fois qu'ils apparaissent, vous pouvez:

            diff --git a/installer/resources/readme/readme_nl.html b/installer/resources/readme/readme_nl.html index f693c49c9..beb580c92 100644 --- a/installer/resources/readme/readme_nl.html +++ b/installer/resources/readme/readme_nl.html @@ -1,20 +1,4 @@
            -
            -
            - English - عربية - 中文 - Deutsch - Français - Español - Português - Nederlands - Русский - Svenska -
            - -

            Welkom op het Invisible Internet

            -
            • Opstarten…
              Als je zojuist I2P gestart hebt zal het nummer van Actieve Peers onder de Peers sectie in het linker zijpaneel toenemen binnen de komende minuten, tevens zal je een Lokale bestemming genaamd Gedeelde Clients zien, en mogelijk andere clients en servers, afhankelijk van de I2P configuratie (als dit niet het geval is, zie 'problemen oplossen' hier onder). Deze Lokale bestemmingen bieden verbindingen aan op verschillende poorten (en soms protocollen) naar het I2P netwerk waardoor diensten als BitTorrent, email, webproxy en andere diensten zullen werken. De Netwerk Database geeft een indicatie van alle bekende peers op het netwerk. Daarnaast kunnen bestaande Peer Connecties gemonitord worden en bestaande Tunnels en hun status worden bekeken. Meer informatie is beschikbaar op de hulp pagina.
              • diff --git a/installer/resources/readme/readme_pt.html b/installer/resources/readme/readme_pt.html index d79c5bd23..6522ea8a9 100644 --- a/installer/resources/readme/readme_pt.html +++ b/installer/resources/readme/readme_pt.html @@ -1,20 +1,4 @@
              -
              -
              - English - عربية - 中文 - Deutsch - Français - Español - Português - Nederlands - Русский - Svenska -
              - -

              Bem-vindo a I2P!

              -

              Se você acaba de iniciar I2P, os números à esquerda ao lado de "Active:" deberiam subir nos seguintes minutos e logo lá verá uma Destinação chamada "shared clients". (se não, veija embaixo!)
              Assim que apareça isto, você pode:

                diff --git a/installer/resources/readme/readme_ru.html b/installer/resources/readme/readme_ru.html index 64e9a1339..85ebd6ca1 100644 --- a/installer/resources/readme/readme_ru.html +++ b/installer/resources/readme/readme_ru.html @@ -1,20 +1,4 @@
                -
                -
                - English - عربية - 中文 - Deutsch - Français - Español - Português - Nederlands - Русский - Svenska -
                - -

                Добро пожаловать в Невидимый Интернет

                -
                • Начало…
                  Если вы только что запустили I2P, число Активных пиров, отображаемых под секцией Пиры на боковой панели должно начать увеличиваться через несколько минут, и вы так же увидите Локальный туннель с именем Коллективные Клиенты, и, возможно, другие клиентские и серверные туннели в зависимости от того, как настроен I2P (если нет, смотрите секцию по разрешению проблем ниже). Эти Локальные туннели предоставляют соединения на разных портах (и иногда разные протоколы) для сети I2P, позволяя функционировать вашим torrent, e-mail, прокси и другим сервисам. Ваша База данных сети I2P показывает всех известных роутеру пиров в сети. Больше информации доступно на странице помощи.
                • Сетевая интеграция
                  Когда вы впервые запускаете I2P, это может занять несколько минут, т.к. роутер выполняет процедуру начальной загрузки (bootstrap) для интеграции в сеть и поиска пиров для оптимизации интегрированности. Будте терпеливы. Когда I2P запускается, и во время нормальной работы, индикатор готовности к построению туннелей (прямо над секцией Локальные туннели на боковой панели) может показывать "Не принимаем туннели"; это нормальное поведение и не стоит слишком беспокоиться. Когда возле ваших Локальных туннелей загорятся зелёные звёздочки, вы сможете делать с I2P разнообразные вещи, и ниже мы представим вам некоторые из них.
                diff --git a/installer/resources/readme/readme_sv.html b/installer/resources/readme/readme_sv.html index b3bde98bf..64beb5882 100644 --- a/installer/resources/readme/readme_sv.html +++ b/installer/resources/readme/readme_sv.html @@ -1,20 +1,4 @@
                -
                -
                - English - عربية - 中文 - Deutsch - Français - Español - Português - Nederlands - Русский - Svenska -
                - -

                Welcome to I2P!

                -

                Om du just har startat I2P kommer de "Aktiva: #/#" börja öka inom några få minuter och du kommer se en destination kallad "delade diff --git a/installer/resources/readme/readme_zh.html b/installer/resources/readme/readme_zh.html index afdeaf472..bc083dc81 100644 --- a/installer/resources/readme/readme_zh.html +++ b/installer/resources/readme/readme_zh.html @@ -1,19 +1,4 @@

                -
                -
                - English - عربية - 中文 - Deutsch - Français - Español - Nederlands - Русский - Svenska -
                - -

                欢迎使用 I2P!

                -

                I2P 运行后的几分钟里控制台左侧的【活动节点】数量会逐渐增加， 在【本地目标】中出现【共享客户端】后，表示I2P已建立连接(没有出现？见 疑难解答)。 diff --git a/installer/resources/themes/console/classic/console.css b/installer/resources/themes/console/classic/console.css index 53f0a1b89..00a23c5f0 100644 --- a/installer/resources/themes/console/classic/console.css +++ b/installer/resources/themes/console/classic/console.css @@ -258,16 +258,6 @@ div.tunnels table{ margin-right: -2px; } -div.routersummary form { - margin-top: -6px !important; - margin-bottom: -4px !important; -} - -div.routersummary form:last-child { - padding-top: 3px !important; - margin-bottom: -10px !important; -} - div.refresh { margin-top: 10px !important; margin-bottom: 10px !important; diff --git a/installer/resources/themes/console/dark/console.css b/installer/resources/themes/console/dark/console.css index 9848617be..ecfc828ec 100644 --- a/installer/resources/themes/console/dark/console.css +++ b/installer/resources/themes/console/dark/console.css @@ -182,22 +182,14 @@ div.routersummary tr { border: 0 !important; } -div.routersummary form { - margin: -6px 0 -7px; -} - -div.routersummary form:first-child { - margin: 6px 0 -4px 0 !important; -} - div.routersummary p { padding: 0; } div.refresh { - margin-top: -10px !important; - margin-bottom: -4px !important; - padding: 2px 0 0px 0 !important; + margin-top: 10px !important; + margin-bottom: 10px !important; + padding: 2px 0 !important; } div.routersummary a:link, div.routersummary a:visited { @@ -838,7 +830,6 @@ input { font: bold 8pt "Lucida Sans Unicode", "Bitstream Vera Sans", Verdana, Tahoma, Helvetica, sans-serif; padding: 1px 2px; text-decoration: none; - min-width: 110px; border-radius: 4px; -moz-border-radius: 4px; -khtml-border-radius: 4px; @@ -918,8 +909,6 @@ textarea { border: 1px solid #494; } -form {} - .proxyfooter { margin: 0 20px 10px 240px; padding: 20px 25px 20px 75px; diff --git a/installer/resources/themes/console/light/console.css b/installer/resources/themes/console/light/console.css index 953d83e7e..41990b4b2 100644 --- a/installer/resources/themes/console/light/console.css +++ b/installer/resources/themes/console/light/console.css @@ -250,22 +250,13 @@ div.tunnels td, div.tunnels img:first-child { padding: 4px 0 !important; } -div.routersummary form { - margin: -6px 0 -5px 0; -} - -div.routersummary form:last-child { - margin: 6px 0 0 0 !important; - padding: 0; -} - div.routersummary p { padding: 0; } div.refresh { - margin-top: -6px !important; - margin-bottom: 0px !important; + margin-top: 10px !important; + margin-bottom: 10px !important; padding: 2px 0 0px 0 !important; } @@ -870,17 +861,6 @@ button:active{ opacity: 1 !important; } -input { - background: #ffe; - color: #316; - margin: 5px 10px 5px 10px; - padding: 4px 2px; - font: bold 8pt "Lucida Sans Unicode", "Bitstream Vera Sans", Verdana, Tahoma, Helvetica, sans-serif; - border: 1px solid #447; - text-decoration: none; - min-width: 110px; -} - input, input:visited { border: 1px outset #999; background: #ffe; @@ -889,7 +869,6 @@ input, input:visited { font: bold 8pt "Lucida Sans Unicode", "Bitstream Vera Sans", Verdana, Tahoma, Helvetica, sans-serif; padding: 1px 2px; text-decoration: none; - min-width: 110px; border-radius: 4px; -moz-border-radius: 4px; -khtml-border-radius: 4px; @@ -983,8 +962,6 @@ textarea:active { box-shadow: inset 0px 0px 0px 1px #f60; } -form {} - .proxyfooter { margin: 0 20px 10px 240px; padding: 20px 25px 20px 75px; diff --git a/installer/resources/themes/console/midnight/console.css b/installer/resources/themes/console/midnight/console.css index 2d08e4e0c..2bb77952e 100644 --- a/installer/resources/themes/console/midnight/console.css +++ b/installer/resources/themes/console/midnight/console.css @@ -280,16 +280,6 @@ div.tunnels table{ padding-right: 0; } -div.routersummary form { - margin-top: -8px !important; - margin-bottom: -8px !important; -} - -div.routersummary form:last-child { - padding-top: 3px !important; - margin-bottom: -10px !important; -} - div.refresh { margin-top: 10px !important; margin-bottom: 10px !important; diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 282c18b42..0725033fa 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,7 +18,7 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 2; + public final static long BUILD = 3; /** for example "-test" */ public final static String EXTRA = "";