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
This commit is contained in:
parent
0b77e833d5
commit
8f2e8ff36f
|
@ -30,7 +30,7 @@
|
||||||
|
|
||||||
{
|
{
|
||||||
"name" : "WebDAV server for Document Management",
|
"name" : "WebDAV server for Document Management",
|
||||||
"version" : "2.2",
|
"version" : "2.3",
|
||||||
"author" : "OpenERP SA",
|
"author" : "OpenERP SA",
|
||||||
"category" : "Generic Modules/Others",
|
"category" : "Generic Modules/Others",
|
||||||
"website": "http://www.openerp.com",
|
"website": "http://www.openerp.com",
|
||||||
|
@ -49,6 +49,9 @@
|
||||||
; since the messages are routed to the python logging, with
|
; since the messages are routed to the python logging, with
|
||||||
; levels "debug" and "debug_rpc" respectively, you can leave
|
; levels "debug" and "debug_rpc" respectively, you can leave
|
||||||
; these options on
|
; these options on
|
||||||
|
|
||||||
|
Also implements IETF RFC 5785 for services discovery on a http server,
|
||||||
|
which needs explicit configuration in openerp-server.conf, too.
|
||||||
""",
|
""",
|
||||||
"depends" : ["base", "document"],
|
"depends" : ["base", "document"],
|
||||||
"init_xml" : [],
|
"init_xml" : [],
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
# -*- encoding: utf-8 -*-
|
# -*- encoding: utf-8 -*-
|
||||||
|
############################################################################9
|
||||||
#
|
#
|
||||||
# Copyright P. Christeas <p_christ@hol.gr> 2008,2009
|
# Copyright P. Christeas <p_christ@hol.gr> 2008,2009
|
||||||
# Copyright OpenERP SA, 2010 (http://www.openerp.com )
|
# Copyright OpenERP SA, 2010 (http://www.openerp.com )
|
||||||
|
@ -14,7 +14,7 @@
|
||||||
#
|
#
|
||||||
# This program is Free Software; you can redistribute it and/or
|
# This program is Free Software; you can redistribute it and/or
|
||||||
# modify it under the terms of the GNU General Public License
|
# 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.
|
# of the License, or (at your option) any later version.
|
||||||
#
|
#
|
||||||
# This program is distributed in the hope that it will be useful,
|
# 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.errors import DAV_Error, DAV_Forbidden, DAV_NotFound
|
||||||
from DAV.propfind import PROPFIND
|
from DAV.propfind import PROPFIND
|
||||||
# from DAV.constants import DAV_VERSION_1, DAV_VERSION_2
|
# from DAV.constants import DAV_VERSION_1, DAV_VERSION_2
|
||||||
|
from redirect import RedirectHTTPHandler
|
||||||
|
|
||||||
khtml_re = re.compile(r' KHTML/([0-9\.]+) ')
|
khtml_re = re.compile(r' KHTML/([0-9\.]+) ')
|
||||||
|
|
||||||
|
@ -453,6 +454,26 @@ except Exception, e:
|
||||||
logger = netsvc.Logger()
|
logger = netsvc.Logger()
|
||||||
logger.notifyChannel('webdav', netsvc.LOG_ERROR, 'Cannot launch webdav: %s' % e)
|
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
|
#eof
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,46 +0,0 @@
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
##############################################################################
|
|
||||||
#
|
|
||||||
# OpenERP, Open Source Management Solution
|
|
||||||
# Copyright (C) 2010 OpenERP s.a. (<http://openerp.com>).
|
|
||||||
#
|
|
||||||
# This program is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU Affero General Public License 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,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# GNU Affero General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU Affero General Public License
|
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
#
|
|
||||||
##############################################################################
|
|
||||||
|
|
||||||
import logging
|
|
||||||
import tools
|
|
||||||
from service.websrv_lib import HTTPDir
|
|
||||||
from service.http_server import reg_http_service
|
|
||||||
from redirect import RedirectHTTPHandler
|
|
||||||
|
|
||||||
def init_well_known():
|
|
||||||
reps = RedirectHTTPHandler.redirect_paths
|
|
||||||
|
|
||||||
num_svcs = tools.config.get_misc('http-well-known', 'num_services', '0')
|
|
||||||
|
|
||||||
for nsv in range(1, int(num_svcs)+1):
|
|
||||||
uri = tools.config.get_misc('http-well-known', 'service_%d' % nsv, False)
|
|
||||||
path = tools.config.get_misc('http-well-known', 'path_%d' % nsv, False)
|
|
||||||
if not (uri and path):
|
|
||||||
continue
|
|
||||||
reps['/'+uri] = path
|
|
||||||
|
|
||||||
if reg_http_service(HTTPDir('/.well-known', RedirectHTTPHandler)):
|
|
||||||
logging.getLogger("web-services").info("Registered HTTP redirect handler at /.well-known" )
|
|
||||||
|
|
||||||
|
|
||||||
init_well_known()
|
|
||||||
|
|
||||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
|
|
@ -1,44 +0,0 @@
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
##############################################################################
|
|
||||||
#
|
|
||||||
# OpenERP, Open Source Management Solution
|
|
||||||
# Copyright (C) 2010 OpenERP s.a. (<http://openerp.com>).
|
|
||||||
#
|
|
||||||
# This program is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU Affero General Public License 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,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# GNU Affero General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU Affero General Public License
|
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
#
|
|
||||||
##############################################################################
|
|
||||||
|
|
||||||
|
|
||||||
{
|
|
||||||
"name" : "Publish well-known http URIs",
|
|
||||||
"version" : "0.1",
|
|
||||||
"depends" : [ "base", ],
|
|
||||||
'description': """
|
|
||||||
Implements IETF RFC 5785 for services discovery on a http server.
|
|
||||||
|
|
||||||
May help some CalDAV clients bootstrap from the OpenERP server.
|
|
||||||
|
|
||||||
Note that it needs explicit configuration in openerp-server.conf .
|
|
||||||
""",
|
|
||||||
"author" : "OpenERP SA",
|
|
||||||
'category': 'Generic Modules/Others',
|
|
||||||
'website': 'http://www.openerp.com',
|
|
||||||
"init_xml" : [ ],
|
|
||||||
"demo_xml" : [],
|
|
||||||
"update_xml" : [ ],
|
|
||||||
"installable" : True,
|
|
||||||
"active" : False,
|
|
||||||
}
|
|
||||||
|
|
||||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
|
Loading…
Reference in New Issue