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

* i2ptunnel: Fix filtering of custom options

Browse Source
This commit is contained in:
zzz
2014-08-05 21:26:48 +00:00
parent fe3059f0ab
commit 0e9ceba057
5 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java
View File

@@ -17,6 +17,7 @@ import java.util.TreeMap;
import net.i2p.client.I2PClient; import net.i2p.client.I2PClient;
import net.i2p.crypto.SigType; import net.i2p.crypto.SigType;
import net.i2p.data.Base64; import net.i2p.data.Base64;
import net.i2p.data.DataHelper;
import net.i2p.data.Destination; import net.i2p.data.Destination;
import net.i2p.data.PrivateKeyFile; import net.i2p.data.PrivateKeyFile;
import net.i2p.data.Signature; import net.i2p.data.Signature;
@@ -452,7 +453,7 @@ public class EditBean extends IndexBean {
space = true; space = true;
buf.append(e.getKey()).append('=').append(e.getValue()); buf.append(e.getKey()).append('=').append(e.getValue());
} }
return buf.toString(); return DataHelper.escapeHTML(buf.toString());
} else { } else {
return ""; return "";
} }

2
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java
View File

@@ -728,7 +728,7 @@ public class IndexBean {
_tunnelBackupQuantity = (tunnelBackupQuantity != null ? tunnelBackupQuantity.trim() : null); _tunnelBackupQuantity = (tunnelBackupQuantity != null ? tunnelBackupQuantity.trim() : null);
} }
/** what I2P session overrides should be used */ /** what I2P session overrides should be used */
public void setCustomOptions(String customOptions) { public void setNofilter_customOptions(String customOptions) {
_customOptions = (customOptions != null ? customOptions.trim() : null); _customOptions = (customOptions != null ? customOptions.trim() : null);
} }
/** what HTTP outproxies should be used (httpclient specific) */ /** what HTTP outproxies should be used (httpclient specific) */

2
apps/i2ptunnel/jsp/editClient.jsp
View File

@@ -587,7 +587,7 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
<label for="customOptions" accesskey="u"> <label for="customOptions" accesskey="u">
<%=intl._("Custom options")%>(<span class="accessKey">u</span>): <%=intl._("Custom options")%>(<span class="accessKey">u</span>):
</label> </label>
<input type="text" id="customOptions" name="customOptions" size="60" title="Custom Options" value="<%=editBean.getCustomOptions(curTunnel)%>" class="freetext" /> <input type="text" id="customOptions" name="nofilter_customOptions" size="60" title="Custom Options" value="<%=editBean.getCustomOptions(curTunnel)%>" class="freetext" />
</div> </div>
<div class="footer"> <div class="footer">

2
apps/i2ptunnel/jsp/editServer.jsp
View File

@@ -611,7 +611,7 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
<label for="customOptions" accesskey="u"> <label for="customOptions" accesskey="u">
<%=intl._("Custom options")%>(<span class="accessKey">u</span>): <%=intl._("Custom options")%>(<span class="accessKey">u</span>):
</label> </label>
<input type="text" id="customOptions" name="customOptions" size="60" title="Custom Options" value="<%=editBean.getCustomOptions(curTunnel)%>" class="freetext" /> <input type="text" id="customOptions" name="nofilter_customOptions" size="60" title="Custom Options" value="<%=editBean.getCustomOptions(curTunnel)%>" class="freetext" />
</div> </div>
<div class="footer"> <div class="footer">

2
router/java/src/net/i2p/router/RouterVersion.java
View File

@@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */ /** deprecated */
public final static String ID = "Monotone"; public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION; public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 3; public final static long BUILD = 4;
/** for example "-test" */ /** for example "-test" */
public final static String EXTRA = "-rc"; public final static String EXTRA = "-rc";