From 86b3b13d6f79448ac4d05070be8e8c69f3e649fc Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Tue, 20 Feb 2018 16:53:31 +0000
Subject: [PATCH] Console: Change all 302s to 303 or 307 Eepget: Handle 308

---
 apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java | 2 +-
 apps/routerconsole/jsp/dns.jsp                                  | 2 +-
 apps/routerconsole/jsp/graph.jsp                                | 2 +-
 apps/routerconsole/jsp/i2ptunnelmgr.jsp                         | 2 +-
 apps/routerconsole/jsp/index.jsp                                | 2 +-
 apps/routerconsole/jsp/torrents.jsp                             | 2 +-
 apps/routerconsole/jsp/webmail.jsp                              | 2 +-
 apps/susimail/src/src/i2p/susi/webmail/WebMail.java             | 2 +-
 core/java/src/net/i2p/util/EepGet.java                          | 1 +
 9 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
index ea6d12a94..499cccc8e 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
@@ -1368,7 +1368,7 @@ public class I2PSnarkServlet extends BasicServlet {
         if (p.length() > 0)
             buf.append(p.replace("&amp;", "&"));  // no you don't html escape the redirect header
         resp.setHeader("Location", buf.toString());
-        resp.sendError(302, "Moved");
+        resp.sendError(303, "Received");
     }
 
     /** @since 0.9 */
diff --git a/apps/routerconsole/jsp/dns.jsp b/apps/routerconsole/jsp/dns.jsp
index 5b7ce17aa..9ff978dd3 100644
--- a/apps/routerconsole/jsp/dns.jsp
+++ b/apps/routerconsole/jsp/dns.jsp
@@ -7,7 +7,7 @@
     // CSSHelper is also pulled in by css.jsi below...
     boolean testIFrame = tester.allowIFrame(request.getHeader("User-Agent"));
     if (!testIFrame) {
-        response.setStatus(302);
+        response.setStatus(307);
         response.setHeader("Location", "/susidns/index");
     } else {
 %>
diff --git a/apps/routerconsole/jsp/graph.jsp b/apps/routerconsole/jsp/graph.jsp
index 093971a5f..525505148 100644
--- a/apps/routerconsole/jsp/graph.jsp
+++ b/apps/routerconsole/jsp/graph.jsp
@@ -22,7 +22,7 @@
     String stat = request.getParameter("stat");
     if (stat == null) {
         // probably because restart or shutdown was clicked
-        response.setStatus(302);
+        response.setStatus(307);
         response.setHeader("Location", "/graphs");
         return;
     }
diff --git a/apps/routerconsole/jsp/i2ptunnelmgr.jsp b/apps/routerconsole/jsp/i2ptunnelmgr.jsp
index fcc9f2b24..8d50b6a38 100644
--- a/apps/routerconsole/jsp/i2ptunnelmgr.jsp
+++ b/apps/routerconsole/jsp/i2ptunnelmgr.jsp
@@ -7,7 +7,7 @@
     // CSSHelper is also pulled in by css.jsi below...
     boolean testIFrame = tester.allowIFrame(request.getHeader("User-Agent"));
     if (!testIFrame) {
-        response.setStatus(302);
+        response.setStatus(307);
         response.setHeader("Location", "/i2ptunnel/");
     } else {
 %>
diff --git a/apps/routerconsole/jsp/index.jsp b/apps/routerconsole/jsp/index.jsp
index 469730cd9..deb934338 100644
--- a/apps/routerconsole/jsp/index.jsp
+++ b/apps/routerconsole/jsp/index.jsp
@@ -5,7 +5,7 @@
     //  Redirect to either /home or /console, depending on configuration,
     //  while preserving any query parameters
     //
-    response.setStatus(302);
+    response.setStatus(307);
     String req = request.getRequestURL().toString();
     StringBuilder buf = new StringBuilder(128);
     if (req.endsWith("index"))
diff --git a/apps/routerconsole/jsp/torrents.jsp b/apps/routerconsole/jsp/torrents.jsp
index eaa9d408c..7026d1239 100644
--- a/apps/routerconsole/jsp/torrents.jsp
+++ b/apps/routerconsole/jsp/torrents.jsp
@@ -8,7 +8,7 @@
     boolean testIFrame = tester.allowIFrame(request.getHeader("User-Agent"));
     boolean embedApp = tester.embedApps();
     if (!testIFrame || !embedApp) {
-        response.setStatus(302);
+        response.setStatus(307);
         response.setHeader("Location", "/i2psnark/");
     } else {
 %>
diff --git a/apps/routerconsole/jsp/webmail.jsp b/apps/routerconsole/jsp/webmail.jsp
index 0b3be3a5d..9f00b2c94 100644
--- a/apps/routerconsole/jsp/webmail.jsp
+++ b/apps/routerconsole/jsp/webmail.jsp
@@ -8,7 +8,7 @@
     boolean testIFrame = tester.allowIFrame(request.getHeader("User-Agent"));
     boolean embedApp = tester.embedApps();
     if (!testIFrame || !embedApp) {
-        response.setStatus(302);
+        response.setStatus(307);
         response.setHeader("Location", "/susimail/susimail");
     } else {
 %>
diff --git a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
index 92cb0d155..b47f2b8e6 100644
--- a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
+++ b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
@@ -2287,7 +2287,7 @@ public class WebMail extends HttpServlet
 		if (q != null && q.length() > 0)
 			buf.append(q.replace("&amp;", "&"));  // no you don't html escape the redirect header
 		resp.setHeader("Location", buf.toString());
-		resp.sendError(302, "Moved");
+		resp.sendError(303, "Received");
 		Debug.debug(Debug.DEBUG, "P-R-G to " + q);
 	}
 
diff --git a/core/java/src/net/i2p/util/EepGet.java b/core/java/src/net/i2p/util/EepGet.java
index 1ecb8c479..4f3dc22ab 100644
--- a/core/java/src/net/i2p/util/EepGet.java
+++ b/core/java/src/net/i2p/util/EepGet.java
@@ -955,6 +955,7 @@ public class EepGet {
             case 302:
             case 303:
             case 307:
+            case 308:
                 _alreadyTransferred = 0;
                 rcOk = true;
                 redirect = true;