From a689fb09bbb18dcd34a8869aa31dc042bba0fc0a Mon Sep 17 00:00:00 2001 From: helmutm Date: Thu, 23 Aug 2007 13:28:15 +0000 Subject: [PATCH] work in progress: process upload of resources from loops.agent via HTTP PUT git-svn-id: svn://svn.cy55.de/Zope3/src/loops/trunk@1954 fd906abe-77d9-0310-91a1-e0d9ade77398 --- agent/testing/testing.cfg | 1 - agent/transport/base.py | 10 +++++++--- configure.zcml | 3 ++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/agent/testing/testing.cfg b/agent/testing/testing.cfg index 5a79029..133d2f6 100644 --- a/agent/testing/testing.cfg +++ b/agent/testing/testing.cfg @@ -4,4 +4,3 @@ crawl[0].pattern = '*.txt' crawl[0].transport = 'httpput' crawl[0].repeat = 0 transport.serverURL = 'http://localhost:8123/loops' -#transport.serverURL = 'http://localhost:12080/sites/testsite/resources/' diff --git a/agent/transport/base.py b/agent/transport/base.py index c20e263..67c4fbb 100644 --- a/agent/transport/base.py +++ b/agent/transport/base.py @@ -22,6 +22,7 @@ Transporter base classes. $Id$ """ +from base64 import b64encode from twisted.internet import reactor from twisted.internet.defer import Deferred, DeferredList, fail from twisted.web.client import getPage @@ -93,12 +94,15 @@ class Transporter(object): app = resource.application deferreds = [] metadata = resource.metadata + auth = b64encode(':'.join((self.userName, self.password))) + headers = {'Authorization': 'Basic ' + auth} if metadata is not None: url = self.makePath('.meta', app, path, 'xml') - deferreds.append( - getPage(url, method=self.method, postdata=metadata.asXML())) + deferreds.append(getPage(url, method=self.method, headers=headers, + postdata=metadata.asXML())) url = self.makePath('.data', app, path) - deferreds.append(getPage(url, method=self.method, postdata=text)) + deferreds.append(getPage(url, method=self.method, headers=headers, + postdata=text)) return DeferredList(deferreds, fireOnOneErrback=True) def makePath(self, infoType, app, path, extension=None): diff --git a/configure.zcml b/configure.zcml index d23634f..17fbe86 100644 --- a/configure.zcml +++ b/configure.zcml @@ -150,7 +150,8 @@ + interface="zope.app.container.interfaces.IReadContainer" + attributes="getLoopsRoot" />