From 82dd9435a35d01ccfbdafafeb93ac19043232fd3 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Wed, 13 May 2020 11:40:01 +0000
Subject: [PATCH] Console: Support stuffing form from params on /configreseed
 Fix HTML errors

---
 apps/routerconsole/jsp/configreseed.jsp | 46 +++++++++++++++++--------
 1 file changed, 32 insertions(+), 14 deletions(-)

diff --git a/apps/routerconsole/jsp/configreseed.jsp b/apps/routerconsole/jsp/configreseed.jsp
index e75301ab5..e6ad8dc94 100644
--- a/apps/routerconsole/jsp/configreseed.jsp
+++ b/apps/routerconsole/jsp/configreseed.jsp
@@ -18,6 +18,7 @@
 
 <p class="infohelp">
 <%=intl._t("Reseeding is the bootstrapping process used to find other routers when you first install I2P, or when your router has too few router references remaining.")%>
+</p>
 <ol><li>
 <%=intl._t("If reseeding has failed, you should first check your network connection.")%>
 </li><li>
@@ -52,45 +53,60 @@
 </li><li>
 <%=intl._t("See {0} for instructions on reseeding manually.", "<a href=\"https://geti2p.net/faq#manual_reseed\">" + intl._t("the FAQ") + "</a>")%>
 </li></ol>
-</p>
 <h3 class="tabletitle"><%=intl._t("Manual Reseed")%></h3>
+<form action="" method="POST">
+<input type="hidden" name="nonce" value="<%=pageNonce%>" >
 <table id="manualreseed" class="configtable">
  <tr>
   <td class="infohelp" colspan="2">
 <%=intl._t("The su3 format is preferred, as it will be verified as signed by a trusted source.")%>&nbsp;
 <%=intl._t("The zip format is unsigned; use a zip file only from a source that you trust.")%>
   </td>
- <tr>
+ <tr id="url">
   <th colspan="2"><%=intl._t("Reseed from URL")%></th>
  </tr>
  <tr>
-<form action="" method="POST">
-<input type="hidden" name="nonce" value="<%=pageNonce%>" >
   <td>
 <b><%=intl._t("Enter zip or su3 URL")%>:</b>
-<input name="url" type="text" size="60" value="" />
+<%
+   String url = request.getParameter("url");
+   String value = url != null ? "value=\"" + url + '"' : "";
+%>
+<input name="url" type="text" size="60" <%=value%> />
   </td>
   <td class="optionsave">
 <input type="submit" name="action" class="download" value="<%=intl._t("Reseed from URL")%>" />
   </td>
-</form>
  </tr>
- <tr>
+</table></form>
+
+<form action="" method="POST" enctype="multipart/form-data" accept-charset="UTF-8">
+<input type="hidden" name="nonce" value="<%=pageNonce%>" >
+<table id="manualreseed2" class="configtable">
+ <tr id="file">
   <th colspan="2"><%=intl._t("Reseed from File")%></th>
  </tr>
  <tr>
-<form action="" method="POST" enctype="multipart/form-data" accept-charset="UTF-8">
-<input type="hidden" name="nonce" value="<%=pageNonce%>" >
   <td>
 <b><%=intl._t("Select zip or su3 file")%>:</b>
+<%
+   String file = request.getParameter("file");
+   if (file != null) {
+%>
+<input type="text" size="60" name="file" value="<%=file%>">
+<%
+   } else {
+%>
 <input name="file" type="file" accept=".zip,.su3" value="" />
+<%
+   }
+%>
   </td>
   <td class="optionsave">
 <input type="submit" name="action" class="download" value="<%=intl._t("Reseed from file")%>" />
   </td>
-</form>
  </tr>
- <tr>
+ <tr id="create">
   <th colspan="2">
 <%=intl._t("Create Reseed File")%>
   </th>
@@ -101,14 +117,16 @@
 <%=intl._t("This file will never contain your own router's identity or IP.")%>
   </td>
  </tr>
+</table></form>
+
+<form action="/createreseed" method="GET">
+<table id="manualreseed3" class="configtable">
  <tr>
   <td class="optionsave" colspan="2">
-<form action="/createreseed" method="GET">
 <input type="submit" name="action" class="go" value="<%=intl._t("Create reseed file")%>" />
-</form>
   </td>
  </tr>
-</table>
+</table></form>
 
 <form action="" method="POST">
 <input type="hidden" name="nonce" value="<%=pageNonce%>" >