From 35a4446bf1d8b30dec71f835bdd97fc55cf68dca Mon Sep 17 00:00:00 2001 From: zzz Date: Tue, 20 May 2025 08:57:00 -0400 Subject: [PATCH] Console: Support params on /dns pass params to the iframe link directly to latest page from susidns bubble --- .../router/web/helpers/SummaryBarRenderer.java | 8 +++++++- apps/routerconsole/jsp/dns.jsp | 16 ++++++++++++---- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java index 8b6f605b3..fb94bf166 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java @@ -371,8 +371,14 @@ class SummaryBarRenderer { .append(_t("Manage your I2P hosts file here (I2P domain name resolution)")) .append("\">") .append(nbsp(tx)); - addBubble(rbuf, PortMapper.SVC_SUSIDNS); rbuf.append("\n"); + StringBuilder bbuf = new StringBuilder(128); + addBubble(bbuf, PortMapper.SVC_SUSIDNS); + if (bbuf.length() > 0) { + rbuf.append(""); + rbuf.append(bbuf); + rbuf.append("\n"); + } svcs.put(tx, rbuf.toString()); } diff --git a/apps/routerconsole/jsp/dns.jsp b/apps/routerconsole/jsp/dns.jsp index 062c715de..aa72a99b2 100644 --- a/apps/routerconsole/jsp/dns.jsp +++ b/apps/routerconsole/jsp/dns.jsp @@ -10,11 +10,19 @@ %> <% + // take /dns query params and pass to the iframe + String isrc; + String query = request.getQueryString(); + if (query != null) + isrc = "/susidns/addressbook?" + query; + else + isrc = "/susidns/index"; + // CSSHelper is also pulled in by css.jsi below... boolean testIFrame = tester.allowIFrame(request.getHeader("User-Agent")); if (!testIFrame) { response.setStatus(307); - response.setHeader("Location", "/susidns/index"); + response.setHeader("Location", isrc); // force commitment response.getOutputStream().close(); return; @@ -43,11 +51,11 @@ <%@include file="summary.jsi" %> -

<%=intl._t("I2P Address Book")%> ">images/newtab.png" />

+

<%=intl._t("I2P Address Book")%> ">images/newtab.png" />

-
<%