[freenet-cvs] r12607 - trunk/freenet/src/freenet/node/fcp

[nextg...@freenetproject.org]

Author: nextgens
Date: 2007-04-12 15:11:08 +0000 (Thu, 12 Apr 2007)
New Revision: 12607

Modified:
   trunk/freenet/src/freenet/node/fcp/ClientPut.java
Log:
Same thing for ClientPut: enforce testDDA... I'm not sure whether it ought to 
be done in ClientPutMessage as well or not.

Modified: trunk/freenet/src/freenet/node/fcp/ClientPut.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientPut.java   2007-04-12 14:38:38 UTC 
(rev 12606)
+++ trunk/freenet/src/freenet/node/fcp/ClientPut.java   2007-04-12 15:11:08 UTC 
(rev 12607)
@@ -89,6 +89,8 @@
                if(uploadFromType == ClientPutMessage.UPLOAD_FROM_DISK) {
                        if(!globalClient.core.allowUploadFrom(origFilename))
                                throw new NotAllowedException();
+                       else 
if(!globalClient.getConnection().allowDDAFrom(origFilename, false))
+                               throw new NotAllowedException();
                }
                logMINOR = Logger.shouldLog(Logger.MINOR, this);
                this.targetFilename = targetFilename;
@@ -143,6 +145,8 @@
                if(message.uploadFromType == ClientPutMessage.UPLOAD_FROM_DISK) 
{
                        
if(!handler.server.core.allowUploadFrom(message.origFilename))
                                throw new 
MessageInvalidException(ProtocolErrorMessage.ACCESS_DENIED, "Not allowed to 
upload from "+message.origFilename, identifier, global);
+                       else if(!handler.allowDDAFrom(message.origFilename, 
false))
+                               throw new 
MessageInvalidException(ProtocolErrorMessage.ACCESS_DENIED, "Not allowed to 
upload from "+message.origFilename+". Have you done a testDDA previously ?", 
identifier, global);
                }
                this.targetFilename = message.targetFilename;
                logMINOR = Logger.shouldLog(Logger.MINOR, this);