libervia-web: src/server/server.py comparison

comparison src/server/server.py @ 1037:dc6c8c4d8ff6

server: redirection rework: - redirection parsing is now launched after LiberviaPages are imported, this way the pages are accessible and their methods are usable - inv_redirections attribute in LiberviaRootResource keep a map from new URL to old URL, allowing to check if a redirected path can lead to the same page - LiberviaPage methods are used to retrieve their URL - fixed remaining args when going to a redirected page - new checkRedirection method to see if a redirection can lead to the same URL

author	Goffi <goffi@goffi.org>
date	Wed, 24 Jan 2018 09:57:38 +0100
parents	34240d08f682
children	6b906b1f419a

comparison

equal deleted inserted replaced

-:f5661761b1b9
+:dc6c8c4d8ff6
 """Specialized resource for Libervia root
 handle redirections declared in sat.conf
 """
-def __init__(self, options, *args, **kwargs):
+def _initRedirections(self, options):
-"""
-@param options(dict): configuration options, same as Libervia.options
-"""
-super(LiberviaRootResource, self).__init__(*args, **kwargs)
 ## redirections
 self.redirections = {}
+self.inv_redirections = {}  # new URL to old URL map
 if options['url_redirections_dict'] and not options['url_redirections_profile']:
 # FIXME: url_redirections_profile should not be needed. It is currently used to
 #        redirect to an URL which associate the profile with the service, but this
 #        is not clean, and service should be explicitly specified
 raise ValueError(u"url_redirections_profile need to be filled if you want to use url_redirections_dict")
 for k,v in new['query_args'].iteritems():
 if isinstance(v, basestring):
 new['query_args'][k] = [v]
 elif 'path' in new_data:
 new = 'file:{}'.format(urllib.quote(new_data['path']))
-else:
+elif isinstance(new_data, basestring):
 new = new_data
 new_data = {}
+else:
+log.error(_(u"ignoring invalid redirection value: {new_data}").format(new_data=new_data))
+continue
 # some normalization
 if not old.strip():
 # root URL special case
 old = ''
 elif not old.startswith('/'):
-raise ValueError(u"redirected url must start with '/', got {}".format(old))
+log.error(_(u"redirected url must start with '/', got {value}. Ignoring").format(value=old))
+continue
 else:
 old = self._normalizeURL(old)
 if isinstance(new, dict):
 # dict are handled differently, they contain data
-# which are use dynamically when the request is done
+# which ared use dynamically when the request is done
 self.redirections[old] = new
 if not old:
-if new['type'] == 'page':
+if new[u'type'] == u'page':
-log.info(_(u"Root URL redirected to page {name}").format(name=new['page']))
+log.info(_(u"Root URL redirected to page {name}").format(name=new[u'page']))
+else:
+if new[u'type'] == u'page':
+page = LiberviaPage.getPageByName(new[u'page'])
+url = page.getURL(*new.get(u'path_args', []))
+self.inv_redirections[url] = old
 continue
-# at this point we have a rediction URL in new, we can parse it
+# at this point we have a redirection URL in new, we can parse it
 new_url = urlparse.urlsplit(new.encode('utf-8'))
 # we handle the known URL schemes
 if new_url.scheme == 'xmpp':
 # XMPP URI
 location = "/blog/{profile}/{item}".format(
 profile=quote(options['url_redirections_profile']),
 item = urllib.quote_plus(item),
 ).decode('utf-8')
 request_data = self._getRequestData(location)
+if old:
+self.inv_redirections[location] = old
 elif new_url.scheme in ('', 'http', 'https'):
 # direct redirection
 if new_url.netloc:
 raise NotImplementedError(u"netloc ({netloc}) is not implemented yet for url_redirections_dict, it is not possible to redirect to an external website".format(
 netloc = new_url.netloc))
 location = urlparse.urlunsplit(('', '', new_url.path, new_url.query, new_url.fragment)).decode('utf-8')
 request_data = self._getRequestData(location)
