From ecf7b56a86bd69d62387d3f83dafaddff512c318 Mon Sep 17 00:00:00 2001 From: "P. Christeas" Date: Tue, 23 Nov 2010 20:50:11 +0200 Subject: doc webdav: install a dummy DAV handler at / , for Nautilus The gnome gvfs component falsely requires that / will serve PROPFIND requests. We reuse the static-http capability of the server (force activation rather than opt-in default behavior) and serve pseudo-DAV properties for the root. Conflicts: document_webdav/webdav_server.py bzr revid: p_christ@hol.gr-20101123185011-besih03q4gt2atps --- addons/document_webdav/webdav_server.py | 164 +++++++++++++++++++++++++++++++- 1 file changed, 162 insertions(+), 2 deletions(-) (limited to 'addons/document_webdav/webdav_server.py') diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py index 0e5973c95b3..5810978a6d5 100644 --- a/addons/document_webdav/webdav_server.py +++ b/addons/document_webdav/webdav_server.py @@ -2,6 +2,7 @@ # # Copyright P. Christeas 2008,2009 +# Copyright OpenERP SA, 2010 (http://www.openerp.com ) # # # WARNING: This program as such is intended to be used by professional @@ -27,17 +28,20 @@ ############################################################################### -import netsvc from dav_fs import openerp_dav_handler from tools.config import config from DAV.WebDAVServer import DAVRequestHandler +from service import http_server from service.websrv_lib import HTTPDir, FixSendError, HttpOptions from BaseHTTPServer import BaseHTTPRequestHandler import urlparse import urllib import re +import time from string import atoi -from DAV.errors import * +import addons +from DAV.errors import DAV_Error, DAV_Forbidden, DAV_NotFound +from DAV.propfind import PROPFIND # from DAV.constants import DAV_VERSION_1, DAV_VERSION_2 khtml_re = re.compile(r' KHTML/([0-9\.]+) ') @@ -273,6 +277,140 @@ class DAVAuthProvider(OpenERPAuthProvider): return True return OpenERPAuthProvider.authenticate(self, db, user, passwd, client_address) + +class dummy_dav_interface(object): + """ Dummy dav interface """ + verbose = True + + PROPS={"DAV:" : ('creationdate', + 'displayname', + 'getlastmodified', + 'resourcetype', + ), + } + + M_NS={"DAV:" : "_get_dav", } + + def __init__(self, parent): + self.parent = parent + + def get_propnames(self,uri): + return self.PROPS + + def get_prop(self,uri,ns,propname): + if self.M_NS.has_key(ns): + prefix=self.M_NS[ns] + else: + raise DAV_NotFound + mname=prefix+"_"+propname.replace('-', '_') + try: + m=getattr(self,mname) + r=m(uri) + return r + except AttributeError: + raise DAV_NotFound + + def get_data(self, uri, range=None): + raise DAV_NotFound + + def _get_dav_creationdate(self,uri): + return time.strftime("%Y-%m-%dT%H:%M:%SZ", time.gmtime()) + + def _get_dav_getlastmodified(self,uri): + return time.strftime("%a, %d %b %Y %H:%M:%S GMT", time.gmtime()) + + def _get_dav_displayname(self, uri): + return uri + + def _get_dav_resourcetype(self, uri): + return ('collection', 'DAV:') + + def exists(self, uri): + """ return 1 or None depending on if a resource exists """ + uri2 = uri.split('/') + if len(uri2) < 3: + return True + logging.getLogger('webdav').debug("Requested uri: %s", uri) + return None # no + + def is_collection(self, uri): + """ return 1 or None depending on if a resource is a collection """ + return None # no + +class DAVStaticHandler(http_server.StaticHTTPHandler): + """ A variant of the Static handler, which will serve dummy DAV requests + """ + verbose = False + protocol_version = 'HTTP/1.1' + _HTTP_OPTIONS= { 'DAV' : ['1', '2'], + 'Allow' : [ 'GET', 'HEAD', + 'PROPFIND', 'OPTIONS', 'REPORT', ] + } + + def send_body(self, content, code, message='OK', content_type='text/xml'): + self.send_response(int(code), message) + self.send_header("Content-Type", content_type) + # self.send_header('Connection', 'close') + self.send_header('Content-Length', len(content) or 0) + self.end_headers() + if hasattr(self, '_flush'): + self._flush() + + if self.command != 'HEAD': + self.wfile.write(content) + + def do_PROPFIND(self): + """Answer to PROPFIND with generic data. + + A rough copy of python-webdav's do_PROPFIND, but hacked to work + statically. + """ + + dc = dummy_dav_interface(self) + + # read the body containing the xml request + # iff there is no body then this is an ALLPROP request + body = None + if self.headers.has_key('Content-Length'): + l = self.headers['Content-Length'] + body = self.rfile.read(atoi(l)) + + path = self.path.rstrip('/') + uri = urllib.unquote(path) + + pf = PROPFIND(uri, dc, self.headers.get('Depth', 'infinity'), body) + + try: + DATA = '%s\n' % pf.createResponse() + except DAV_Error, (ec,dd): + return self.send_error(ec,dd) + except Exception: + self.log_exception("Cannot PROPFIND") + raise + + # work around MSIE DAV bug for creation and modified date + # taken from Resource.py @ Zope webdav + if (self.headers.get('User-Agent') == + 'Microsoft Data Access Internet Publishing Provider DAV 1.1'): + DATA = DATA.replace('', + '') + DATA = DATA.replace('', + '') + + self.send_body(DATA, '207','Multi-Status','Multiple responses') + + def not_get_baseuri(self): + baseuri = '/' + if self.headers.has_key('Host'): + uparts = list(urlparse.urlparse('/')) + uparts[1] = self.headers['Host'] + baseuri = urlparse.urlunparse(uparts) + return baseuri + + def get_davpath(self): + return '' + + try: if (config.get_misc('webdav','enable',True)): @@ -289,6 +427,28 @@ try: handler._config = conf reg_http_service(HTTPDir(directory,DAVHandler,DAVAuthProvider())) netsvc.Logger().notifyChannel('webdav', netsvc.LOG_INFO, "WebDAV service registered at path: %s/ "% directory) + + if not (config.get_misc('webdav', 'no_root_hack', False)): + # Now, replace the static http handler with the dav-enabled one. + # If a static-http service has been specified for our server, then + # read its configuration and use that dir_path. + # NOTE: this will _break_ any other service that would be registered + # at the root path in future. + base_path = False + if config.get_misc('static-http','enable', False): + base_path = config.get_misc('static-http', 'base_path', '/') + if base_path and base_path == '/': + dir_path = config.get_misc('static-http', 'dir_path', False) + else: + dir_path = addons.get_module_resource('document_webdav','public_html') + # an _ugly_ hack: we put that dir back in tools.config.misc, so that + # the StaticHttpHandler can find its dir_path. + config.misc.setdefault('static-http',{})['dir_path'] = dir_path + + if reg_http_service(HTTPDir('/', DAVStaticHandler)): + logging.getLogger("web-services").info("WebDAV registered HTTP dir %s for /" % \ + (dir_path)) + except Exception, e: logger = netsvc.Logger() logger.notifyChannel('webdav', netsvc.LOG_ERROR, 'Cannot launch webdav: %s' % e) -- cgit v1.2.3 From 8f2e8ff36fc3eb03b8cd28d5fc43be2dd69d6e76 Mon Sep 17 00:00:00 2001 From: "P. Christeas" Date: Tue, 23 Nov 2010 20:53:38 +0200 Subject: http-well-known: merge into the document_webdav module Since both "well-known" urls are about webdav[1], we can safely assume that the webdav module is needed when well-known uris are used. The code is much similar, too. http://www.iana.org/assignments/well-known-uris/well-known-uris.xhtml bzr revid: p_christ@hol.gr-20101123185338-az85yl7pbc9gf76z --- addons/document_webdav/webdav_server.py | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) (limited to 'addons/document_webdav/webdav_server.py') diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py index 5810978a6d5..f2a230858bf 100644 --- a/addons/document_webdav/webdav_server.py +++ b/addons/document_webdav/webdav_server.py @@ -1,5 +1,5 @@ # -*- encoding: utf-8 -*- - +############################################################################9 # # Copyright P. Christeas 2008,2009 # Copyright OpenERP SA, 2010 (http://www.openerp.com ) @@ -14,7 +14,7 @@ # # This program is Free Software; you can redistribute it and/or # modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 +# as published by the Free Software Foundation; either version 3 # of the License, or (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -43,6 +43,7 @@ import addons from DAV.errors import DAV_Error, DAV_Forbidden, DAV_NotFound from DAV.propfind import PROPFIND # from DAV.constants import DAV_VERSION_1, DAV_VERSION_2 +from redirect import RedirectHTTPHandler khtml_re = re.compile(r' KHTML/([0-9\.]+) ') @@ -453,6 +454,26 @@ except Exception, e: logger = netsvc.Logger() logger.notifyChannel('webdav', netsvc.LOG_ERROR, 'Cannot launch webdav: %s' % e) + +def init_well_known(): + reps = RedirectHTTPHandler.redirect_paths + + num_svcs = config.get_misc('http-well-known', 'num_services', '0') + + for nsv in range(1, int(num_svcs)+1): + uri = config.get_misc('http-well-known', 'service_%d' % nsv, False) + path = config.get_misc('http-well-known', 'path_%d' % nsv, False) + if not (uri and path): + continue + reps['/'+uri] = path + + if int(num_svcs): + if http_server.reg_http_service(HTTPDir('/.well-known', RedirectHTTPHandler)): + logging.getLogger("web-services").info("Registered HTTP redirect handler at /.well-known" ) + + +init_well_known() + #eof -- cgit v1.2.3 From 2bdc61232ecfb0fc7b55d48fd1eaaea8184f2d3a Mon Sep 17 00:00:00 2001 From: "P. Christeas" Date: Tue, 23 Nov 2010 20:53:43 +0200 Subject: doc webdav: principals redirect feature, for i-things iPhones etc. are preset to look into /principals/users/xx , so let's provide that path to them. bzr revid: p_christ@hol.gr-20101123185343-n1k1szxojdmcpekz --- addons/document_webdav/webdav_server.py | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) (limited to 'addons/document_webdav/webdav_server.py') diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py index f2a230858bf..3dae8f9f21f 100644 --- a/addons/document_webdav/webdav_server.py +++ b/addons/document_webdav/webdav_server.py @@ -471,9 +471,38 @@ def init_well_known(): if http_server.reg_http_service(HTTPDir('/.well-known', RedirectHTTPHandler)): logging.getLogger("web-services").info("Registered HTTP redirect handler at /.well-known" ) - init_well_known() +class PrincipalsRedirect(RedirectHTTPHandler): + redirect_paths = {} + + def _find_redirect(self): + for b, r in self.redirect_paths.items(): + if self.path.startswith(b): + return r + self.path[len(b):] + return False + +def init_principals_redirect(): + """ Some devices like the iPhone will look under /principals/users/xxx for + the user's properties. In OpenERP we _cannot_ have a stray /principals/... + working path, since we have a database path and the /webdav/ component. So, + the best solution is to redirect the url with 301. Luckily, it does work in + the device. The trick is that we need to hard-code the database to use, either + the one centrally defined in the config, or a "forced" one in the webdav + section. + """ + dbname = config.get_misc('webdav', 'principal_dbname', False) + if (not dbname) and not config.get_misc('webdav', 'no_principals_redirect', False): + dbname = config.get('db_name', False) + if dbname: + PrincipalsRedirect.redirect_paths[''] = '/webdav/%s/principals' % dbname + reg_http_service(HTTPDir('/principals', PrincipalsRedirect)) + logging.getLogger("web-services").info( + "Registered HTTP redirect handler for /principals to the %s db.", + dbname) + +init_principals_redirect() + #eof -- cgit v1.2.3 From 369d1d110b3e5715a3cc74e602539410785d6b7f Mon Sep 17 00:00:00 2001 From: "P. Christeas" Date: Tue, 23 Nov 2010 21:01:25 +0200 Subject: Doc_webdav: port logging to pythonic, not netsvc Having an allocated logging object may even speed up things. bzr revid: p_christ@hol.gr-20101123190125-0l951ev1h9dsu6lw --- addons/document_webdav/webdav_server.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'addons/document_webdav/webdav_server.py') diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py index 3dae8f9f21f..71402183893 100644 --- a/addons/document_webdav/webdav_server.py +++ b/addons/document_webdav/webdav_server.py @@ -28,6 +28,7 @@ ############################################################################### +import logging from dav_fs import openerp_dav_handler from tools.config import config from DAV.WebDAVServer import DAVRequestHandler @@ -63,6 +64,7 @@ def OpenDAVConfig(**kw): class DAVHandler(HttpOptions, FixSendError, DAVRequestHandler): verbose = False + _logger = logging.getLogger('webdav') protocol_version = 'HTTP/1.1' _HTTP_OPTIONS= { 'DAV' : ['1', '2'], 'Allow' : [ 'GET', 'HEAD', 'COPY', 'MOVE', 'POST', 'PUT', @@ -72,8 +74,9 @@ class DAVHandler(HttpOptions, FixSendError, DAVRequestHandler): def get_userinfo(self,user,pw): return False + def _log(self, message): - netsvc.Logger().notifyChannel("webdav",netsvc.LOG_DEBUG,message) + self._logger.debug(message) def handle(self): self._init_buffer() @@ -114,10 +117,10 @@ class DAVHandler(HttpOptions, FixSendError, DAVRequestHandler): return self.davpath def log_message(self, format, *args): - netsvc.Logger().notifyChannel('webdav', netsvc.LOG_DEBUG_RPC, format % args) + self._logger.log(netsvc.logging.DEBUG_RPC,format % args) def log_error(self, format, *args): - netsvc.Logger().notifyChannel('xmlrpc', netsvc.LOG_WARNING, format % args) + self._logger.warning(format % args) def _prep_OPTIONS(self, opts): ret = opts @@ -427,7 +430,7 @@ try: conf = OpenDAVConfig(**_dc) handler._config = conf reg_http_service(HTTPDir(directory,DAVHandler,DAVAuthProvider())) - netsvc.Logger().notifyChannel('webdav', netsvc.LOG_INFO, "WebDAV service registered at path: %s/ "% directory) + logging.getLogger('webdav').info("WebDAV service registered at path: %s/ "% directory) if not (config.get_misc('webdav', 'no_root_hack', False)): # Now, replace the static http handler with the dav-enabled one. @@ -451,8 +454,7 @@ try: (dir_path)) except Exception, e: - logger = netsvc.Logger() - logger.notifyChannel('webdav', netsvc.LOG_ERROR, 'Cannot launch webdav: %s' % e) + logging.getLogger('webdav').error('Cannot launch webdav: %s' % e) def init_well_known(): -- cgit v1.2.3