Changeset 12c7871

Timestamp:

Feb 19, 2018 11:12:06 PM (2 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

b77524c

Parents:

88c7abe

Message:

i2ptunnel, systray: Replace hardcoded console URL in more places (ticket #2160)

Location:

apps

Files:

• i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java (modified) (3 diffs)
• i2ptunnel/java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java (modified) (2 diffs)
• systray/java/src/net/i2p/apps/systray/UrlLauncher.java (modified) (2 diffs)

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java

@@ -767 +767 @@
                                         Hash h2 = ConvertToHash.getHash(ahelperKey);
                                         if (h1 != null && h2 != null) {
-                                            // Do we need to replace http://127.0.0.1:7657
-                                            // Get the registered host and port from the PortMapper.
-                                            final String unset = "*unset*";
-                                            final String httpHost = _context.portMapper().getActualHost(PortMapper.SVC_CONSOLE, unset);
-                                            final String httpsHost = _context.portMapper().getActualHost(PortMapper.SVC_HTTPS_CONSOLE, unset);
-                                            final int httpPort = _context.portMapper().getPort(PortMapper.SVC_CONSOLE, 7657);
-                                            final int httpsPort = _context.portMapper().getPort(PortMapper.SVC_HTTPS_CONSOLE, -1);
-                                            final boolean httpsOnly = httpsPort > 0 && httpHost.equals(unset) && !httpsHost.equals(unset);
-                                            final int cport = httpsOnly ? httpsPort : httpPort;
-                                            String chost = httpsOnly ? httpsHost : httpHost;
-                                            if (chost.equals(unset))
-                                                chost = "127.0.0.1";
-                                            String chostport;
-                                            if (httpsOnly || cport != 7657 || !chost.equals("127.0.0.1"))
-                                                chostport = (httpsOnly ? "https://" : "http://") + chost + ':' + cport;
-                                            else
-                                                chostport = "http://127.0.0.1:7657";
+                                            String conURL = _context.portMapper().getConsoleURL();
                                             out.write(("\n<table class=\"conflict\"><tr><th align=\"center\">" +
                                                        "<a href=\"" + trustedURL + "\">").getBytes("UTF-8"));
@@ -793 +777 @@
                                                        "<a href=\"" + trustedURL + "\">" +
                                                        "<img src=\"" +
-                                                       chostport + "/imagegen/id?s=160&amp;c=" +
+                                                       conURL + "imagegen/id?s=160&amp;c=" +
                                                        h1.toBase64().replace("=", "%3d") +
                                                       "\" width=\"160\" height=\"160\"></a>\n").getBytes("UTF-8"));
@@ -799 +783 @@
                                                        "<a href=\"" + conflictURL + "\">" +
                                                        "<img src=\"" +
-                                                       chostport + "/imagegen/id?s=160&amp;c=" +
+                                                       conURL + "imagegen/id?s=160&amp;c=" +
                                                        h2.toBase64().replace("=", "%3d") +
                                                        "\" width=\"160\" height=\"160\"></a>\n").getBytes("UTF-8"));

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java

@@ -199 +199 @@
         else
             tbook = book;
+
+        String conURL = I2PAppContext.getGlobalContext().portMapper().getConsoleURL();
         out.write(("HTTP/1.1 200 OK\r\n"+
                   "Content-Type: text/html; charset=UTF-8\r\n"+
@@ -212 +214 @@
                   "</head><body>\n" +
                   "<div class=logo>\n" +
-                  "<a href=\"http://127.0.0.1:7657/\" title=\"" + _t("Router Console") + "\"><img src=\"http://proxy.i2p/themes/console/images/i2plogo.png\" alt=\"I2P Router Console\" border=\"0\"></a><hr>\n" +
-                  "<a href=\"http://127.0.0.1:7657/config\">" + _t("Configuration") + "</a> <a href=\"http://127.0.0.1:7657/help.jsp\">" + _t("Help") + "</a> <a href=\"http://127.0.0.1:7657/susidns/index\">" + _t("Addressbook") + "</a>\n" +
+                  "<a href=\"" + conURL + "\" title=\"" + _t("Router Console") + "\"><img src=\"http://proxy.i2p/themes/console/images/i2plogo.png\" alt=\"I2P Router Console\" border=\"0\"></a><hr>\n" +
+                  "<a href=\"" + conURL + "config\">" + _t("Configuration") + "</a> <a href=\"" + conURL + "help.jsp\">" + _t("Help") + "</a> <a href=\"" + conURL + "susidns/index\">" + _t("Addressbook") + "</a>\n" +
                   "</div>" +
                   "<div class=warning id=warning>\n" +

apps/systray/java/src/net/i2p/apps/systray/UrlLauncher.java

@@ -90 +90 @@
         _mgr = mgr;
         if (args == null || args.length <= 0)
-            args = new String[] {"http://127.0.0.1:7657/index.jsp"};
+            args = new String[] { context.portMapper().getConsoleURL() };
         _args = args;
         _shellCommand = new ShellCommand();
@@ -356 +356 @@
                 launcher.openUrl(args[0]);
             else
-                launcher.openUrl("http://127.0.0.1:7657/index.jsp");
+                launcher.openUrl(I2PAppContext.getGlobalContext().portMapper().getConsoleURL());
          } catch (IOException e) {}
     }