+if old:
+self.inv_redirections[location] = old
 elif new_url.scheme in ('file'):
 # file or directory
 if new_url.netloc:
 raise NotImplementedError(u"netloc ({netloc}) is not implemented for url redirection to file system, it is not possible to redirect to an external host".format(
 resource = web_resource.NoResource()
 current.putChild(segment, resource)
 current = resource
 resource_class = ProtectedFile if new_data.get('protected',True) else static.File
 current.putChild(last_segment, resource_class(path))
-log.debug(u"Added redirection from /{old} to file system path {path}".format(old=old.decode('utf-8'), path=path.decode('utf-8')))
+log.info(u"Added redirection from /{old} to file system path {path}".format(old=old.decode('utf-8'), path=path.decode('utf-8')))
 continue # we don't want to use redirection system, so we continue here
 else:
 raise NotImplementedError(u"{scheme}: scheme is not managed for url_redirections_dict".format(scheme=new_url.scheme))
 else:
 try:
 dummy, uri, dummy, dummy = request_data
 except ValueError:
 uri = u''
-log.warning(D_(u"recursive redirection, please fix this URL:\n{old} ==> {new}").format(
+log.error(D_(u"recursive redirection, please fix this URL:\n{old} ==> {new}").format(
 old=request.uri.decode('utf-8'),
 new=uri.decode('utf-8'),
 ))
 return web_resource.NoResource()
 log.debug(u"Redirecting URL {old} to {new}".format(
 old=request.uri.decode('utf-8'),
 new=uri.decode('utf-8'),
 ))
 # we change the request to reflect the new url
-request.postpath = path_list[1:]
+request.postpath = path_list[1:] + request.postpath
-request.uri = uri
+request.uri = '/'.join([uri] + request.postpath)
-request.path = path
+request.path = '/'.join([path] + request.postpath)
 request.args = args
 # we start again to look for a child with the new url
 return self.getChildWithDefault(path_list[0], request)
 def _namespacesGetEb(self, failure_):
 log.error(_(u"Can't get namespaces map: {msg}").format(msg=failure_))
 def backendReady(self, dummy):
-self.root = root = LiberviaRootResource(self.options, self.html_dir)
+self.root = root = LiberviaRootResource(self.html_dir)
 _register = Register(self)
 _upload_radiocol = UploadManagerRadioCol(self)
 _upload_avatar = UploadManagerAvatar(self)
 d = self.bridgeCall('namespacesGet')
 d.addCallback(self._namespacesGetCb)
 self.putChild('radiocol', ProtectedFile(_upload_radiocol.getTmpDir(), defaultType="audio/ogg"))  # FIXME: We cheat for PoC because we know we are on the same host, so we use directly upload dir
 # pyjamas tests, redirected only for dev versions
 if self.version[-1] == 'D':
 self.putChild('test', web_util.Redirect('/libervia_test.html'))
+# redirections
+root._initRedirections(self.options)
 server.Request.defaultContentType = 'text/html; charset=utf-8'
 wrapped = web_resource.EncodingResourceWrapper(root, [server.GzipEncoderFactory()])
 self.site = server.Site(wrapped)
 self.site.sessionFactory = LiberviaSession
 split_result.scheme.decode('utf-8') if scheme is None else scheme,
 split_result.netloc.decode('utf-8'),
 os.path.join(split_result.path, path),
 query, fragment))
+def checkRedirection(self, url):
+"""check is a part of the URL prefix is redirected then replace it
+@param url(unicode): url to check
+@return (unicode): possibly redirected URL which should link to the same location
+"""
+inv_redirections = self.root.inv_redirections
+url_parts = url.strip(u'/').split(u'/')
+for idx in xrange(len(url), 0, -1):
+test_url = u'/' + u'/'.join(url_parts[:idx])
+if test_url in inv_redirections:
+rem_url = url_parts[idx:]
+return u'/'.join([inv_redirections[test_url]] + rem_url)
+return url
 ## Sessions ##
 def purgeSession(self, request):
 """helper method to purge a session during request handling"""

Mercurial > libervia-web

comparison src/server/server.py @ 1037:dc6c8c4d8ff6