AGentooCat/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

switch Hostname Preview from a direct link to a JS copy function and a textarea. In the presence of noscript, hide the copy button

Browse Source
This commit is contained in:
idk
2021-03-11 21:17:07 -05:00
parent 831a9cebfa
commit 56db652ee8
3 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/i2ptunnel/jsp/headers.jsi
View File

@@ -6,7 +6,7 @@
request.setCharacterEncoding("UTF-8");
response.setHeader("X-Frame-Options", "SAMEORIGIN");
response.setHeader("Content-Security-Policy", "default-src 'self'; style-src 'self' 'unsafe-inline'; script-src 'none'; frame-ancestors 'self'; object-src 'none'; media-src 'none'");
response.setHeader("Content-Security-Policy", "default-src 'self'; style-src 'self' 'unsafe-inline'; script-src 'self'; frame-ancestors 'self'; object-src 'none'; media-src 'none'");
response.setHeader("X-XSS-Protection", "1; mode=block");
response.setHeader("X-Content-Type-Options", "nosniff");
response.setHeader("Referrer-Policy", "no-referrer");

20
apps/i2ptunnel/jsp/index.jsp
View File

@@ -15,6 +15,7 @@
<link href="/themes/console/images/favicon.ico" type="image/x-icon" rel="shortcut icon" />
<link href="<%=indexBean.getTheme()%>i2ptunnel.css?<%=net.i2p.CoreVersion.VERSION%>" rel="stylesheet" type="text/css" />
<script src="js/copy.js?<%=net.i2p.CoreVersion.VERSION%>" type="text/javascript"></script>
<noscript><style> .jsonly { display: none } </style></noscript>
</head><body id="tunnelListPage">
<div class="panel" id="overview"><h2><%=intl._t("Hidden Services Manager")%></h2><p>
<%=intl._t("These are the local services provided by your router.")%>
@@ -178,7 +179,7 @@
} // encName
%>
<tr>
<td class="tunnelDescription" colspan="3">
<td class="tunnelDescription" colspan="2">
<%
String descr = indexBean.getTunnelDescription(curServer);
if (descr != null && descr.length() > 0) {
@@ -197,7 +198,22 @@
if (("httpserver".equals(indexBean.getInternalType(curServer)) || ("httpbidirserver".equals(indexBean.getInternalType(curServer)))) && indexBean.getTunnelStatus(curServer) == IndexBean.RUNNING) {
if (name != null && !name.equals("") && name.endsWith(".i2p") ) {
%>
<a class="control tunnelPreviewHostname" title="<%=intl._t("Share your site using the hostname")%>" href="http://<%=indexBean.getSpoofedHost(curServer)%>/?i2paddresshelper=<%=indexBean.getDestHashBase32(curServer)%>" target="_top"><%=intl._t("Share Hostname")%></a>
<textarea wrap="off" class="tunnelPreviewHostname" title="<%=intl._t("Share your site using the hostname")%>">http://<%=indexBean.getSpoofedHost(curServer)%>/?i2paddresshelper=<%=indexBean.getDestHashBase32(curServer)%></textarea>
<%
}
} else {
// needed to make the spacing look right
%>&nbsp;
<%
}
%>
</td>
<td class="tunnelPreview" colspan="1">
<%
if (("httpserver".equals(indexBean.getInternalType(curServer)) || ("httpbidirserver".equals(indexBean.getInternalType(curServer)))) && indexBean.getTunnelStatus(curServer) == IndexBean.RUNNING) {
if (name != null && !name.equals("") && name.endsWith(".i2p") ) {
%>
<button class="jsonly control tunnelHostnameCopy tunnelPreview" title="<%=intl._t("Copy the hostname to the clipboard")%>"><%=intl._t("Copy Hostname")%></button>
<%
}
} else {

12
apps/i2ptunnel/jsp/themes/light/i2ptunnel.css
View File

@@ -583,15 +583,23 @@ html body#tunnelEditPage form div.panel table#serverTunnelEdit.tunnelConfig tbod
}
.tunnelPreview, .tunnelPort {
width: 15%;
min-width: 15%;
text-align: center;
}
.control.tunnelPreviewHostname {
.tunnelHostnameCopy {
margin-bottom: 1em !important;
margin-top: -1em !important;
}
.tunnelPreviewHostname {
margin-bottom: 1em !important;
margin-top: -1em !important;
width: 100%;
height: 1.5em;
overflow: hidden;
}
.tunnelLocation, .tunnelInterface {
width: 20%;
}