Author: nextgens
Date: 2006-04-11 11:51:15 +0000 (Tue, 11 Apr 2006)
New Revision: 8508
Modified:
trunk/freenet/src/freenet/clients/http/filter/ContentFilter.java
trunk/freenet/src/freenet/clients/http/filter/HTMLFilter.java
trunk/freenet/src/freenet/node/TextModeClientInterface.java
trunk/freenet/src/freenet/node/Version.java
Log:
629:
* Allow image/x-icon mime type in the content filter
* Extend javascript even detection in the content filter
* Fix a reporting bug in TMCI (reported by Caco_patane)
Modified: trunk/freenet/src/freenet/clients/http/filter/ContentFilter.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/ContentFilter.java
2006-04-11 10:37:57 UTC (rev 8507)
+++ trunk/freenet/src/freenet/clients/http/filter/ContentFilter.java
2006-04-11 11:51:15 UTC (rev 8508)
@@ -53,6 +53,13 @@
"PNG image - probably not dangerous but you
should wipe any comments or text blocks",
false, null, null));
+ // ICO - probably safe - FIXME check this out, write filters
+ register(new MIMEType("image/x-icon", "ico", new String[0], new
String[0],
+ true, false, null, null, false, false, false,
false, true, false,
+ "Icon file - probably not dangerous",
+ "Icon file - probably not dangerous but you
should wipe any comments",
+ false, null, null));
+
// PDF - very dangerous - FIXME ideally we would have a filter,
this is such a common format...
register(new MIMEType("application/pdf", "pdf", new String[] {
"application/x-pdf" }, new String[0],
false, false, null, null, true, true, true,
false, true, true,
Modified: trunk/freenet/src/freenet/clients/http/filter/HTMLFilter.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/HTMLFilter.java
2006-04-11 10:37:57 UTC (rev 8507)
+++ trunk/freenet/src/freenet/clients/http/filter/HTMLFilter.java
2006-04-11 11:51:15 UTC (rev 8508)
@@ -1398,7 +1398,21 @@
"onmouseout",
"onkeypress",
"onkeydown",
- "onkeyup" };
+ "onkeyup",
+ "onload",
+ "onfocus",
+ "onblur",
+ "oncontextmenu",
+ "onresize",
+ "onscroll",
+ "onunload",
+ "onmouseenter",
+ "onchange",
+ "onreset",
+ "onselect",
+ "onsubmit",
+ "onerror",
+ };
CoreTagVerifier(
String tag,
Modified: trunk/freenet/src/freenet/node/TextModeClientInterface.java
===================================================================
--- trunk/freenet/src/freenet/node/TextModeClientInterface.java 2006-04-11
10:37:57 UTC (rev 8507)
+++ trunk/freenet/src/freenet/node/TextModeClientInterface.java 2006-04-11
11:51:15 UTC (rev 8508)
@@ -471,7 +471,7 @@
String fixedInsertURI = insertURI.toString(false);
outsb.append("Note that you MUST add a filename to the end of
the above URLs e.g.:\r\n"+fixedInsertURI);
outsb.append("Normally you will then do PUTSSKDIR:<insert
URI>#<directory to upload>, for
example:\r\nPUTSSKDIR:"+fixedInsertURI+"#directoryToUpload/");
- outsb.append("This will then produce a manifest site containing
all the files, the default document can be accessed
at\r\n"+insertURI.addMetaStrings(new String[] { "" }).toString(false));
+ outsb.append("This will then produce a manifest site containing
all the files, the default document can be accessed
at\r\n"+key.getURI().toString(false)+"testsite/");
} else if(uline.startsWith("PUTSSK:")) {
String cmd = line.substring("PUTSSK:".length());
cmd = cmd.trim();
Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-04-11 10:37:57 UTC (rev
8507)
+++ trunk/freenet/src/freenet/node/Version.java 2006-04-11 11:51:15 UTC (rev
8508)
@@ -20,7 +20,7 @@
public static final String protocolVersion = "1.0";
/** The build number of the current revision */
- private static final int buildNumber = 628;
+ private static final int buildNumber = 629;
/** Oldest build of Fred we will talk to */
private static final int lastGoodBuild = 591;
