Author: toad
Date: 2007-03-24 19:02:16 +0000 (Sat, 24 Mar 2007)
New Revision: 12324
Modified:
trunk/freenet/src/freenet/clients/http/FProxyToadlet.java
trunk/freenet/src/freenet/clients/http/LocalFileInsertToadlet.java
trunk/freenet/src/freenet/clients/http/QueueToadlet.java
Log:
Allow access to queue, and uploading files from within the allowed directories
Modified: trunk/freenet/src/freenet/clients/http/FProxyToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/FProxyToadlet.java 2007-03-24
18:52:40 UTC (rev 12323)
+++ trunk/freenet/src/freenet/clients/http/FProxyToadlet.java 2007-03-24
19:02:16 UTC (rev 12324)
@@ -599,13 +599,13 @@
server.register(n2ntmToadlet, "/send_n2ntm/", true,
true);
QueueToadlet queueToadlet = new QueueToadlet(core,
core.getFCPServer(), client);
- server.register(queueToadlet, "/queue/", true, "Queue",
"manage queued requests", true);
+ server.register(queueToadlet, "/queue/", true, "Queue",
"manage queued requests", false);
StatisticsToadlet statisticsToadlet = new
StatisticsToadlet(node, core, client);
server.register(statisticsToadlet, "/stats/", true,
"Statistics", "view statistics", true);
LocalFileInsertToadlet localFileInsertToadlet = new
LocalFileInsertToadlet(core, client);
- server.register(localFileInsertToadlet, "/files/",
true, true);
+ server.register(localFileInsertToadlet, "/files/",
true, false);
BrowserTestToadlet browsertTestToadlet = new
BrowserTestToadlet(client, core);
server.register(browsertTestToadlet, "/test/", true,
false);
Modified: trunk/freenet/src/freenet/clients/http/LocalFileInsertToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/LocalFileInsertToadlet.java
2007-03-24 18:52:40 UTC (rev 12323)
+++ trunk/freenet/src/freenet/clients/http/LocalFileInsertToadlet.java
2007-03-24 19:02:16 UTC (rev 12324)
@@ -48,6 +48,12 @@
}
currentPath = new File(path).getCanonicalFile();
+
+ if(!core.allowUploadFrom(currentPath)) {
+ this.sendErrorPage(toadletContext, 403, "Forbidden",
"You cannot browse this directory");
+ return;
+ }
+
PageMaker pageMaker = toadletContext.getPageMaker();
HTMLNode pageNode = pageMaker.getPageNode("Listing of " +
currentPath.getAbsolutePath(), toadletContext);
Modified: trunk/freenet/src/freenet/clients/http/QueueToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/QueueToadlet.java 2007-03-24
18:52:40 UTC (rev 12323)
+++ trunk/freenet/src/freenet/clients/http/QueueToadlet.java 2007-03-24
19:02:16 UTC (rev 12324)
@@ -74,10 +74,6 @@
public void handlePost(URI uri, HTTPRequest request, ToadletContext
ctx) throws ToadletContextClosedException, IOException, RedirectException {
- if(ctx.isAllowedFullAccess()) {
- this.sendErrorPage(ctx, 403, "Forbidden", "You are not
allowed to access the queue");
- }
-
try {
// Browse... button
if (request.getPartAsString("insert-local",
128).length() > 0) {
@@ -317,10 +313,6 @@
public void handleGet(URI uri, final HTTPRequest request,
ToadletContext ctx)
throws ToadletContextClosedException, IOException, RedirectException {
- if(ctx.isAllowedFullAccess()) {
- this.sendErrorPage(ctx, 403, "Forbidden", "You are not
allowed to access the queue");
- }
-
// We ensure that we have a FCP server running
if(!fcp.enabled){
this.writeReply(ctx, 400, "text/plain", "FCP server is
missing", "You need to enable the FCP server to access this page");
