Changeset f6273a1


Ignore:
Timestamp:
May 5, 2018 10:32:43 PM (2 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
5f81a8de
Parents:
e14a4f0
Message:

SSL Wizard: Link fixes
Fix lost autostart config
Separate messages for bad SSL config vs. no SSL config

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • apps/i2ptunnel/jsp/ssl.jsp

    re14a4f0 rf6273a1  
    9090        String url = "://" + clientTgt + "\">" + clientTgt + "</a>";
    9191        if (sslToTarget)
    92             targetLink = "<a href=\"https" + url;
     92            targetLink = "<a target=\"_top\" href=\"https" + url;
    9393        else
    94             targetLink = "<a href=\"http" + url;
     94            targetLink = "<a target=\"_top\" href=\"http" + url;
    9595    }
    9696    net.i2p.util.PortMapper pm = ctx.portMapper();
     
    368368                    } else {
    369369                        //msgs.append("Unable to restart Jetty server\n");
    370                         msgs.append("You must start the Jetty server on <a href=\"/configclients\">the configure clients page</a>.\n");
     370                        msgs.append("You must start the Jetty server on <a target=\"_top\" href=\"/configclients\">the configure clients page</a>.\n");
    371371                    }
    372372                } else if (ok) {
    373373                    //msgs.append("Unable to restart Jetty server\n");
    374                     msgs.append("You must start the Jetty server on <a href=\"/configclients\">the configure clients page</a>.\n");
     374                    msgs.append("You must start the Jetty server on <a target=\"_top\" href=\"/configclients\">the configure clients page</a>.\n");
    375375                }
    376376
     
    457457                    if (editBean.isRejectUserAgents(curTunnel))
    458458                        editBean.setRejectUserAgents("");
     459                    if (editBean.startAutomatically(curTunnel))
     460                        editBean.setStartOnLoad("");
    459461                    editBean.setNonce(nonce);
    460462                    editBean.setAction("Save changes");
     
    514516<tr><th colspan="4"><%=intl._t("Incoming I2P Port Routing")%></th></tr>
    515517<tr><th><%=intl._t("Route From I2P Port")%></th><th><%=intl._t("With Virtual Host")%></th><th><%=intl._t("Via SSL?")%></th><th><%=intl._t("To Server Host:Port")%></th></tr>
    516 <tr><td><a href="http://<%=b32%>/"><%=intl._t("Default")%></a></td><td><%=name%></td><td><%=sslToTarget%></td><td><%=targetLink%></td></tr>
     518<tr><td><a target="_top" href="http://<%=b32%>/"><%=intl._t("Default")%></a></td><td><%=name%></td><td><%=sslToTarget%></td><td><%=targetLink%></td></tr>
    517519<%
    518520    // output vhost and targets
     
    536538                String url = "://" + tgt + "\">" + tgt + "</a>";
    537539                if (ssl)
    538                     tgt = "<a href=\"https" + url;
     540                    tgt = "<a target=\"_top\" href=\"https" + url;
    539541                else
    540                     tgt = "<a href=\"http" + url;
     542                    tgt = "<a target=\"_top\" href=\"http" + url;
    541543            }
    542544        } else {
     
    545547        String portTgt = sslPort ? "https" : "http";
    546548%>
    547 <tr><td><a href="<%=portTgt%>://<%=b32%>:<%=port%>/"><%=port%></a></td><td><%=spoof%></td><td><%=ssl%></td><td><%=tgt%></td></tr>
     549<tr><td><a target="_top" href="<%=portTgt%>://<%=b32%>:<%=port%>/"><%=port%></a></td><td><%=spoof%></td><td><%=ssl%></td><td><%=tgt%></td></tr>
    548550<%
    549551    }
     
    598600            boolean jettySSLFileInArgs = false;
    599601            boolean jettySSLFileExists = false;
     602            boolean jettySSLFileValid = false;
    600603            boolean jettySSLFilePWSet = false;
    601604            File jettyFile = null, jettySSLFile = null;
     
    651654            boolean ksExists = false;
    652655            if (jettySSLFile.exists()) {
     656                jettySSLFileExists = true;
    653657                try {
    654658                    org.eclipse.jetty.xml.XmlParser.Node root;
     
    673677                    final String DEFAULT_KMPW_2 = "OBF:1u2u1wml1z7s1z7a1wnl1u2g";
    674678                    if (ksArgs) {
    675                         jettySSLFileExists = true;
     679                        jettySSLFileValid = true;
    676680                        ksDflt = ksPW.equals(DEFAULT_KSPW_1) || ksPW.equals(DEFAULT_KSPW_2);
    677681                        kmDflt = kmPW.equals(DEFAULT_KMPW_1) || kmPW.equals(DEFAULT_KMPW_2);
     
    690694                }
    691695            }
    692             boolean canConfigure = jettySSLFileExists;
     696            boolean canConfigure = jettySSLFileExists && jettySSLFileValid;
    693697            boolean isEnabled = canConfigure && jettySSLFileInArgs && ksExists && ports.contains(Integer.valueOf(443));
    694698            boolean isPWDefault = kmDflt || !ksExists;
     
    705709    </td><td><%=start%></td><td><%=ssl%></td></tr>
    706710<%
    707             if (!canConfigure) {
    708 %>
    709 <tr><td colspan="4">Cannot configure, no Jetty SSL configuration template exists</td></tr>
    710 <%
     711            if (!jettySSLFileExists) {
     712%>
     713<tr><td colspan="4">Cannot configure, Jetty SSL configuration file does not exist: <%=jettySSLFile.toString()%></td></tr>
     714<%
     715            } else if (!jettySSLFileValid) {
     716%>
     717<tr><td colspan="4">Cannot configure, Jetty SSL configuration file is too old or invalid: <%=jettySSLFile.toString()%></td></tr>
     718<%
     719                if (error.length() > 0) {
     720%>
     721<tr><td colspan="4"><%=error%></td></tr>
     722<%
     723                }
    711724            } else {
    712725%>
     
    742755                } else {
    743756%>
    744 <b><%=intl._t("Password")%>:</b>
     757<b><%=intl._t("New Certificate Password")%>:</b>
    745758<input type="password" name="nofilter_keyPassword" title="<%=intl._t("Set password required to access this service")%>" value="" class="freetext password" />
    746759<%
  • history.txt

    re14a4f0 rf6273a1  
     12018-05-05 zzz
     2 * i2ptunnel:
     3   - Link to SSL wizard
     4   - Enable SSL to i2p hosts by default
     5 * Streaming: Don't send HTTP response on an HTTPS connection
     6
    172018-05-01 meeh
    28 * launchers:
     
    1420
    15212018-04-27 zzz
    16   * Tunnels: Fix and consolidate allow-zero-hop logic,
    17     prevent zero-hop client tunnels when no active peers
     22 * Tunnels: Fix and consolidate allow-zero-hop logic,
     23   prevent zero-hop client tunnels when no active peers
    1824
    19252018-04-24 meeh
    20   * Mac OS X launcher is still WIP, but:
    21     - Building the I2P.app bundle is mostly done
    22       - It copies certificates, locale and manuals
    23       - It copies jar and war files to the bundle
    24   * Added new entries to mtn-ignore so we avoid any PEBCAK with commiting build directories
    25   * Added an SBT AutoPlugin named IconHelper to generate valid ICNS images for Mac OS X
     26 * Mac OS X launcher is still WIP, but:
     27   - Building the I2P.app bundle is mostly done
     28     - It copies certificates, locale and manuals
     29     - It copies jar and war files to the bundle
     30 * Added new entries to mtn-ignore so we avoid any PEBCAK with commiting build directories
     31 * Added an SBT AutoPlugin named IconHelper to generate valid ICNS images for Mac OS X
    2632
    27332018-04-23 zzz
     
    3036
    31372018-04-23 meeh
    32   * Added launchers for Browser Bundle and Mac OS X
     38 * Added launchers for Browser Bundle and Mac OS X
    3339
    34402018-04-22 zzz
  • router/java/src/net/i2p/router/RouterVersion.java

    re14a4f0 rf6273a1  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 8;
     21    public final static long BUILD = 9;
    2222
    2323    /** for example "-test" */
Note: See TracChangeset for help on using the changeset viewer.