From 9cf1680587dbad588b3f8657b545c65e0aa601dc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Benoi=CC=82t=20Pin?= Date: Mon, 22 Jul 2013 14:50:32 +0200 Subject: [PATCH] =?utf8?q?Impl=C3=A9mentation=20du=20put=20webdav=20par=20?= =?utf8?q?m=C3=A9thode=20adhoc=20(put=5Fupload).=20Pour=20l'instant,=20l'i?= =?utf8?q?mpl=C3=A9mentation=20ne=20fait=20rien=20de=20plus=20que=20NullRe?= =?utf8?q?ssource.PUT.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- Folder.py | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) diff --git a/Folder.py b/Folder.py index 9a992f9..ce440f1 100644 --- a/Folder.py +++ b/Folder.py @@ -27,6 +27,7 @@ from OFS.CopySupport import CopyError, eNoData, _cb_decode, eInvalid, eNotFound, eNotSupported, sanity_check, cookie_path from App.Dialogs import MessageDialog from zExceptions import BadRequest +from zExceptions import Unauthorized import sys import warnings from cgi import escape @@ -66,6 +67,11 @@ from utils import Message as _ from utils import makeValidId from Globals import InitializeClass from AccessControl import ClassSecurityInfo +from ZServer import LARGE_FILE_THRESHOLD +from webdav.interfaces import IWriteLock +from webdav.common import Locked +from webdav.common import PreconditionFailed +from zope.contenttype import guess_content_type class PlinnFolder(CMFCatalogAware, PortalFolder, DefaultDublinCoreImpl) : @@ -289,7 +295,53 @@ class PlinnFolder(CMFCatalogAware, PortalFolder, DefaultDublinCoreImpl) : The default behavior (NullRessource.PUT + PortalFolder.PUT_factory) disallow files names with '_' at the begining. """ - pass + + self.dav__init(REQUEST, RESPONSE) + + fileName = REQUEST.getHeader('X-File-Name', '') + validId = makeValidId(self, fileName, allow_dup=True) + + ifhdr = REQUEST.get_header('If', '') + if self.wl_isLocked(): + if ifhdr: + self.dav__simpleifhandler(REQUEST, RESPONSE, col=1) + else: + raise Locked + elif ifhdr: + raise PreconditionFailed + + if int(REQUEST.get('CONTENT_LENGTH') or 0) > LARGE_FILE_THRESHOLD: + file = REQUEST['BODYFILE'] + body = file.read(LARGE_FILE_THRESHOLD) + file.seek(0) + else: + body = REQUEST.get('BODY', '') + + typ=REQUEST.get_header('content-type', None) + if typ is None: + typ, enc=guess_content_type(validId, body) + + ob = self.PUT_factory(validId, typ, body) + + # We call _verifyObjectPaste with verify_src=0, to see if the + # user can create this type of object (and we don't need to + # check the clipboard. + try: + self._verifyObjectPaste(ob.__of__(self), 0) + except CopyError: + sMsg = 'Unable to create object of class %s in %s: %s' % \ + (ob.__class__, repr(self), sys.exc_info()[1],) + raise Unauthorized, sMsg + + # Delegate actual PUT handling to the new object, + # SDS: But just *after* it has been stored. + self._setObject(validId, ob) + ob = self._getOb(validId) + ob.PUT(REQUEST, RESPONSE) + + RESPONSE.setStatus(201) + RESPONSE.setBody('') + return RESPONSE # ## overload to maintain ownership if authenticated user has 'Manage portal' permission -- 2.20.1