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

annotate src/server/server.py @ 926:612e33fd32a8

server (pages): fixed _prepare_render handling

author	Goffi <goffi@goffi.org>
date	Mon, 03 Apr 2017 01:00:29 +0200
parents	e00151140f77
children	bb4dfc2802c0

rev	line source
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1 #!/usr/bin/python
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	2 # -- coding: utf-8 --
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	3
339 2067d6241927 fixed docstrings wrong usage for licence informations Goffi <goffi@goffi.org> parents: 336 diff changeset	4 # Libervia: a Salut à Toi frontend
818 f8a7a046ff9c copyright update Goffi <goffi@goffi.org> parents: 817 diff changeset	5 # Copyright (C) 2011-2016 Jérôme Poisson <goffi@goffi.org>
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	6
339 2067d6241927 fixed docstrings wrong usage for licence informations Goffi <goffi@goffi.org> parents: 336 diff changeset	7 # This program is free software: you can redistribute it and/or modify
2067d6241927 fixed docstrings wrong usage for licence informations Goffi <goffi@goffi.org> parents: 336 diff changeset	8 # it under the terms of the GNU Affero General Public License as published by
2067d6241927 fixed docstrings wrong usage for licence informations Goffi <goffi@goffi.org> parents: 336 diff changeset	9 # the Free Software Foundation, either version 3 of the License, or
2067d6241927 fixed docstrings wrong usage for licence informations Goffi <goffi@goffi.org> parents: 336 diff changeset	10 # (at your option) any later version.
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	11
339 2067d6241927 fixed docstrings wrong usage for licence informations Goffi <goffi@goffi.org> parents: 336 diff changeset	12 # This program is distributed in the hope that it will be useful,
2067d6241927 fixed docstrings wrong usage for licence informations Goffi <goffi@goffi.org> parents: 336 diff changeset	13 # but WITHOUT ANY WARRANTY; without even the implied warranty of
2067d6241927 fixed docstrings wrong usage for licence informations Goffi <goffi@goffi.org> parents: 336 diff changeset	14 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2067d6241927 fixed docstrings wrong usage for licence informations Goffi <goffi@goffi.org> parents: 336 diff changeset	15 # GNU Affero General Public License for more details.
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	16
339 2067d6241927 fixed docstrings wrong usage for licence informations Goffi <goffi@goffi.org> parents: 336 diff changeset	17 # You should have received a copy of the GNU Affero General Public License
2067d6241927 fixed docstrings wrong usage for licence informations Goffi <goffi@goffi.org> parents: 336 diff changeset	18 # along with this program. If not, see <http://www.gnu.org/licenses/>.
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	19
444 b64e528fb524 server side: use of bridge's getReady to be sure that backend is initialised at launch Goffi <goffi@goffi.org> parents: 438 diff changeset	20 from twisted.application import service
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	21 from twisted.internet import reactor, defer
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	22 from twisted.web import server
858 7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	23 from twisted.web import static
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	24 from twisted.web import resource as web_resource
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	25 from twisted.web import util as web_util
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	26 from twisted.web import http
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	27 from twisted.python.components import registerAdapter
917 86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	28 from twisted.python import failure
750 8ac862f6e5b3 browser and server sides: allow to connect with a JID that is not registered on the local server souliane <souliane@mailoo.org> parents: 746 diff changeset	29 from twisted.words.protocols.jabber import jid
449 981ed669d3b3 /!\ reorganize all the file hierarchy, move the code and launching script to src: souliane <souliane@mailoo.org> parents: 448 diff changeset	30
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	31 from txjsonrpc.web import jsonrpc
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	32 from txjsonrpc import jsonrpclib
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	33
438 582c435dab6b server side: new log system is used Goffi <goffi@goffi.org> parents: 435 diff changeset	34 from sat.core.log import getLogger
582c435dab6b server side: new log system is used Goffi <goffi@goffi.org> parents: 435 diff changeset	35 log = getLogger(__name__)
914 0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	36 from sat_frontends.bridge.dbus_bridge import Bridge, BridgeExceptionNoService, const_TIMEOUT as BRIDGE_TIMEOUT
449 981ed669d3b3 /!\ reorganize all the file hierarchy, move the code and launching script to src: souliane <souliane@mailoo.org> parents: 448 diff changeset	37 from sat.core.i18n import _, D_
605 917e271975d9 server + browser side: implementation of new getEntitiesData bridge method + added a security check: only a white list of entities can be gotten Goffi <goffi@goffi.org> parents: 589 diff changeset	38 from sat.core import exceptions
682 e6bb64bd6b4d server side: implemented methods to get SàT and Libervia versions Goffi <goffi@goffi.org> parents: 679 diff changeset	39 from sat.tools import utils
914 0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	40 from sat.tools.common import regex
917 86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	41 from sat.tools.common import template
449 981ed669d3b3 /!\ reorganize all the file hierarchy, move the code and launching script to src: souliane <souliane@mailoo.org> parents: 448 diff changeset	42
415 fadbba1d793f server_side: added support for SSL and related parameters: souliane <souliane@mailoo.org> parents: 413 diff changeset	43 import re
fadbba1d793f server_side: added support for SSL and related parameters: souliane <souliane@mailoo.org> parents: 413 diff changeset	44 import glob
fadbba1d793f server_side: added support for SSL and related parameters: souliane <souliane@mailoo.org> parents: 413 diff changeset	45 import os.path
fadbba1d793f server_side: added support for SSL and related parameters: souliane <souliane@mailoo.org> parents: 413 diff changeset	46 import sys
fadbba1d793f server_side: added support for SSL and related parameters: souliane <souliane@mailoo.org> parents: 413 diff changeset	47 import tempfile
fadbba1d793f server_side: added support for SSL and related parameters: souliane <souliane@mailoo.org> parents: 413 diff changeset	48 import shutil
fadbba1d793f server_side: added support for SSL and related parameters: souliane <souliane@mailoo.org> parents: 413 diff changeset	49 import uuid
858 7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	50 import urlparse
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	51 import urllib
415 fadbba1d793f server_side: added support for SSL and related parameters: souliane <souliane@mailoo.org> parents: 413 diff changeset	52 from httplib import HTTPS_PORT
682 e6bb64bd6b4d server side: implemented methods to get SàT and Libervia versions Goffi <goffi@goffi.org> parents: 679 diff changeset	53 import libervia
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	54
415 fadbba1d793f server_side: added support for SSL and related parameters: souliane <souliane@mailoo.org> parents: 413 diff changeset	55 try:
fadbba1d793f server_side: added support for SSL and related parameters: souliane <souliane@mailoo.org> parents: 413 diff changeset	56 import OpenSSL
fadbba1d793f server_side: added support for SSL and related parameters: souliane <souliane@mailoo.org> parents: 413 diff changeset	57 from twisted.internet import ssl
813 6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	58 except ImportError:
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	59 ssl = None
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	60
449 981ed669d3b3 /!\ reorganize all the file hierarchy, move the code and launching script to src: souliane <souliane@mailoo.org> parents: 448 diff changeset	61 from libervia.server.constants import Const as C
981ed669d3b3 /!\ reorganize all the file hierarchy, move the code and launching script to src: souliane <souliane@mailoo.org> parents: 448 diff changeset	62 from libervia.server.blog import MicroBlog
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	63 from libervia.server import session_iface
449 981ed669d3b3 /!\ reorganize all the file hierarchy, move the code and launching script to src: souliane <souliane@mailoo.org> parents: 448 diff changeset	64
682 e6bb64bd6b4d server side: implemented methods to get SàT and Libervia versions Goffi <goffi@goffi.org> parents: 679 diff changeset	65
514 530c88c1deee server_side: plugin refactoring: Goffi <goffi@goffi.org> parents: 487 diff changeset	66 # following value are set from twisted.plugins.libervia_server initialise (see the comment there)
530c88c1deee server_side: plugin refactoring: Goffi <goffi@goffi.org> parents: 487 diff changeset	67 DATA_DIR_DEFAULT = OPT_PARAMETERS_BOTH = OPT_PARAMETERS_CFG = coerceDataDir = None
682 e6bb64bd6b4d server side: implemented methods to get SàT and Libervia versions Goffi <goffi@goffi.org> parents: 679 diff changeset	68
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	69
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	70
449 981ed669d3b3 /!\ reorganize all the file hierarchy, move the code and launching script to src: souliane <souliane@mailoo.org> parents: 448 diff changeset	71
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	72 class LiberviaSession(server.Session):
555 db1b330c1eb1 server_side: set the connection attempt timeout to the bridge timeout (2 minutes) souliane <souliane@mailoo.org> parents: 554 diff changeset	73 sessionTimeout = C.SESSION_TIMEOUT
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	74
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	75 def __init__(self, args, *kwargs):
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	76 self.__lock = False
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	77 server.Session.__init__(self, args, *kwargs)
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	78
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	79 def lock(self):
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	80 """Prevent session from expiring"""
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	81 self.__lock = True
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	82 self._expireCall.reset(sys.maxint)
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	83
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	84 def unlock(self):
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	85 """Allow session to expire again, and touch it"""
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	86 self.__lock = False
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	87 self.touch()
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	88
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	89 def touch(self):
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	90 if not self.__lock:
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	91 server.Session.touch(self)
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	92
451 1a0cec9b0f1e better PEP-8 compliance souliane <souliane@mailoo.org> parents: 449 diff changeset	93
858 7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	94 class ProtectedFile(static.File):
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	95 """A static.File class which doens't show directory listing"""
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	96
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	97 def directoryListing(self):
858 7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	98 return web_resource.NoResource()
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	99
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	100
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	101 class LiberviaRootResource(ProtectedFile):
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	102 """Specialized resource for Libervia root
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	103
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	104 handle redirections declared in sat.conf
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	105 """
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	106
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	107 def __init__(self, options, args, *kwargs):
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	108 """
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	109 @param options(dict): configuration options, same as Libervia.options
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	110 """
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	111 super(LiberviaRootResource, self).__init__(args, *kwargs)
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	112
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	113 ## redirections
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	114 self.redirections = {}
866 782ba105f5c7 reverted changeset f024fc5744d0 (there is already a default value) Goffi <goffi@goffi.org> parents: 865 diff changeset	115 if options['url_redirections_dict'] and not options['url_redirections_profile']:
858 7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	116 raise ValueError(u"url_redirections_profile need to be filled if you want to use url_redirections_dict")
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	117
875 d9b98b8a1847 server: handling of dict and "file:" urls in url_redirections_dict: Goffi <goffi@goffi.org> parents: 873 diff changeset	118 for old, new_data in options['url_redirections_dict'].iteritems():
d9b98b8a1847 server: handling of dict and "file:" urls in url_redirections_dict: Goffi <goffi@goffi.org> parents: 873 diff changeset	119 # new_data can be a dictionary or a unicode url
d9b98b8a1847 server: handling of dict and "file:" urls in url_redirections_dict: Goffi <goffi@goffi.org> parents: 873 diff changeset	120 if isinstance(new_data, dict):
d9b98b8a1847 server: handling of dict and "file:" urls in url_redirections_dict: Goffi <goffi@goffi.org> parents: 873 diff changeset	121 # new_data dict must contain either "url" or "path" key (exclusive)
d9b98b8a1847 server: handling of dict and "file:" urls in url_redirections_dict: Goffi <goffi@goffi.org> parents: 873 diff changeset	122 # if "path" is used, a file url is constructed with it
d9b98b8a1847 server: handling of dict and "file:" urls in url_redirections_dict: Goffi <goffi@goffi.org> parents: 873 diff changeset	123 try:
d9b98b8a1847 server: handling of dict and "file:" urls in url_redirections_dict: Goffi <goffi@goffi.org> parents: 873 diff changeset	124 new = new_data['url']
d9b98b8a1847 server: handling of dict and "file:" urls in url_redirections_dict: Goffi <goffi@goffi.org> parents: 873 diff changeset	125 except KeyError:
d9b98b8a1847 server: handling of dict and "file:" urls in url_redirections_dict: Goffi <goffi@goffi.org> parents: 873 diff changeset	126 try:
d9b98b8a1847 server: handling of dict and "file:" urls in url_redirections_dict: Goffi <goffi@goffi.org> parents: 873 diff changeset	127 path = new_data['path']
d9b98b8a1847 server: handling of dict and "file:" urls in url_redirections_dict: Goffi <goffi@goffi.org> parents: 873 diff changeset	128 except KeyError:
d9b98b8a1847 server: handling of dict and "file:" urls in url_redirections_dict: Goffi <goffi@goffi.org> parents: 873 diff changeset	129 raise ValueError(u'if you use a dict for url_redirections data, it must contain the "url" or a "file" key')
d9b98b8a1847 server: handling of dict and "file:" urls in url_redirections_dict: Goffi <goffi@goffi.org> parents: 873 diff changeset	130 else:
d9b98b8a1847 server: handling of dict and "file:" urls in url_redirections_dict: Goffi <goffi@goffi.org> parents: 873 diff changeset	131 new = 'file:{}'.format(urllib.quote(path))
d9b98b8a1847 server: handling of dict and "file:" urls in url_redirections_dict: Goffi <goffi@goffi.org> parents: 873 diff changeset	132 else:
d9b98b8a1847 server: handling of dict and "file:" urls in url_redirections_dict: Goffi <goffi@goffi.org> parents: 873 diff changeset	133 if 'path' in new_data:
d9b98b8a1847 server: handling of dict and "file:" urls in url_redirections_dict: Goffi <goffi@goffi.org> parents: 873 diff changeset	134 raise ValueError(u'You can\'t have "url" and "path" keys at the same time in url_redirections')
d9b98b8a1847 server: handling of dict and "file:" urls in url_redirections_dict: Goffi <goffi@goffi.org> parents: 873 diff changeset	135 else:
d9b98b8a1847 server: handling of dict and "file:" urls in url_redirections_dict: Goffi <goffi@goffi.org> parents: 873 diff changeset	136 new = new_data
d9b98b8a1847 server: handling of dict and "file:" urls in url_redirections_dict: Goffi <goffi@goffi.org> parents: 873 diff changeset	137 new_data = {}
d9b98b8a1847 server: handling of dict and "file:" urls in url_redirections_dict: Goffi <goffi@goffi.org> parents: 873 diff changeset	138
d9b98b8a1847 server: handling of dict and "file:" urls in url_redirections_dict: Goffi <goffi@goffi.org> parents: 873 diff changeset	139 # some normalization
862 e3e2effc9a4c server: LiberviaRootResource now manages root url redirection, and former redirection has been replaced by it: Goffi <goffi@goffi.org> parents: 859 diff changeset	140 if not old.strip():
e3e2effc9a4c server: LiberviaRootResource now manages root url redirection, and former redirection has been replaced by it: Goffi <goffi@goffi.org> parents: 859 diff changeset	141 # root URL special case
e3e2effc9a4c server: LiberviaRootResource now manages root url redirection, and former redirection has been replaced by it: Goffi <goffi@goffi.org> parents: 859 diff changeset	142 old = ''
e3e2effc9a4c server: LiberviaRootResource now manages root url redirection, and former redirection has been replaced by it: Goffi <goffi@goffi.org> parents: 859 diff changeset	143 elif not old.startswith('/'):
858 7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	144 raise ValueError(u"redirected url must start with '/', got {}".format(old))
862 e3e2effc9a4c server: LiberviaRootResource now manages root url redirection, and former redirection has been replaced by it: Goffi <goffi@goffi.org> parents: 859 diff changeset	145 else:
e3e2effc9a4c server: LiberviaRootResource now manages root url redirection, and former redirection has been replaced by it: Goffi <goffi@goffi.org> parents: 859 diff changeset	146 old = self._normalizeURL(old)
858 7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	147 new_url = urlparse.urlsplit(new.encode('utf-8'))
875 d9b98b8a1847 server: handling of dict and "file:" urls in url_redirections_dict: Goffi <goffi@goffi.org> parents: 873 diff changeset	148
d9b98b8a1847 server: handling of dict and "file:" urls in url_redirections_dict: Goffi <goffi@goffi.org> parents: 873 diff changeset	149 # we handle the known URL schemes
858 7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	150 if new_url.scheme == 'xmpp':
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	151 # XMPP URI
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	152 parsed_qs = urlparse.parse_qs(new_url.geturl())
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	153 try:
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	154 item = parsed_qs['item'][0]
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	155 if not item:
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	156 raise KeyError
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	157 except (IndexError, KeyError):
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	158 raise NotImplementedError(u"only item for PubSub URI is handled for the moment for url_redirections_dict")
858 7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	159 location = "/blog/{profile}/{item}".format(
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	160 profile=urllib.quote(options['url_redirections_profile'].encode('utf-8')),
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	161 item = urllib.quote_plus(item),
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	162 ).decode('utf-8')
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	163 request_data = self._getRequestData(location)
875 d9b98b8a1847 server: handling of dict and "file:" urls in url_redirections_dict: Goffi <goffi@goffi.org> parents: 873 diff changeset	164
858 7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	165 elif new_url.scheme in ('', 'http', 'https'):
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	166 # direct redirection
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	167 if new_url.netloc:
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	168 raise NotImplementedError(u"netloc ({netloc}) is not implemented yet for url_redirections_dict, it is not possible to redirect to an external website".format(
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	169 netloc = new_url.netloc))
867 12d0e7bd0dd1 server: fixed encoding issues on url redirection Goffi <goffi@goffi.org> parents: 866 diff changeset	170 location = urlparse.urlunsplit(('', '', new_url.path, new_url.query, new_url.fragment)).decode('utf-8')
858 7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	171 request_data = self._getRequestData(location)
875 d9b98b8a1847 server: handling of dict and "file:" urls in url_redirections_dict: Goffi <goffi@goffi.org> parents: 873 diff changeset	172
d9b98b8a1847 server: handling of dict and "file:" urls in url_redirections_dict: Goffi <goffi@goffi.org> parents: 873 diff changeset	173 elif new_url.scheme in ('file'):
d9b98b8a1847 server: handling of dict and "file:" urls in url_redirections_dict: Goffi <goffi@goffi.org> parents: 873 diff changeset	174 # file or directory
d9b98b8a1847 server: handling of dict and "file:" urls in url_redirections_dict: Goffi <goffi@goffi.org> parents: 873 diff changeset	175 if new_url.netloc:
d9b98b8a1847 server: handling of dict and "file:" urls in url_redirections_dict: Goffi <goffi@goffi.org> parents: 873 diff changeset	176 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(
d9b98b8a1847 server: handling of dict and "file:" urls in url_redirections_dict: Goffi <goffi@goffi.org> parents: 873 diff changeset	177 netloc = new_url.netloc))
d9b98b8a1847 server: handling of dict and "file:" urls in url_redirections_dict: Goffi <goffi@goffi.org> parents: 873 diff changeset	178 path = urllib.unquote(new_url.path)
d9b98b8a1847 server: handling of dict and "file:" urls in url_redirections_dict: Goffi <goffi@goffi.org> parents: 873 diff changeset	179 if not os.path.isabs(path):
d9b98b8a1847 server: handling of dict and "file:" urls in url_redirections_dict: Goffi <goffi@goffi.org> parents: 873 diff changeset	180 raise ValueError(u'file redirection must have an absolute path: e.g. file:/path/to/my/file')
d9b98b8a1847 server: handling of dict and "file:" urls in url_redirections_dict: Goffi <goffi@goffi.org> parents: 873 diff changeset	181 # for file redirection, we directly put child here
d9b98b8a1847 server: handling of dict and "file:" urls in url_redirections_dict: Goffi <goffi@goffi.org> parents: 873 diff changeset	182 segments, dummy, last_segment = old.rpartition('/')
d9b98b8a1847 server: handling of dict and "file:" urls in url_redirections_dict: Goffi <goffi@goffi.org> parents: 873 diff changeset	183 url_segments = segments.split('/') if segments else []
d9b98b8a1847 server: handling of dict and "file:" urls in url_redirections_dict: Goffi <goffi@goffi.org> parents: 873 diff changeset	184 current = self
d9b98b8a1847 server: handling of dict and "file:" urls in url_redirections_dict: Goffi <goffi@goffi.org> parents: 873 diff changeset	185 for segment in url_segments:
d9b98b8a1847 server: handling of dict and "file:" urls in url_redirections_dict: Goffi <goffi@goffi.org> parents: 873 diff changeset	186 resource = web_resource.NoResource()
d9b98b8a1847 server: handling of dict and "file:" urls in url_redirections_dict: Goffi <goffi@goffi.org> parents: 873 diff changeset	187 current.putChild(segment, resource)
d9b98b8a1847 server: handling of dict and "file:" urls in url_redirections_dict: Goffi <goffi@goffi.org> parents: 873 diff changeset	188 current = resource
d9b98b8a1847 server: handling of dict and "file:" urls in url_redirections_dict: Goffi <goffi@goffi.org> parents: 873 diff changeset	189 resource_class = ProtectedFile if new_data.get('protected',True) else static.File
d9b98b8a1847 server: handling of dict and "file:" urls in url_redirections_dict: Goffi <goffi@goffi.org> parents: 873 diff changeset	190 current.putChild(last_segment, resource_class(path))
d9b98b8a1847 server: handling of dict and "file:" urls in url_redirections_dict: Goffi <goffi@goffi.org> parents: 873 diff changeset	191 log.debug(u"Added redirection from /{old} to file system path {path}".format(old=old.decode('utf-8'), path=path.decode('utf-8')))
d9b98b8a1847 server: handling of dict and "file:" urls in url_redirections_dict: Goffi <goffi@goffi.org> parents: 873 diff changeset	192 continue # we don't want to use redirection system, so we continue here
d9b98b8a1847 server: handling of dict and "file:" urls in url_redirections_dict: Goffi <goffi@goffi.org> parents: 873 diff changeset	193
858 7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	194 else:
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	195 raise NotImplementedError(u"{scheme}: scheme is not managed for url_redirections_dict".format(scheme=new_url.scheme))
875 d9b98b8a1847 server: handling of dict and "file:" urls in url_redirections_dict: Goffi <goffi@goffi.org> parents: 873 diff changeset	196
858 7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	197 self.redirections[old] = request_data
862 e3e2effc9a4c server: LiberviaRootResource now manages root url redirection, and former redirection has been replaced by it: Goffi <goffi@goffi.org> parents: 859 diff changeset	198 if not old:
e3e2effc9a4c server: LiberviaRootResource now manages root url redirection, and former redirection has been replaced by it: Goffi <goffi@goffi.org> parents: 859 diff changeset	199 log.info(u"Root URL redirected to {uri}".format(uri=request_data[1].decode('utf-8')))
875 d9b98b8a1847 server: handling of dict and "file:" urls in url_redirections_dict: Goffi <goffi@goffi.org> parents: 873 diff changeset	200
d9b98b8a1847 server: handling of dict and "file:" urls in url_redirections_dict: Goffi <goffi@goffi.org> parents: 873 diff changeset	201 # no need to keep url_redirections*, they will not be used anymore
866 782ba105f5c7 reverted changeset f024fc5744d0 (there is already a default value) Goffi <goffi@goffi.org> parents: 865 diff changeset	202 del options['url_redirections_dict']
782ba105f5c7 reverted changeset f024fc5744d0 (there is already a default value) Goffi <goffi@goffi.org> parents: 865 diff changeset	203 del options['url_redirections_profile']
858 7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	204
875 d9b98b8a1847 server: handling of dict and "file:" urls in url_redirections_dict: Goffi <goffi@goffi.org> parents: 873 diff changeset	205 # the default root URL, if not redirected
862 e3e2effc9a4c server: LiberviaRootResource now manages root url redirection, and former redirection has been replaced by it: Goffi <goffi@goffi.org> parents: 859 diff changeset	206 if not '' in self.redirections:
e3e2effc9a4c server: LiberviaRootResource now manages root url redirection, and former redirection has been replaced by it: Goffi <goffi@goffi.org> parents: 859 diff changeset	207 self.redirections[''] = self._getRequestData(C.LIBERVIA_MAIN_PAGE)
e3e2effc9a4c server: LiberviaRootResource now manages root url redirection, and former redirection has been replaced by it: Goffi <goffi@goffi.org> parents: 859 diff changeset	208
858 7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	209 def _normalizeURL(self, url, lower=True):
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	210 """Return URL normalized for self.redirections dict
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	211
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	212 @param url(unicode): URL to normalize
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	213 @param lower(bool): lower case of url if True
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	214 @return (str): normalized URL
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	215 """
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	216 if lower:
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	217 url = url.lower()
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	218 return '/'.join((p for p in url.encode('utf-8').split('/') if p))
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	219
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	220 def _getRequestData(self, uri):
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	221 """Return data needed to redirect request
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	222
858 7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	223 @param url(unicode): destination url
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	224 @return (tuple(list[str], str, str, dict): tuple with
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	225 splitted path as in Request.postpath
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	226 uri as in Request.uri
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	227 path as in Request.path
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	228 args as in Request.args
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	229 """
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	230 uri = uri.encode('utf-8')
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	231 # XXX: we reuse code from twisted.web.http.py here
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	232 # as we need to have the same behaviour
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	233 x = uri.split(b'?', 1)
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	234
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	235 if len(x) == 1:
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	236 path = uri
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	237 args = {}
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	238 else:
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	239 path, argstring = x
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	240 args = http.parse_qs(argstring, 1)
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	241
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	242 # XXX: splitted path case must not be changed, as it may be significant
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	243 # (e.g. for blog items)
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	244 return self._normalizeURL(path, lower=False).split('/'), uri, path, args
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	245
862 e3e2effc9a4c server: LiberviaRootResource now manages root url redirection, and former redirection has been replaced by it: Goffi <goffi@goffi.org> parents: 859 diff changeset	246 def _redirect(self, request, request_data):
e3e2effc9a4c server: LiberviaRootResource now manages root url redirection, and former redirection has been replaced by it: Goffi <goffi@goffi.org> parents: 859 diff changeset	247 """Redirect an URL by rewritting request
e3e2effc9a4c server: LiberviaRootResource now manages root url redirection, and former redirection has been replaced by it: Goffi <goffi@goffi.org> parents: 859 diff changeset	248
e3e2effc9a4c server: LiberviaRootResource now manages root url redirection, and former redirection has been replaced by it: Goffi <goffi@goffi.org> parents: 859 diff changeset	249 this is NOT a HTTP redirection, but equivalent to URL rewritting
e3e2effc9a4c server: LiberviaRootResource now manages root url redirection, and former redirection has been replaced by it: Goffi <goffi@goffi.org> parents: 859 diff changeset	250 @param request(web.http.request): original request
e3e2effc9a4c server: LiberviaRootResource now manages root url redirection, and former redirection has been replaced by it: Goffi <goffi@goffi.org> parents: 859 diff changeset	251 @param request_data(tuple): data returned by self._getRequestData
e3e2effc9a4c server: LiberviaRootResource now manages root url redirection, and former redirection has been replaced by it: Goffi <goffi@goffi.org> parents: 859 diff changeset	252 @return (web_resource.Resource): resource to use
e3e2effc9a4c server: LiberviaRootResource now manages root url redirection, and former redirection has been replaced by it: Goffi <goffi@goffi.org> parents: 859 diff changeset	253 """
e3e2effc9a4c server: LiberviaRootResource now manages root url redirection, and former redirection has been replaced by it: Goffi <goffi@goffi.org> parents: 859 diff changeset	254 path_list, uri, path, args = request_data
e3e2effc9a4c server: LiberviaRootResource now manages root url redirection, and former redirection has been replaced by it: Goffi <goffi@goffi.org> parents: 859 diff changeset	255 try:
e3e2effc9a4c server: LiberviaRootResource now manages root url redirection, and former redirection has been replaced by it: Goffi <goffi@goffi.org> parents: 859 diff changeset	256 request._redirected
e3e2effc9a4c server: LiberviaRootResource now manages root url redirection, and former redirection has been replaced by it: Goffi <goffi@goffi.org> parents: 859 diff changeset	257 except AttributeError:
e3e2effc9a4c server: LiberviaRootResource now manages root url redirection, and former redirection has been replaced by it: Goffi <goffi@goffi.org> parents: 859 diff changeset	258 pass
e3e2effc9a4c server: LiberviaRootResource now manages root url redirection, and former redirection has been replaced by it: Goffi <goffi@goffi.org> parents: 859 diff changeset	259 else:
e3e2effc9a4c server: LiberviaRootResource now manages root url redirection, and former redirection has been replaced by it: Goffi <goffi@goffi.org> parents: 859 diff changeset	260 log.warning(D_(u"recursive redirection, please fix this URL:\n{old} ==> {new}").format(
867 12d0e7bd0dd1 server: fixed encoding issues on url redirection Goffi <goffi@goffi.org> parents: 866 diff changeset	261 old=request.uri.decode('utf-8'),
12d0e7bd0dd1 server: fixed encoding issues on url redirection Goffi <goffi@goffi.org> parents: 866 diff changeset	262 new=uri.decode('utf-8'),
862 e3e2effc9a4c server: LiberviaRootResource now manages root url redirection, and former redirection has been replaced by it: Goffi <goffi@goffi.org> parents: 859 diff changeset	263 ))
e3e2effc9a4c server: LiberviaRootResource now manages root url redirection, and former redirection has been replaced by it: Goffi <goffi@goffi.org> parents: 859 diff changeset	264 return web_resource.NoResource()
e3e2effc9a4c server: LiberviaRootResource now manages root url redirection, and former redirection has been replaced by it: Goffi <goffi@goffi.org> parents: 859 diff changeset	265 log.debug(u"Redirecting URL {old} to {new}".format(
867 12d0e7bd0dd1 server: fixed encoding issues on url redirection Goffi <goffi@goffi.org> parents: 866 diff changeset	266 old=request.uri.decode('utf-8'),
12d0e7bd0dd1 server: fixed encoding issues on url redirection Goffi <goffi@goffi.org> parents: 866 diff changeset	267 new=uri.decode('utf-8'),
862 e3e2effc9a4c server: LiberviaRootResource now manages root url redirection, and former redirection has been replaced by it: Goffi <goffi@goffi.org> parents: 859 diff changeset	268 ))
e3e2effc9a4c server: LiberviaRootResource now manages root url redirection, and former redirection has been replaced by it: Goffi <goffi@goffi.org> parents: 859 diff changeset	269 # we change the request to reflect the new url
e3e2effc9a4c server: LiberviaRootResource now manages root url redirection, and former redirection has been replaced by it: Goffi <goffi@goffi.org> parents: 859 diff changeset	270 request._redirected = True # here to avoid recursive redirections
e3e2effc9a4c server: LiberviaRootResource now manages root url redirection, and former redirection has been replaced by it: Goffi <goffi@goffi.org> parents: 859 diff changeset	271 request.postpath = path_list[1:]
e3e2effc9a4c server: LiberviaRootResource now manages root url redirection, and former redirection has been replaced by it: Goffi <goffi@goffi.org> parents: 859 diff changeset	272 request.uri = uri
e3e2effc9a4c server: LiberviaRootResource now manages root url redirection, and former redirection has been replaced by it: Goffi <goffi@goffi.org> parents: 859 diff changeset	273 request.path = path
e3e2effc9a4c server: LiberviaRootResource now manages root url redirection, and former redirection has been replaced by it: Goffi <goffi@goffi.org> parents: 859 diff changeset	274 request.args = args
e3e2effc9a4c server: LiberviaRootResource now manages root url redirection, and former redirection has been replaced by it: Goffi <goffi@goffi.org> parents: 859 diff changeset	275 # and we start again to look for a child with the new url
e3e2effc9a4c server: LiberviaRootResource now manages root url redirection, and former redirection has been replaced by it: Goffi <goffi@goffi.org> parents: 859 diff changeset	276 return self.getChildWithDefault(path_list[0], request)
e3e2effc9a4c server: LiberviaRootResource now manages root url redirection, and former redirection has been replaced by it: Goffi <goffi@goffi.org> parents: 859 diff changeset	277
e3e2effc9a4c server: LiberviaRootResource now manages root url redirection, and former redirection has been replaced by it: Goffi <goffi@goffi.org> parents: 859 diff changeset	278 def getChildWithDefault(self, name, request):
e3e2effc9a4c server: LiberviaRootResource now manages root url redirection, and former redirection has been replaced by it: Goffi <goffi@goffi.org> parents: 859 diff changeset	279 # XXX: this method is overriden only for root url
e3e2effc9a4c server: LiberviaRootResource now manages root url redirection, and former redirection has been replaced by it: Goffi <goffi@goffi.org> parents: 859 diff changeset	280 # which is the only ones who need to be handled before other children
e3e2effc9a4c server: LiberviaRootResource now manages root url redirection, and former redirection has been replaced by it: Goffi <goffi@goffi.org> parents: 859 diff changeset	281 if name == '' and not request.postpath:
e3e2effc9a4c server: LiberviaRootResource now manages root url redirection, and former redirection has been replaced by it: Goffi <goffi@goffi.org> parents: 859 diff changeset	282 return self._redirect(request, self.redirections[''])
e3e2effc9a4c server: LiberviaRootResource now manages root url redirection, and former redirection has been replaced by it: Goffi <goffi@goffi.org> parents: 859 diff changeset	283 return super(LiberviaRootResource, self).getChildWithDefault(name, request)
e3e2effc9a4c server: LiberviaRootResource now manages root url redirection, and former redirection has been replaced by it: Goffi <goffi@goffi.org> parents: 859 diff changeset	284
858 7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	285 def getChild(self, name, request):
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	286 resource = super(LiberviaRootResource, self).getChild(name, request)
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	287
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	288 if isinstance(resource, web_resource.NoResource):
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	289 # if nothing was found, we try our luck with redirections
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	290 # XXX: we want redirections to happen only if everything else failed
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	291 current_url = '/'.join([name] + request.postpath).lower()
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	292 try:
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	293 request_data = self.redirections[current_url]
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	294 except KeyError:
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	295 # no redirection for this url
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	296 pass
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	297 else:
862 e3e2effc9a4c server: LiberviaRootResource now manages root url redirection, and former redirection has been replaced by it: Goffi <goffi@goffi.org> parents: 859 diff changeset	298 return self._redirect(request, request_data)
858 7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	299
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	300 return resource
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	301
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	302 def createSimilarFile(self, path):
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	303 # XXX: this method need to be overriden to avoid recreating a LiberviaRootResource
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	304
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	305 f = LiberviaRootResource.__base__(path, self.defaultType, self.ignoredExts, self.registry)
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	306 # refactoring by steps, here - constructor should almost certainly take these
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	307 f.processors = self.processors
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	308 f.indexNames = self.indexNames[:]
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	309 f.childNotFound = self.childNotFound
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	310 return f
451 1a0cec9b0f1e better PEP-8 compliance souliane <souliane@mailoo.org> parents: 449 diff changeset	311
1a0cec9b0f1e better PEP-8 compliance souliane <souliane@mailoo.org> parents: 449 diff changeset	312
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	313 class JSONRPCMethodManager(jsonrpc.JSONRPC):
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	314
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	315 def __init__(self, sat_host):
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	316 jsonrpc.JSONRPC.__init__(self)
451 1a0cec9b0f1e better PEP-8 compliance souliane <souliane@mailoo.org> parents: 449 diff changeset	317 self.sat_host = sat_host
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	318
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	319 def asyncBridgeCall(self, method_name, args, *kwargs):
716 3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	320 """Call an asynchronous bridge method and return a deferred
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	321
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	322 @param method_name: name of the method as a unicode
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	323 @return: a deferred which trigger the result
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	324
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	325 """
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	326 d = defer.Deferred()
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	327
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	328 def _callback(*args):
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	329 if not args:
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	330 d.callback(None)
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	331 else:
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	332 if len(args) != 1:
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	333 Exception("Multiple return arguments not supported")
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	334 d.callback(args[0])
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	335
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	336 def _errback(result):
917 86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	337 d.errback(failure.Failure(jsonrpclib.Fault(C.ERRNUM_BRIDGE_ERRBACK, result.classname)))
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	338
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	339 kwargs["callback"] = _callback
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	340 kwargs["errback"] = _errback
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	341 getattr(self.sat_host.bridge, method_name)(args, *kwargs)
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	342 return d
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	343
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	344
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	345 class MethodHandler(JSONRPCMethodManager):
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	346
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	347 def __init__(self, sat_host):
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	348 JSONRPCMethodManager.__init__(self, sat_host)
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	349
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	350 def render(self, request):
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	351 self.session = request.getSession()
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	352 profile = session_iface.ISATSession(self.session).profile
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	353 if not profile:
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	354 #user is not identified, we return a jsonrpc fault
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	355 parsed = jsonrpclib.loads(request.content.read())
481 bbdc5357dc00 browser and server sides: refactor HTTP request result values + handle "NoReply" error souliane <souliane@mailoo.org> parents: 476 diff changeset	356 fault = jsonrpclib.Fault(C.ERRNUM_LIBERVIA, C.NOT_ALLOWED) # FIXME: define some standard error codes for libervia
482 437eefa53a01 misc: remove some pylint errors and warnings souliane <souliane@mailoo.org> parents: 481 diff changeset	357 return jsonrpc.JSONRPC._cbRender(self, fault, request, parsed.get('id'), parsed.get('jsonrpc')) # pylint: disable=E1103
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	358 return jsonrpc.JSONRPC.render(self, request)
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	359
682 e6bb64bd6b4d server side: implemented methods to get SàT and Libervia versions Goffi <goffi@goffi.org> parents: 679 diff changeset	360 def jsonrpc_getVersion(self):
e6bb64bd6b4d server side: implemented methods to get SàT and Libervia versions Goffi <goffi@goffi.org> parents: 679 diff changeset	361 """Return SàT version"""
e6bb64bd6b4d server side: implemented methods to get SàT and Libervia versions Goffi <goffi@goffi.org> parents: 679 diff changeset	362 try:
e6bb64bd6b4d server side: implemented methods to get SàT and Libervia versions Goffi <goffi@goffi.org> parents: 679 diff changeset	363 return self._version_cache
e6bb64bd6b4d server side: implemented methods to get SàT and Libervia versions Goffi <goffi@goffi.org> parents: 679 diff changeset	364 except AttributeError:
e6bb64bd6b4d server side: implemented methods to get SàT and Libervia versions Goffi <goffi@goffi.org> parents: 679 diff changeset	365 self._version_cache = self.sat_host.bridge.getVersion()
e6bb64bd6b4d server side: implemented methods to get SàT and Libervia versions Goffi <goffi@goffi.org> parents: 679 diff changeset	366 return self._version_cache
e6bb64bd6b4d server side: implemented methods to get SàT and Libervia versions Goffi <goffi@goffi.org> parents: 679 diff changeset	367
e6bb64bd6b4d server side: implemented methods to get SàT and Libervia versions Goffi <goffi@goffi.org> parents: 679 diff changeset	368 def jsonrpc_getLiberviaVersion(self):
e6bb64bd6b4d server side: implemented methods to get SàT and Libervia versions Goffi <goffi@goffi.org> parents: 679 diff changeset	369 """Return Libervia version"""
e6bb64bd6b4d server side: implemented methods to get SàT and Libervia versions Goffi <goffi@goffi.org> parents: 679 diff changeset	370 return self.sat_host.full_version
e6bb64bd6b4d server side: implemented methods to get SàT and Libervia versions Goffi <goffi@goffi.org> parents: 679 diff changeset	371
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	372 def jsonrpc_disconnect(self):
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	373 """Disconnect the profile"""
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	374 sat_session = session_iface.ISATSession(self.session)
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	375 profile = sat_session.profile
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	376 self.sat_host.bridge.disconnect(profile)
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	377
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	378 def jsonrpc_getContacts(self):
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	379 """Return all passed args."""
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	380 profile = session_iface.ISATSession(self.session).profile
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	381 return self.sat_host.bridge.getContacts(profile)
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	382
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	383 def jsonrpc_addContact(self, entity, name, groups):
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	384 """Subscribe to contact presence, and add it to the given groups"""
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	385 profile = session_iface.ISATSession(self.session).profile
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	386 self.sat_host.bridge.addContact(entity, profile)
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	387 self.sat_host.bridge.updateContact(entity, name, groups, profile)
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	388
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	389 def jsonrpc_delContact(self, entity):
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	390 """Remove contact from contacts list"""
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	391 profile = session_iface.ISATSession(self.session).profile
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	392 self.sat_host.bridge.delContact(entity, profile)
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	393
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	394 def jsonrpc_updateContact(self, entity, name, groups):
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	395 """Update contact's roster item"""
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	396 profile = session_iface.ISATSession(self.session).profile
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	397 self.sat_host.bridge.updateContact(entity, name, groups, profile)
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	398
623 4f7550a083b4 server and browser sides: fixes bad call to "subscription" bridge method souliane <souliane@mailoo.org> parents: 613 diff changeset	399 def jsonrpc_subscription(self, sub_type, entity):
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	400 """Confirm (or infirm) subscription,
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	401 and setup user roster in case of subscription"""
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	402 profile = session_iface.ISATSession(self.session).profile
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	403 self.sat_host.bridge.subscription(sub_type, entity, profile)
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	404
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	405 def jsonrpc_getWaitingSub(self):
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	406 """Return list of room already joined by user"""
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	407 profile = session_iface.ISATSession(self.session).profile
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	408 return self.sat_host.bridge.getWaitingSub(profile)
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	409
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	410 def jsonrpc_setStatus(self, presence, status):
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	411 """Change the presence and/or status
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	412 @param presence: value from ("", "chat", "away", "dnd", "xa")
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	413 @param status: any string to describe your status
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	414 """
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	415 profile = session_iface.ISATSession(self.session).profile
413 7a8991cda2fa browser_side: display presence with the highest priority souliane <souliane@mailoo.org> parents: 408 diff changeset	416 self.sat_host.bridge.setPresence('', presence, {'': status}, profile)
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	417
909 e8b133b77aa4 browser, server: update to get compatibility with 0.7-dev (not finished): Goffi <goffi@goffi.org> parents: 884 diff changeset	418 def jsonrpc_messageSend(self, to_jid, msg, subject, type_, extra={}):
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	419 """send message"""
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	420 profile = session_iface.ISATSession(self.session).profile
909 e8b133b77aa4 browser, server: update to get compatibility with 0.7-dev (not finished): Goffi <goffi@goffi.org> parents: 884 diff changeset	421 return self.asyncBridgeCall("messageSend", to_jid, msg, subject, type_, extra, profile)
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	422
716 3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	423 ## PubSub ##
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	424
921 cf527974a0fa both: renamed psDeleteNode to psNodeDelete to follow backend change Goffi <goffi@goffi.org> parents: 920 diff changeset	425 def jsonrpc_psNodeDelete(self, service, node):
716 3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	426 """Delete a whole node
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	427
716 3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	428 @param service (unicode): service jid
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	429 @param node (unicode): node to delete
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	430 """
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	431 profile = session_iface.ISATSession(self.session).profile
921 cf527974a0fa both: renamed psDeleteNode to psNodeDelete to follow backend change Goffi <goffi@goffi.org> parents: 920 diff changeset	432 return self.asyncBridgeCall("psNodeDelete", service, node, profile)
716 3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	433
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	434 # def jsonrpc_psRetractItem(self, service, node, item, notify):
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	435 # """Delete a whole node
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	436
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	437 # @param service (unicode): service jid
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	438 # @param node (unicode): node to delete
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	439 # @param items (iterable): id of item to retract
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	440 # @param notify (bool): True if notification is required
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	441 # """
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	442 # profile = session_iface.ISATSession(self.session).profile
716 3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	443 # return self.asyncBridgeCall("psRetractItem", service, node, item, notify, profile)
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	444
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	445 # def jsonrpc_psRetractItems(self, service, node, items, notify):
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	446 # """Delete a whole node
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	447
716 3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	448 # @param service (unicode): service jid
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	449 # @param node (unicode): node to delete
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	450 # @param items (iterable): ids of items to retract
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	451 # @param notify (bool): True if notification is required
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	452 # """
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	453 # profile = session_iface.ISATSession(self.session).profile
716 3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	454 # return self.asyncBridgeCall("psRetractItems", service, node, items, notify, profile)
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	455
716 3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	456 ## microblogging ##
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	457
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	458 def jsonrpc_mbSend(self, service, node, mb_data):
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	459 """Send microblog data
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	460
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	461 @param service (unicode): service jid or empty string to use profile's microblog
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	462 @param node (unicode): publishing node, or empty string to use microblog node
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	463 @param mb_data(dict): microblog data
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	464 @return: a deferred
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	465 """
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	466 profile = session_iface.ISATSession(self.session).profile
716 3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	467 return self.asyncBridgeCall("mbSend", service, node, mb_data, profile)
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	468
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	469 def jsonrpc_mbRetract(self, service, node, items):
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	470 """Delete a whole node
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	471
716 3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	472 @param service (unicode): service jid, empty string for PEP
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	473 @param node (unicode): node to delete, empty string for default node
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	474 @param items (iterable): ids of items to retract
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	475 """
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	476 profile = session_iface.ISATSession(self.session).profile
716 3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	477 return self.asyncBridgeCall("mbRetract", service, node, items, profile)
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	478
724 994be887e843 browser and server sides: bridge method mbGetLast has been renamed to mbGet and takes a new parameter "item_ids" souliane <souliane@mailoo.org> parents: 718 diff changeset	479 def jsonrpc_mbGet(self, service_jid, node, max_items, item_ids, extra):
716 3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	480 """Get last microblogs from publisher_jid
389 2d782349b88a server_side: display blog comments when you click on a main item header or title souliane <souliane@mailoo.org> parents: 381 diff changeset	481
716 3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	482 @param service_jid (unicode): pubsub service, usually publisher jid
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	483 @param node(unicode): mblogs node, or empty string to get the defaut one
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	484 @param max_items (int): maximum number of item to get or C.NO_LIMIT to get everything
724 994be887e843 browser and server sides: bridge method mbGetLast has been renamed to mbGet and takes a new parameter "item_ids" souliane <souliane@mailoo.org> parents: 718 diff changeset	485 @param item_ids (list[unicode]): list of item IDs
716 3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	486 @param rsm (dict): TODO
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	487 @return: a deferred couple with the list of items and metadatas.
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	488 """
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	489 profile = session_iface.ISATSession(self.session).profile
724 994be887e843 browser and server sides: bridge method mbGetLast has been renamed to mbGet and takes a new parameter "item_ids" souliane <souliane@mailoo.org> parents: 718 diff changeset	490 return self.asyncBridgeCall("mbGet", service_jid, node, max_items, item_ids, extra, profile)
389 2d782349b88a server_side: display blog comments when you click on a main item header or title souliane <souliane@mailoo.org> parents: 381 diff changeset	491
716 3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	492 def jsonrpc_mbGetFromMany(self, publishers_type, publishers, max_items, extra):
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	493 """Get many blog nodes at once
651 2df91d0308ac browser_side, server_side: MicroblogPanel.onGroupDrop and bridge method getMassiveLastMBlogs now only accepts the publishers as a set of unicode (no more None value or single unicode). souliane <souliane@mailoo.org> parents: 623 diff changeset	494
2df91d0308ac browser_side, server_side: MicroblogPanel.onGroupDrop and bridge method getMassiveLastMBlogs now only accepts the publishers as a set of unicode (no more None value or single unicode). souliane <souliane@mailoo.org> parents: 623 diff changeset	495 @param publishers_type (unicode): one of "ALL", "GROUP", "JID"
2df91d0308ac browser_side, server_side: MicroblogPanel.onGroupDrop and bridge method getMassiveLastMBlogs now only accepts the publishers as a set of unicode (no more None value or single unicode). souliane <souliane@mailoo.org> parents: 623 diff changeset	496 @param publishers (tuple(unicode)): tuple of publishers (empty list for all, list of groups or list of jids)
716 3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	497 @param max_items (int): maximum number of item to get or C.NO_LIMIT to get everything
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	498 @param extra (dict): TODO
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	499 @return (str): RT Deferred session id
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	500 """
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	501 profile = session_iface.ISATSession(self.session).profile
716 3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	502 return self.sat_host.bridge.mbGetFromMany(publishers_type, publishers, max_items, extra, profile)
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	503
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	504 def jsonrpc_mbGetFromManyRTResult(self, rt_session):
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	505 """Get results from RealTime mbGetFromMany session
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	506
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	507 @param rt_session (str): RT Deferred session id
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	508 """
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	509 profile = session_iface.ISATSession(self.session).profile
716 3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	510 return self.asyncBridgeCall("mbGetFromManyRTResult", rt_session, profile)
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	511
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	512 def jsonrpc_mbGetFromManyWithComments(self, publishers_type, publishers, max_items, max_comments, rsm_dict, rsm_comments_dict):
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	513 """Helper method to get the microblogs and their comments in one shot
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	514
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	515 @param publishers_type (str): type of the list of publishers (one of "GROUP" or "JID" or "ALL")
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	516 @param publishers (list): list of publishers, according to publishers_type (list of groups or list of jids)
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	517 @param max_items (int): optional limit on the number of retrieved items.
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	518 @param max_comments (int): maximum number of comments to retrieve
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	519 @param rsm_dict (dict): RSM data for initial items only
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	520 @param rsm_comments_dict (dict): RSM data for comments only
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	521 @param profile_key: profile key
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	522 @return (str): RT Deferred session id
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	523 """
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	524 profile = session_iface.ISATSession(self.session).profile
716 3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	525 return self.sat_host.bridge.mbGetFromManyWithComments(publishers_type, publishers, max_items, max_comments, rsm_dict, rsm_comments_dict, profile)
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	526
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	527 def jsonrpc_mbGetFromManyWithCommentsRTResult(self, rt_session):
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	528 """Get results from RealTime mbGetFromManyWithComments session
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	529
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	530 @param rt_session (str): RT Deferred session id
651 2df91d0308ac browser_side, server_side: MicroblogPanel.onGroupDrop and bridge method getMassiveLastMBlogs now only accepts the publishers as a set of unicode (no more None value or single unicode). souliane <souliane@mailoo.org> parents: 623 diff changeset	531 """
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	532 profile = session_iface.ISATSession(self.session).profile
716 3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	533 return self.asyncBridgeCall("mbGetFromManyWithCommentsRTResult", rt_session, profile)
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	534
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	535
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	536 # def jsonrpc_sendMblog(self, type_, dest, text, extra={}):
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	537 # """ Send microblog message
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	538 # @param type_ (unicode): one of "PUBLIC", "GROUP"
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	539 # @param dest (tuple(unicode)): recipient groups (ignored for "PUBLIC")
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	540 # @param text (unicode): microblog's text
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	541 # """
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	542 # profile = session_iface.ISATSession(self.session).profile
716 3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	543 # extra['allow_comments'] = 'True'
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	544
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	545 # if not type_: # auto-detect
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	546 # type_ = "PUBLIC" if dest == [] else "GROUP"
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	547
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	548 # if type_ in ("PUBLIC", "GROUP") and text:
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	549 # if type_ == "PUBLIC":
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	550 # #This text if for the public microblog
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	551 # log.debug("sending public blog")
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	552 # return self.sat_host.bridge.sendGroupBlog("PUBLIC", (), text, extra, profile)
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	553 # else:
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	554 # log.debug("sending group blog")
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	555 # dest = dest if isinstance(dest, list) else [dest]
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	556 # return self.sat_host.bridge.sendGroupBlog("GROUP", dest, text, extra, profile)
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	557 # else:
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	558 # raise Exception("Invalid data")
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	559
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	560 # def jsonrpc_deleteMblog(self, pub_data, comments):
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	561 # """Delete a microblog node
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	562 # @param pub_data: a tuple (service, comment node identifier, item identifier)
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	563 # @param comments: comments node identifier (for main item) or False
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	564 # """
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	565 # profile = session_iface.ISATSession(self.session).profile
716 3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	566 # return self.sat_host.bridge.deleteGroupBlog(pub_data, comments if comments else '', profile)
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	567
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	568 # def jsonrpc_updateMblog(self, pub_data, comments, message, extra={}):
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	569 # """Modify a microblog node
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	570 # @param pub_data: a tuple (service, comment node identifier, item identifier)
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	571 # @param comments: comments node identifier (for main item) or False
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	572 # @param message: new message
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	573 # @param extra: dict which option name as key, which can be:
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	574 # - allow_comments: True to accept an other level of comments, False else (default: False)
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	575 # - rich: if present, contain rich text in currently selected syntax
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	576 # """
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	577 # profile = session_iface.ISATSession(self.session).profile
716 3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	578 # if comments:
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	579 # extra['allow_comments'] = 'True'
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	580 # return self.sat_host.bridge.updateGroupBlog(pub_data, comments if comments else '', message, extra, profile)
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	581
716 3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	582 # def jsonrpc_sendMblogComment(self, node, text, extra={}):
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	583 # """ Send microblog message
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	584 # @param node: url of the comments node
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	585 # @param text: comment
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	586 # """
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	587 # profile = session_iface.ISATSession(self.session).profile
716 3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	588 # if node and text:
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	589 # return self.sat_host.bridge.sendGroupBlogComment(node, text, extra, profile)
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	590 # else:
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	591 # raise Exception("Invalid data")
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	592
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	593 # def jsonrpc_getMblogs(self, publisher_jid, item_ids, max_items=C.RSM_MAX_ITEMS):
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	594 # """Get specified microblogs posted by a contact
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	595 # @param publisher_jid: jid of the publisher
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	596 # @param item_ids: list of microblogs items IDs
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	597 # @return list of microblog data (dict)"""
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	598 # profile = session_iface.ISATSession(self.session).profile
716 3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	599 # d = self.asyncBridgeCall("getGroupBlogs", publisher_jid, item_ids, {'max_': unicode(max_items)}, False, profile)
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	600 # return d
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	601
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	602 # def jsonrpc_getMblogsWithComments(self, publisher_jid, item_ids, max_comments=C.RSM_MAX_COMMENTS):
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	603 # """Get specified microblogs posted by a contact and their comments
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	604 # @param publisher_jid: jid of the publisher
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	605 # @param item_ids: list of microblogs items IDs
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	606 # @return list of couple (microblog data, list of microblog data)"""
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	607 # profile = session_iface.ISATSession(self.session).profile
716 3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	608 # d = self.asyncBridgeCall("getGroupBlogsWithComments", publisher_jid, item_ids, {}, max_comments, profile)
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	609 # return d
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	610
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	611 # def jsonrpc_getMassiveMblogs(self, publishers_type, publishers, rsm=None):
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	612 # """Get lasts microblogs posted by several contacts at once
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	613
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	614 # @param publishers_type (unicode): one of "ALL", "GROUP", "JID"
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	615 # @param publishers (tuple(unicode)): tuple of publishers (empty list for all, list of groups or list of jids)
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	616 # @param rsm (dict): TODO
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	617 # @return: dict{unicode: list[dict])
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	618 # key: publisher's jid
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	619 # value: list of microblog data (dict)
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	620 # """
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	621 # profile = session_iface.ISATSession(self.session).profile
716 3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	622 # if rsm is None:
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	623 # rsm = {'max_': unicode(C.RSM_MAX_ITEMS)}
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	624 # d = self.asyncBridgeCall("getMassiveGroupBlogs", publishers_type, publishers, rsm, profile)
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	625 # self.sat_host.bridge.massiveSubscribeGroupBlogs(publishers_type, publishers, profile)
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	626 # return d
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	627
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	628 # def jsonrpc_getMblogComments(self, service, node, rsm=None):
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	629 # """Get all comments of given node
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	630 # @param service: jid of the service hosting the node
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	631 # @param node: comments node
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	632 # """
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	633 # profile = session_iface.ISATSession(self.session).profile
716 3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	634 # if rsm is None:
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	635 # rsm = {'max_': unicode(C.RSM_MAX_COMMENTS)}
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	636 # d = self.asyncBridgeCall("getGroupBlogComments", service, node, rsm, profile)
3b91225b457a server + browser side: blogging refactoring (draft), huge commit sorry: Goffi <goffi@goffi.org> parents: 710 diff changeset	637 # return d
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	638
427 b5b440e6ea16 server + browser side, getPresenceStatuses has been renamed Goffi <goffi@goffi.org> parents: 421 diff changeset	639 def jsonrpc_getPresenceStatuses(self):
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	640 """Get Presence information for connected contacts"""
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	641 profile = session_iface.ISATSession(self.session).profile
427 b5b440e6ea16 server + browser side, getPresenceStatuses has been renamed Goffi <goffi@goffi.org> parents: 421 diff changeset	642 return self.sat_host.bridge.getPresenceStatuses(profile)
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	643
914 0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	644 def jsonrpc_historyGet(self, from_jid, to_jid, size, between, search=''):
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	645 """Return history for the from_jid/to_jid couple"""
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	646 sat_session = session_iface.ISATSession(self.session)
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	647 profile = sat_session.profile
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	648 sat_jid = sat_session.jid
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	649 if not sat_jid:
589 a5019e62c3e9 browser side: big refactoring to base Libervia on QuickFrontend, first draft: Goffi <goffi@goffi.org> parents: 566 diff changeset	650 # we keep a session cache for jid to avoir jid spoofing
750 8ac862f6e5b3 browser and server sides: allow to connect with a JID that is not registered on the local server souliane <souliane@mailoo.org> parents: 746 diff changeset	651 sat_jid = sat_session.jid = jid.JID(self.sat_host.bridge.getParamA("JabberID", "Connection", profile_key=profile))
8ac862f6e5b3 browser and server sides: allow to connect with a JID that is not registered on the local server souliane <souliane@mailoo.org> parents: 746 diff changeset	652 if jid.JID(from_jid).userhost() != sat_jid.userhost() and jid.JID(to_jid).userhost() != sat_jid.userhost():
694 82123705474b massive (preventive) addition of 'u' (unicode) before the strings passed to logging functions souliane <souliane@mailoo.org> parents: 692 diff changeset	653 log.error(u"Trying to get history from a different jid (given (browser): {}, real (backend): {}), maybe a hack attempt ?".format(from_jid, sat_jid))
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	654 return {}
914 0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	655 d = self.asyncBridgeCall("historyGet", from_jid, to_jid, size, between, search, profile)
451 1a0cec9b0f1e better PEP-8 compliance souliane <souliane@mailoo.org> parents: 449 diff changeset	656
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	657 def show(result_dbus):
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	658 result = []
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	659 for line in result_dbus:
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	660 #XXX: we have to do this stupid thing because Python D-Bus use its own types instead of standard types
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	661 # and txJsonRPC doesn't accept D-Bus types, resulting in a empty query
914 0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	662 uuid, timestamp, from_jid, to_jid, message, subject, mess_type, extra = line
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	663 result.append((unicode(uuid), float(timestamp), unicode(from_jid), unicode(to_jid), dict(message), dict(subject), unicode(mess_type), dict(extra)))
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	664 return result
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	665 d.addCallback(show)
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	666 return d
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	667
909 e8b133b77aa4 browser, server: update to get compatibility with 0.7-dev (not finished): Goffi <goffi@goffi.org> parents: 884 diff changeset	668 def jsonrpc_mucJoin(self, room_jid, nick):
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	669 """Join a Multi-User Chat room
689 a6adefddcb0a browser and server side: complete changeset 669 (a8fddccf5b84) about joining MUC: souliane <souliane@mailoo.org> parents: 685 diff changeset	670
a6adefddcb0a browser and server side: complete changeset 669 (a8fddccf5b84) about joining MUC: souliane <souliane@mailoo.org> parents: 685 diff changeset	671 @param room_jid (unicode): room JID or empty string to generate a unique name
a6adefddcb0a browser and server side: complete changeset 669 (a8fddccf5b84) about joining MUC: souliane <souliane@mailoo.org> parents: 685 diff changeset	672 @param nick (unicode): user nick
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	673 """
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	674 profile = session_iface.ISATSession(self.session).profile
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	675 d = self.asyncBridgeCall("joinMUC", room_jid, nick, {}, profile)
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	676 return d
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	677
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	678 def jsonrpc_inviteMUC(self, contact_jid, room_jid):
689 a6adefddcb0a browser and server side: complete changeset 669 (a8fddccf5b84) about joining MUC: souliane <souliane@mailoo.org> parents: 685 diff changeset	679 """Invite a user to a Multi-User Chat room
a6adefddcb0a browser and server side: complete changeset 669 (a8fddccf5b84) about joining MUC: souliane <souliane@mailoo.org> parents: 685 diff changeset	680
a6adefddcb0a browser and server side: complete changeset 669 (a8fddccf5b84) about joining MUC: souliane <souliane@mailoo.org> parents: 685 diff changeset	681 @param contact_jid (unicode): contact to invite
a6adefddcb0a browser and server side: complete changeset 669 (a8fddccf5b84) about joining MUC: souliane <souliane@mailoo.org> parents: 685 diff changeset	682 @param room_jid (unicode): room JID or empty string to generate a unique name
a6adefddcb0a browser and server side: complete changeset 669 (a8fddccf5b84) about joining MUC: souliane <souliane@mailoo.org> parents: 685 diff changeset	683 """
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	684 profile = session_iface.ISATSession(self.session).profile
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	685 room_id = room_jid.split("@")[0]
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	686 service = room_jid.split("@")[1]
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	687 self.sat_host.bridge.inviteMUC(contact_jid, service, room_id, {}, profile)
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	688
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	689 def jsonrpc_mucLeave(self, room_jid):
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	690 """Quit a Multi-User Chat room"""
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	691 profile = session_iface.ISATSession(self.session).profile
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	692 try:
750 8ac862f6e5b3 browser and server sides: allow to connect with a JID that is not registered on the local server souliane <souliane@mailoo.org> parents: 746 diff changeset	693 room_jid = jid.JID(room_jid)
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	694 except:
438 582c435dab6b server side: new log system is used Goffi <goffi@goffi.org> parents: 435 diff changeset	695 log.warning('Invalid room jid')
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	696 return
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	697 self.sat_host.bridge.mucLeave(room_jid.userhost(), profile)
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	698
909 e8b133b77aa4 browser, server: update to get compatibility with 0.7-dev (not finished): Goffi <goffi@goffi.org> parents: 884 diff changeset	699 def jsonrpc_mucGetRoomsJoined(self):
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	700 """Return list of room already joined by user"""
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	701 profile = session_iface.ISATSession(self.session).profile
909 e8b133b77aa4 browser, server: update to get compatibility with 0.7-dev (not finished): Goffi <goffi@goffi.org> parents: 884 diff changeset	702 return self.sat_host.bridge.mucGetRoomsJoined(profile)
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	703
909 e8b133b77aa4 browser, server: update to get compatibility with 0.7-dev (not finished): Goffi <goffi@goffi.org> parents: 884 diff changeset	704 def jsonrpc_mucGetDefaultService(self):
692 7a9c7b9f6a28 browser_side: use host.default_muc instead of C.DEFAULT_MUC souliane <souliane@mailoo.org> parents: 689 diff changeset	705 """@return: the default MUC"""
909 e8b133b77aa4 browser, server: update to get compatibility with 0.7-dev (not finished): Goffi <goffi@goffi.org> parents: 884 diff changeset	706 d = self.asyncBridgeCall("mucGetDefaultService")
692 7a9c7b9f6a28 browser_side: use host.default_muc instead of C.DEFAULT_MUC souliane <souliane@mailoo.org> parents: 689 diff changeset	707 return d
7a9c7b9f6a28 browser_side: use host.default_muc instead of C.DEFAULT_MUC souliane <souliane@mailoo.org> parents: 689 diff changeset	708
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	709 def jsonrpc_launchTarotGame(self, other_players, room_jid=""):
689 a6adefddcb0a browser and server side: complete changeset 669 (a8fddccf5b84) about joining MUC: souliane <souliane@mailoo.org> parents: 685 diff changeset	710 """Create a room, invite the other players and start a Tarot game.
a6adefddcb0a browser and server side: complete changeset 669 (a8fddccf5b84) about joining MUC: souliane <souliane@mailoo.org> parents: 685 diff changeset	711
a6adefddcb0a browser and server side: complete changeset 669 (a8fddccf5b84) about joining MUC: souliane <souliane@mailoo.org> parents: 685 diff changeset	712 @param other_players (list[unicode]): JIDs of the players to play with
a6adefddcb0a browser and server side: complete changeset 669 (a8fddccf5b84) about joining MUC: souliane <souliane@mailoo.org> parents: 685 diff changeset	713 @param room_jid (unicode): room JID or empty string to generate a unique name
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	714 """
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	715 profile = session_iface.ISATSession(self.session).profile
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	716 self.sat_host.bridge.tarotGameLaunch(other_players, room_jid, profile)
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	717
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	718 def jsonrpc_getTarotCardsPaths(self):
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	719 """Give the path of all the tarot cards"""
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	720 _join = os.path.join
451 1a0cec9b0f1e better PEP-8 compliance souliane <souliane@mailoo.org> parents: 449 diff changeset	721 _media_dir = _join(self.sat_host.media_dir, '')
1a0cec9b0f1e better PEP-8 compliance souliane <souliane@mailoo.org> parents: 449 diff changeset	722 return map(lambda x: _join(C.MEDIA_DIR, x[len(_media_dir):]), glob.glob(_join(_media_dir, C.CARDS_DIR, '_.png')))
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	723
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	724 def jsonrpc_tarotGameReady(self, player, referee):
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	725 """Tell to the server that we are ready to start the game"""
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	726 profile = session_iface.ISATSession(self.session).profile
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	727 self.sat_host.bridge.tarotGameReady(player, referee, profile)
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	728
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	729 def jsonrpc_tarotGamePlayCards(self, player_nick, referee, cards):
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	730 """Tell to the server the cards we want to put on the table"""
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	731 profile = session_iface.ISATSession(self.session).profile
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	732 self.sat_host.bridge.tarotGamePlayCards(player_nick, referee, cards, profile)
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	733
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	734 def jsonrpc_launchRadioCollective(self, invited, room_jid=""):
689 a6adefddcb0a browser and server side: complete changeset 669 (a8fddccf5b84) about joining MUC: souliane <souliane@mailoo.org> parents: 685 diff changeset	735 """Create a room, invite people, and start a radio collective.
a6adefddcb0a browser and server side: complete changeset 669 (a8fddccf5b84) about joining MUC: souliane <souliane@mailoo.org> parents: 685 diff changeset	736
a6adefddcb0a browser and server side: complete changeset 669 (a8fddccf5b84) about joining MUC: souliane <souliane@mailoo.org> parents: 685 diff changeset	737 @param invited (list[unicode]): JIDs of the contacts to play with
a6adefddcb0a browser and server side: complete changeset 669 (a8fddccf5b84) about joining MUC: souliane <souliane@mailoo.org> parents: 685 diff changeset	738 @param room_jid (unicode): room JID or empty string to generate a unique name
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	739 """
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	740 profile = session_iface.ISATSession(self.session).profile
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	741 self.sat_host.bridge.radiocolLaunch(invited, room_jid, profile)
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	742
605 917e271975d9 server + browser side: implementation of new getEntitiesData bridge method + added a security check: only a white list of entities can be gotten Goffi <goffi@goffi.org> parents: 589 diff changeset	743 def jsonrpc_getEntitiesData(self, jids, keys):
917e271975d9 server + browser side: implementation of new getEntitiesData bridge method + added a security check: only a white list of entities can be gotten Goffi <goffi@goffi.org> parents: 589 diff changeset	744 """Get cached data for several entities at once
917e271975d9 server + browser side: implementation of new getEntitiesData bridge method + added a security check: only a white list of entities can be gotten Goffi <goffi@goffi.org> parents: 589 diff changeset	745
917e271975d9 server + browser side: implementation of new getEntitiesData bridge method + added a security check: only a white list of entities can be gotten Goffi <goffi@goffi.org> parents: 589 diff changeset	746 @param jids: list jids from who we wants data, or empty list for all jids in cache
917e271975d9 server + browser side: implementation of new getEntitiesData bridge method + added a security check: only a white list of entities can be gotten Goffi <goffi@goffi.org> parents: 589 diff changeset	747 @param keys: name of data we want (list)
917e271975d9 server + browser side: implementation of new getEntitiesData bridge method + added a security check: only a white list of entities can be gotten Goffi <goffi@goffi.org> parents: 589 diff changeset	748 @return: requested data"""
917e271975d9 server + browser side: implementation of new getEntitiesData bridge method + added a security check: only a white list of entities can be gotten Goffi <goffi@goffi.org> parents: 589 diff changeset	749 if not C.ALLOWED_ENTITY_DATA.issuperset(keys):
917e271975d9 server + browser side: implementation of new getEntitiesData bridge method + added a security check: only a white list of entities can be gotten Goffi <goffi@goffi.org> parents: 589 diff changeset	750 raise exceptions.PermissionError("Trying to access unallowed data (hack attempt ?)")
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	751 profile = session_iface.ISATSession(self.session).profile
605 917e271975d9 server + browser side: implementation of new getEntitiesData bridge method + added a security check: only a white list of entities can be gotten Goffi <goffi@goffi.org> parents: 589 diff changeset	752 try:
917e271975d9 server + browser side: implementation of new getEntitiesData bridge method + added a security check: only a white list of entities can be gotten Goffi <goffi@goffi.org> parents: 589 diff changeset	753 return self.sat_host.bridge.getEntitiesData(jids, keys, profile)
917e271975d9 server + browser side: implementation of new getEntitiesData bridge method + added a security check: only a white list of entities can be gotten Goffi <goffi@goffi.org> parents: 589 diff changeset	754 except Exception as e:
917 86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	755 raise failure.Failure(jsonrpclib.Fault(C.ERRNUM_BRIDGE_ERRBACK, unicode(e)))
605 917e271975d9 server + browser side: implementation of new getEntitiesData bridge method + added a security check: only a white list of entities can be gotten Goffi <goffi@goffi.org> parents: 589 diff changeset	756
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	757 def jsonrpc_getEntityData(self, jid, keys):
605 917e271975d9 server + browser side: implementation of new getEntitiesData bridge method + added a security check: only a white list of entities can be gotten Goffi <goffi@goffi.org> parents: 589 diff changeset	758 """Get cached data for an entity
917e271975d9 server + browser side: implementation of new getEntitiesData bridge method + added a security check: only a white list of entities can be gotten Goffi <goffi@goffi.org> parents: 589 diff changeset	759
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	760 @param jid: jid of contact from who we want data
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	761 @param keys: name of data we want (list)
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	762 @return: requested data"""
605 917e271975d9 server + browser side: implementation of new getEntitiesData bridge method + added a security check: only a white list of entities can be gotten Goffi <goffi@goffi.org> parents: 589 diff changeset	763 if not C.ALLOWED_ENTITY_DATA.issuperset(keys):
917e271975d9 server + browser side: implementation of new getEntitiesData bridge method + added a security check: only a white list of entities can be gotten Goffi <goffi@goffi.org> parents: 589 diff changeset	764 raise exceptions.PermissionError("Trying to access unallowed data (hack attempt ?)")
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	765 profile = session_iface.ISATSession(self.session).profile
589 a5019e62c3e9 browser side: big refactoring to base Libervia on QuickFrontend, first draft: Goffi <goffi@goffi.org> parents: 566 diff changeset	766 try:
a5019e62c3e9 browser side: big refactoring to base Libervia on QuickFrontend, first draft: Goffi <goffi@goffi.org> parents: 566 diff changeset	767 return self.sat_host.bridge.getEntityData(jid, keys, profile)
a5019e62c3e9 browser side: big refactoring to base Libervia on QuickFrontend, first draft: Goffi <goffi@goffi.org> parents: 566 diff changeset	768 except Exception as e:
917 86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	769 raise failure.Failure(jsonrpclib.Fault(C.ERRNUM_BRIDGE_ERRBACK, unicode(e)))
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	770
605 917e271975d9 server + browser side: implementation of new getEntitiesData bridge method + added a security check: only a white list of entities can be gotten Goffi <goffi@goffi.org> parents: 589 diff changeset	771 def jsonrpc_getCard(self, jid_):
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	772 """Get VCard for entiry
605 917e271975d9 server + browser side: implementation of new getEntitiesData bridge method + added a security check: only a white list of entities can be gotten Goffi <goffi@goffi.org> parents: 589 diff changeset	773 @param jid_: jid of contact from who we want data
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	774 @return: id to retrieve the profile"""
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	775 profile = session_iface.ISATSession(self.session).profile
605 917e271975d9 server + browser side: implementation of new getEntitiesData bridge method + added a security check: only a white list of entities can be gotten Goffi <goffi@goffi.org> parents: 589 diff changeset	776 return self.sat_host.bridge.getCard(jid_, profile)
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	777
914 0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	778 @defer.inlineCallbacks
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	779 def jsonrpc_avatarGet(self, entity, cache_only, hash_only):
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	780 session_data = session_iface.ISATSession(self.session)
914 0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	781 profile = session_data.profile
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	782 # profile_uuid = session_data.uuid
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	783 avatar = yield self.asyncBridgeCall("avatarGet", entity, cache_only, hash_only, profile)
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	784 if hash_only:
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	785 defer.returnValue(avatar)
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	786 else:
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	787 filename = os.path.basename(avatar)
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	788 avatar_url = os.path.join(C.CACHE_DIR, session_data.uuid, filename)
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	789 defer.returnValue(avatar_url)
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	790
391 c86d7a8d2c1e browser_side: added a dialog in Settings/Account to update/delete the XMPP account souliane <souliane@mailoo.org> parents: 389 diff changeset	791 def jsonrpc_getAccountDialogUI(self):
c86d7a8d2c1e browser_side: added a dialog in Settings/Account to update/delete the XMPP account souliane <souliane@mailoo.org> parents: 389 diff changeset	792 """Get the dialog for managing user account
c86d7a8d2c1e browser_side: added a dialog in Settings/Account to update/delete the XMPP account souliane <souliane@mailoo.org> parents: 389 diff changeset	793 @return: XML string of the XMLUI"""
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	794 profile = session_iface.ISATSession(self.session).profile
391 c86d7a8d2c1e browser_side: added a dialog in Settings/Account to update/delete the XMPP account souliane <souliane@mailoo.org> parents: 389 diff changeset	795 return self.sat_host.bridge.getAccountDialogUI(profile)
c86d7a8d2c1e browser_side: added a dialog in Settings/Account to update/delete the XMPP account souliane <souliane@mailoo.org> parents: 389 diff changeset	796
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	797 def jsonrpc_getParamsUI(self):
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	798 """Return the parameters XML for profile"""
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	799 profile = session_iface.ISATSession(self.session).profile
745 ad733b670cc3 server side: fixed params, and removed self.authorized_params as authorisation is handled by the backend Goffi <goffi@goffi.org> parents: 744 diff changeset	800 return self.asyncBridgeCall("getParamsUI", C.SECURITY_LIMIT, C.APP_NAME, profile)
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	801
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	802 def jsonrpc_asyncGetParamA(self, param, category, attribute="value"):
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	803 """Return the parameter value for profile"""
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	804 profile = session_iface.ISATSession(self.session).profile
746 25984ca4aef2 server side: special handling of Connection/JabberID and Connection/autoconnect parameter which has needed by QuickApp but restricted by security limit Goffi <goffi@goffi.org> parents: 745 diff changeset	805 if category == "Connection":
25984ca4aef2 server side: special handling of Connection/JabberID and Connection/autoconnect parameter which has needed by QuickApp but restricted by security limit Goffi <goffi@goffi.org> parents: 745 diff changeset	806 # we need to manage the followings params here, else SECURITY_LIMIT would block them
25984ca4aef2 server side: special handling of Connection/JabberID and Connection/autoconnect parameter which has needed by QuickApp but restricted by security limit Goffi <goffi@goffi.org> parents: 745 diff changeset	807 if param == "JabberID":
25984ca4aef2 server side: special handling of Connection/JabberID and Connection/autoconnect parameter which has needed by QuickApp but restricted by security limit Goffi <goffi@goffi.org> parents: 745 diff changeset	808 return self.asyncBridgeCall("asyncGetParamA", param, category, attribute, profile_key=profile)
25984ca4aef2 server side: special handling of Connection/JabberID and Connection/autoconnect parameter which has needed by QuickApp but restricted by security limit Goffi <goffi@goffi.org> parents: 745 diff changeset	809 elif param == "autoconnect":
25984ca4aef2 server side: special handling of Connection/JabberID and Connection/autoconnect parameter which has needed by QuickApp but restricted by security limit Goffi <goffi@goffi.org> parents: 745 diff changeset	810 return defer.succeed(C.BOOL_TRUE)
433 bbdbee25123a import constants.Const as C (according to the coding rules) souliane <souliane@mailoo.org> parents: 427 diff changeset	811 d = self.asyncBridgeCall("asyncGetParamA", param, category, attribute, C.SECURITY_LIMIT, profile_key=profile)
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	812 return d
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	813
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	814 def jsonrpc_setParam(self, name, value, category):
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	815 profile = session_iface.ISATSession(self.session).profile
745 ad733b670cc3 server side: fixed params, and removed self.authorized_params as authorisation is handled by the backend Goffi <goffi@goffi.org> parents: 744 diff changeset	816 return self.sat_host.bridge.setParam(name, value, category, C.SECURITY_LIMIT, profile)
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	817
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	818 def jsonrpc_launchAction(self, callback_id, data):
336 629c99bbd031 browser + server side: refactored menus: Goffi <goffi@goffi.org> parents: 333 diff changeset	819 #FIXME: any action can be launched, this can be a huge security issue if callback_id can be guessed
629c99bbd031 browser + server side: refactored menus: Goffi <goffi@goffi.org> parents: 333 diff changeset	820 # a security system with authorised callback_id must be implemented, similar to the one for authorised params
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	821 profile = session_iface.ISATSession(self.session).profile
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	822 d = self.asyncBridgeCall("launchAction", callback_id, data, profile)
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	823 return d
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	824
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	825 def jsonrpc_chatStateComposing(self, to_jid_s):
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	826 """Call the method to process a "composing" state.
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	827 @param to_jid_s: contact the user is composing to
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	828 """
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	829 profile = session_iface.ISATSession(self.session).profile
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	830 self.sat_host.bridge.chatStateComposing(to_jid_s, profile)
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	831
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	832 def jsonrpc_getNewAccountDomain(self):
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	833 """@return: the domain for new account creation"""
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	834 d = self.asyncBridgeCall("getNewAccountDomain")
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	835 return d
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	836
433 bbdbee25123a import constants.Const as C (according to the coding rules) souliane <souliane@mailoo.org> parents: 427 diff changeset	837 def jsonrpc_syntaxConvert(self, text, syntax_from=C.SYNTAX_XHTML, syntax_to=C.SYNTAX_CURRENT):
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	838 """ Convert a text between two syntaxes
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	839 @param text: text to convert
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	840 @param syntax_from: source syntax (e.g. "markdown")
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	841 @param syntax_to: dest syntax (e.g.: "XHTML")
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	842 @param safe: clean resulting XHTML to avoid malicious code if True (forced here)
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	843 @return: converted text """
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	844 profile = session_iface.ISATSession(self.session).profile
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	845 return self.sat_host.bridge.syntaxConvert(text, syntax_from, syntax_to, True, profile)
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	846
520 d58d4dd0cefe browser and server sides: add bridge method getLastResource souliane <souliane@mailoo.org> parents: 514 diff changeset	847 def jsonrpc_getLastResource(self, jid_s):
521 69bffcf37ce3 browser_side: add minimal requirements for generic plugins handling souliane <souliane@mailoo.org> parents: 520 diff changeset	848 """Get the last active resource of that contact."""
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	849 profile = session_iface.ISATSession(self.session).profile
520 d58d4dd0cefe browser and server sides: add bridge method getLastResource souliane <souliane@mailoo.org> parents: 514 diff changeset	850 return self.sat_host.bridge.getLastResource(jid_s, profile)
d58d4dd0cefe browser and server sides: add bridge method getLastResource souliane <souliane@mailoo.org> parents: 514 diff changeset	851
751 2ddd85551612 server + browser side: getFeatures bridge call Goffi <goffi@goffi.org> parents: 750 diff changeset	852 def jsonrpc_getFeatures(self):
2ddd85551612 server + browser side: getFeatures bridge call Goffi <goffi@goffi.org> parents: 750 diff changeset	853 """Return the available features in the backend for profile"""
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	854 profile = session_iface.ISATSession(self.session).profile
751 2ddd85551612 server + browser side: getFeatures bridge call Goffi <goffi@goffi.org> parents: 750 diff changeset	855 return self.sat_host.bridge.getFeatures(profile)
2ddd85551612 server + browser side: getFeatures bridge call Goffi <goffi@goffi.org> parents: 750 diff changeset	856
522 0de69fec24e9 browser and server sides: OTR plugin, first draft souliane <souliane@mailoo.org> parents: 521 diff changeset	857 def jsonrpc_skipOTR(self):
0de69fec24e9 browser and server sides: OTR plugin, first draft souliane <souliane@mailoo.org> parents: 521 diff changeset	858 """Tell the backend to leave OTR handling to Libervia."""
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	859 profile = session_iface.ISATSession(self.session).profile
522 0de69fec24e9 browser and server sides: OTR plugin, first draft souliane <souliane@mailoo.org> parents: 521 diff changeset	860 return self.sat_host.bridge.skipOTR(profile)
0de69fec24e9 browser and server sides: OTR plugin, first draft souliane <souliane@mailoo.org> parents: 521 diff changeset	861
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	862
554 471b6babe960 server_side: set a timeout to reset the waiting connection requests after 5 minutes souliane <souliane@mailoo.org> parents: 553 diff changeset	863 class WaitingRequests(dict):
471b6babe960 server_side: set a timeout to reset the waiting connection requests after 5 minutes souliane <souliane@mailoo.org> parents: 553 diff changeset	864
796 fad9c9f82ae3 browser and server sides: alert the user after he created a new profile using his XMPP account credentials souliane <souliane@mailoo.org> parents: 794 diff changeset	865 def setRequest(self, request, profile, register_with_ext_jid=False):
554 471b6babe960 server_side: set a timeout to reset the waiting connection requests after 5 minutes souliane <souliane@mailoo.org> parents: 553 diff changeset	866 """Add the given profile to the waiting list.
471b6babe960 server_side: set a timeout to reset the waiting connection requests after 5 minutes souliane <souliane@mailoo.org> parents: 553 diff changeset	867
471b6babe960 server_side: set a timeout to reset the waiting connection requests after 5 minutes souliane <souliane@mailoo.org> parents: 553 diff changeset	868 @param request (server.Request): the connection request
471b6babe960 server_side: set a timeout to reset the waiting connection requests after 5 minutes souliane <souliane@mailoo.org> parents: 553 diff changeset	869 @param profile (str): %(doc_profile)s
796 fad9c9f82ae3 browser and server sides: alert the user after he created a new profile using his XMPP account credentials souliane <souliane@mailoo.org> parents: 794 diff changeset	870 @param register_with_ext_jid (bool): True if we will try to register the profile with an external XMPP account credentials
554 471b6babe960 server_side: set a timeout to reset the waiting connection requests after 5 minutes souliane <souliane@mailoo.org> parents: 553 diff changeset	871 """
555 db1b330c1eb1 server_side: set the connection attempt timeout to the bridge timeout (2 minutes) souliane <souliane@mailoo.org> parents: 554 diff changeset	872 dc = reactor.callLater(BRIDGE_TIMEOUT, self.purgeRequest, profile)
796 fad9c9f82ae3 browser and server sides: alert the user after he created a new profile using his XMPP account credentials souliane <souliane@mailoo.org> parents: 794 diff changeset	873 self[profile] = (request, dc, register_with_ext_jid)
554 471b6babe960 server_side: set a timeout to reset the waiting connection requests after 5 minutes souliane <souliane@mailoo.org> parents: 553 diff changeset	874
471b6babe960 server_side: set a timeout to reset the waiting connection requests after 5 minutes souliane <souliane@mailoo.org> parents: 553 diff changeset	875 def purgeRequest(self, profile):
471b6babe960 server_side: set a timeout to reset the waiting connection requests after 5 minutes souliane <souliane@mailoo.org> parents: 553 diff changeset	876 """Remove the given profile from the waiting list.
471b6babe960 server_side: set a timeout to reset the waiting connection requests after 5 minutes souliane <souliane@mailoo.org> parents: 553 diff changeset	877
471b6babe960 server_side: set a timeout to reset the waiting connection requests after 5 minutes souliane <souliane@mailoo.org> parents: 553 diff changeset	878 @param profile (str): %(doc_profile)s
471b6babe960 server_side: set a timeout to reset the waiting connection requests after 5 minutes souliane <souliane@mailoo.org> parents: 553 diff changeset	879 """
471b6babe960 server_side: set a timeout to reset the waiting connection requests after 5 minutes souliane <souliane@mailoo.org> parents: 553 diff changeset	880 try:
471b6babe960 server_side: set a timeout to reset the waiting connection requests after 5 minutes souliane <souliane@mailoo.org> parents: 553 diff changeset	881 dc = self[profile][1]
471b6babe960 server_side: set a timeout to reset the waiting connection requests after 5 minutes souliane <souliane@mailoo.org> parents: 553 diff changeset	882 except KeyError:
471b6babe960 server_side: set a timeout to reset the waiting connection requests after 5 minutes souliane <souliane@mailoo.org> parents: 553 diff changeset	883 return
471b6babe960 server_side: set a timeout to reset the waiting connection requests after 5 minutes souliane <souliane@mailoo.org> parents: 553 diff changeset	884 if dc.active():
471b6babe960 server_side: set a timeout to reset the waiting connection requests after 5 minutes souliane <souliane@mailoo.org> parents: 553 diff changeset	885 dc.cancel()
471b6babe960 server_side: set a timeout to reset the waiting connection requests after 5 minutes souliane <souliane@mailoo.org> parents: 553 diff changeset	886 del self[profile]
471b6babe960 server_side: set a timeout to reset the waiting connection requests after 5 minutes souliane <souliane@mailoo.org> parents: 553 diff changeset	887
471b6babe960 server_side: set a timeout to reset the waiting connection requests after 5 minutes souliane <souliane@mailoo.org> parents: 553 diff changeset	888 def getRequest(self, profile):
471b6babe960 server_side: set a timeout to reset the waiting connection requests after 5 minutes souliane <souliane@mailoo.org> parents: 553 diff changeset	889 """Get the waiting request for the given profile.
471b6babe960 server_side: set a timeout to reset the waiting connection requests after 5 minutes souliane <souliane@mailoo.org> parents: 553 diff changeset	890
471b6babe960 server_side: set a timeout to reset the waiting connection requests after 5 minutes souliane <souliane@mailoo.org> parents: 553 diff changeset	891 @param profile (str): %(doc_profile)s
471b6babe960 server_side: set a timeout to reset the waiting connection requests after 5 minutes souliane <souliane@mailoo.org> parents: 553 diff changeset	892 @return: the waiting request or None
471b6babe960 server_side: set a timeout to reset the waiting connection requests after 5 minutes souliane <souliane@mailoo.org> parents: 553 diff changeset	893 """
471b6babe960 server_side: set a timeout to reset the waiting connection requests after 5 minutes souliane <souliane@mailoo.org> parents: 553 diff changeset	894 return self[profile][0] if profile in self else None
471b6babe960 server_side: set a timeout to reset the waiting connection requests after 5 minutes souliane <souliane@mailoo.org> parents: 553 diff changeset	895
796 fad9c9f82ae3 browser and server sides: alert the user after he created a new profile using his XMPP account credentials souliane <souliane@mailoo.org> parents: 794 diff changeset	896 def getRegisterWithExtJid(self, profile):
fad9c9f82ae3 browser and server sides: alert the user after he created a new profile using his XMPP account credentials souliane <souliane@mailoo.org> parents: 794 diff changeset	897 """Get the value of the register_with_ext_jid parameter.
fad9c9f82ae3 browser and server sides: alert the user after he created a new profile using his XMPP account credentials souliane <souliane@mailoo.org> parents: 794 diff changeset	898
fad9c9f82ae3 browser and server sides: alert the user after he created a new profile using his XMPP account credentials souliane <souliane@mailoo.org> parents: 794 diff changeset	899 @param profile (str): %(doc_profile)s
fad9c9f82ae3 browser and server sides: alert the user after he created a new profile using his XMPP account credentials souliane <souliane@mailoo.org> parents: 794 diff changeset	900 @return: bool or None
fad9c9f82ae3 browser and server sides: alert the user after he created a new profile using his XMPP account credentials souliane <souliane@mailoo.org> parents: 794 diff changeset	901 """
fad9c9f82ae3 browser and server sides: alert the user after he created a new profile using his XMPP account credentials souliane <souliane@mailoo.org> parents: 794 diff changeset	902 return self[profile][2] if profile in self else None
fad9c9f82ae3 browser and server sides: alert the user after he created a new profile using his XMPP account credentials souliane <souliane@mailoo.org> parents: 794 diff changeset	903
554 471b6babe960 server_side: set a timeout to reset the waiting connection requests after 5 minutes souliane <souliane@mailoo.org> parents: 553 diff changeset	904
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	905 class Register(JSONRPCMethodManager):
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	906 """This class manage the registration procedure with SàT
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	907 It provide an api for the browser, check password and setup the web server"""
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	908
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	909 def __init__(self, sat_host):
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	910 JSONRPCMethodManager.__init__(self, sat_host)
451 1a0cec9b0f1e better PEP-8 compliance souliane <souliane@mailoo.org> parents: 449 diff changeset	911 self.profiles_waiting = {}
1a0cec9b0f1e better PEP-8 compliance souliane <souliane@mailoo.org> parents: 449 diff changeset	912 self.request = None
554 471b6babe960 server_side: set a timeout to reset the waiting connection requests after 5 minutes souliane <souliane@mailoo.org> parents: 553 diff changeset	913 self.waiting_profiles = WaitingRequests()
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	914
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	915 def render(self, request):
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	916 """
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	917 Render method with some hacks:
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	918 - if login is requested, try to login with form data
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	919 - except login, every method is jsonrpc
415 fadbba1d793f server_side: added support for SSL and related parameters: souliane <souliane@mailoo.org> parents: 413 diff changeset	920 - user doesn't need to be authentified for explicitely listed methods, but must be for all others
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	921 """
446 c406e46fe9c0 server_side: update the connection mechanism to handle profile passwords souliane <souliane@mailoo.org> parents: 445 diff changeset	922 if request.postpath == ['login']:
c406e46fe9c0 server_side: update the connection mechanism to handle profile passwords souliane <souliane@mailoo.org> parents: 445 diff changeset	923 return self.loginOrRegister(request)
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	924 _session = request.getSession()
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	925 parsed = jsonrpclib.loads(request.content.read())
482 437eefa53a01 misc: remove some pylint errors and warnings souliane <souliane@mailoo.org> parents: 481 diff changeset	926 method = parsed.get("method") # pylint: disable=E1103
914 0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	927 if method not in ['getSessionMetadata', 'registerParams', 'menusGet']:
336 629c99bbd031 browser + server side: refactored menus: Goffi <goffi@goffi.org> parents: 333 diff changeset	928 #if we don't call these methods, we need to be identified
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	929 profile = session_iface.ISATSession(_session).profile
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	930 if not profile:
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	931 #user is not identified, we return a jsonrpc fault
481 bbdc5357dc00 browser and server sides: refactor HTTP request result values + handle "NoReply" error souliane <souliane@mailoo.org> parents: 476 diff changeset	932 fault = jsonrpclib.Fault(C.ERRNUM_LIBERVIA, C.NOT_ALLOWED) # FIXME: define some standard error codes for libervia
482 437eefa53a01 misc: remove some pylint errors and warnings souliane <souliane@mailoo.org> parents: 481 diff changeset	933 return jsonrpc.JSONRPC._cbRender(self, fault, request, parsed.get('id'), parsed.get('jsonrpc')) # pylint: disable=E1103
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	934 self.request = request
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	935 return jsonrpc.JSONRPC.render(self, request)
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	936
446 c406e46fe9c0 server_side: update the connection mechanism to handle profile passwords souliane <souliane@mailoo.org> parents: 445 diff changeset	937 def loginOrRegister(self, request):
c406e46fe9c0 server_side: update the connection mechanism to handle profile passwords souliane <souliane@mailoo.org> parents: 445 diff changeset	938 """This method is called with the POST information from the registering form.
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	939
446 c406e46fe9c0 server_side: update the connection mechanism to handle profile passwords souliane <souliane@mailoo.org> parents: 445 diff changeset	940 @param request: request of the register form
c406e46fe9c0 server_side: update the connection mechanism to handle profile passwords souliane <souliane@mailoo.org> parents: 445 diff changeset	941 @return: a constant indicating the state:
481 bbdc5357dc00 browser and server sides: refactor HTTP request result values + handle "NoReply" error souliane <souliane@mailoo.org> parents: 476 diff changeset	942 - C.BAD_REQUEST: something is wrong in the request (bad arguments)
446 c406e46fe9c0 server_side: update the connection mechanism to handle profile passwords souliane <souliane@mailoo.org> parents: 445 diff changeset	943 - a return value from self._loginAccount or self._registerNewAccount
c406e46fe9c0 server_side: update the connection mechanism to handle profile passwords souliane <souliane@mailoo.org> parents: 445 diff changeset	944 """
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	945 try:
446 c406e46fe9c0 server_side: update the connection mechanism to handle profile passwords souliane <souliane@mailoo.org> parents: 445 diff changeset	946 submit_type = request.args['submit_type'][0]
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	947 except KeyError:
481 bbdc5357dc00 browser and server sides: refactor HTTP request result values + handle "NoReply" error souliane <souliane@mailoo.org> parents: 476 diff changeset	948 return C.BAD_REQUEST
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	949
446 c406e46fe9c0 server_side: update the connection mechanism to handle profile passwords souliane <souliane@mailoo.org> parents: 445 diff changeset	950 if submit_type == 'register':
871 54f6c5b86a87 server, browser: new "allow_registration" option to enable/disable new account registration through Liberia interface Goffi <goffi@goffi.org> parents: 869 diff changeset	951 if not self.sat_host.options["allow_registration"]:
54f6c5b86a87 server, browser: new "allow_registration" option to enable/disable new account registration through Liberia interface Goffi <goffi@goffi.org> parents: 869 diff changeset	952 log.warning(u"Registration received while it is not allowed, hack attempt?")
54f6c5b86a87 server, browser: new "allow_registration" option to enable/disable new account registration through Liberia interface Goffi <goffi@goffi.org> parents: 869 diff changeset	953 return exceptions.PermissionError(u"Registration is not allowed on this server")
446 c406e46fe9c0 server_side: update the connection mechanism to handle profile passwords souliane <souliane@mailoo.org> parents: 445 diff changeset	954 return self._registerNewAccount(request)
c406e46fe9c0 server_side: update the connection mechanism to handle profile passwords souliane <souliane@mailoo.org> parents: 445 diff changeset	955 elif submit_type == 'login':
794 6a2fd7807770 server_side: if a user tries to login with a full JID but his host is the local domain, login with the user part only souliane <souliane@mailoo.org> parents: 793 diff changeset	956 d = self.asyncBridgeCall("getNewAccountDomain")
6a2fd7807770 server_side: if a user tries to login with a full JID but his host is the local domain, login with the user part only souliane <souliane@mailoo.org> parents: 793 diff changeset	957 d.addCallback(lambda domain: self._loginAccount(request, domain))
6a2fd7807770 server_side: if a user tries to login with a full JID but his host is the local domain, login with the user part only souliane <souliane@mailoo.org> parents: 793 diff changeset	958 return server.NOT_DONE_YET
446 c406e46fe9c0 server_side: update the connection mechanism to handle profile passwords souliane <souliane@mailoo.org> parents: 445 diff changeset	959 return Exception('Unknown submit type')
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	960
794 6a2fd7807770 server_side: if a user tries to login with a full JID but his host is the local domain, login with the user part only souliane <souliane@mailoo.org> parents: 793 diff changeset	961 def _loginAccount(self, request, new_account_domain):
446 c406e46fe9c0 server_side: update the connection mechanism to handle profile passwords souliane <souliane@mailoo.org> parents: 445 diff changeset	962 """Try to authenticate the user with the request information.
810 3905bc24eb17 server: proper options handling Goffi <goffi@goffi.org> parents: 801 diff changeset	963
446 c406e46fe9c0 server_side: update the connection mechanism to handle profile passwords souliane <souliane@mailoo.org> parents: 445 diff changeset	964 @param request: request of the register form
794 6a2fd7807770 server_side: if a user tries to login with a full JID but his host is the local domain, login with the user part only souliane <souliane@mailoo.org> parents: 793 diff changeset	965 @param new_account_domain (unicode): host corresponding to the local domain
446 c406e46fe9c0 server_side: update the connection mechanism to handle profile passwords souliane <souliane@mailoo.org> parents: 445 diff changeset	966 @return: a constant indicating the state:
481 bbdc5357dc00 browser and server sides: refactor HTTP request result values + handle "NoReply" error souliane <souliane@mailoo.org> parents: 476 diff changeset	967 - C.BAD_REQUEST: something is wrong in the request (bad arguments)
bbdc5357dc00 browser and server sides: refactor HTTP request result values + handle "NoReply" error souliane <souliane@mailoo.org> parents: 476 diff changeset	968 - C.PROFILE_AUTH_ERROR: either the profile (login) or the profile password is wrong
bbdc5357dc00 browser and server sides: refactor HTTP request result values + handle "NoReply" error souliane <souliane@mailoo.org> parents: 476 diff changeset	969 - C.XMPP_AUTH_ERROR: the profile is authenticated but the XMPP password is wrong
bbdc5357dc00 browser and server sides: refactor HTTP request result values + handle "NoReply" error souliane <souliane@mailoo.org> parents: 476 diff changeset	970 - C.ALREADY_WAITING: a request has already been submitted for this profile
446 c406e46fe9c0 server_side: update the connection mechanism to handle profile passwords souliane <souliane@mailoo.org> parents: 445 diff changeset	971 - server.NOT_DONE_YET: the profile is being processed, the return
464 bea9788f3170 browser and server sides: don't handle the "connectionError" signal anymore, we now use asyncConnect errback: souliane <souliane@mailoo.org> parents: 462 diff changeset	972 value will be given by self._logged or auth_eb
446 c406e46fe9c0 server_side: update the connection mechanism to handle profile passwords souliane <souliane@mailoo.org> parents: 445 diff changeset	973 """
c406e46fe9c0 server_side: update the connection mechanism to handle profile passwords souliane <souliane@mailoo.org> parents: 445 diff changeset	974 try:
750 8ac862f6e5b3 browser and server sides: allow to connect with a JID that is not registered on the local server souliane <souliane@mailoo.org> parents: 746 diff changeset	975 login = request.args['login'][0]
8ac862f6e5b3 browser and server sides: allow to connect with a JID that is not registered on the local server souliane <souliane@mailoo.org> parents: 746 diff changeset	976 password = request.args['login_password'][0]
446 c406e46fe9c0 server_side: update the connection mechanism to handle profile passwords souliane <souliane@mailoo.org> parents: 445 diff changeset	977 except KeyError:
794 6a2fd7807770 server_side: if a user tries to login with a full JID but his host is the local domain, login with the user part only souliane <souliane@mailoo.org> parents: 793 diff changeset	978 request.write(C.BAD_REQUEST)
6a2fd7807770 server_side: if a user tries to login with a full JID but his host is the local domain, login with the user part only souliane <souliane@mailoo.org> parents: 793 diff changeset	979 request.finish()
6a2fd7807770 server_side: if a user tries to login with a full JID but his host is the local domain, login with the user part only souliane <souliane@mailoo.org> parents: 793 diff changeset	980 return
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	981
819 9b9c0fe0a75f server: fixed bad login check introduced in rev 6a2fd7807770 Goffi <goffi@goffi.org> parents: 818 diff changeset	982 assert login
9b9c0fe0a75f server: fixed bad login check introduced in rev 6a2fd7807770 Goffi <goffi@goffi.org> parents: 818 diff changeset	983
750 8ac862f6e5b3 browser and server sides: allow to connect with a JID that is not registered on the local server souliane <souliane@mailoo.org> parents: 746 diff changeset	984 if login.startswith('@'): # this is checked by javascript but also here for security reason
819 9b9c0fe0a75f server: fixed bad login check introduced in rev 6a2fd7807770 Goffi <goffi@goffi.org> parents: 818 diff changeset	985 # FIXME: return an error instead of an Exception?
446 c406e46fe9c0 server_side: update the connection mechanism to handle profile passwords souliane <souliane@mailoo.org> parents: 445 diff changeset	986 raise Exception('No profile_key allowed')
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	987
819 9b9c0fe0a75f server: fixed bad login check introduced in rev 6a2fd7807770 Goffi <goffi@goffi.org> parents: 818 diff changeset	988 if '@' in login:
9b9c0fe0a75f server: fixed bad login check introduced in rev 6a2fd7807770 Goffi <goffi@goffi.org> parents: 818 diff changeset	989 try:
9b9c0fe0a75f server: fixed bad login check introduced in rev 6a2fd7807770 Goffi <goffi@goffi.org> parents: 818 diff changeset	990 login_jid = jid.JID(login)
9b9c0fe0a75f server: fixed bad login check introduced in rev 6a2fd7807770 Goffi <goffi@goffi.org> parents: 818 diff changeset	991 except (RuntimeError, jid.InvalidFormat, AttributeError):
9b9c0fe0a75f server: fixed bad login check introduced in rev 6a2fd7807770 Goffi <goffi@goffi.org> parents: 818 diff changeset	992 request.write(C.PROFILE_AUTH_ERROR)
9b9c0fe0a75f server: fixed bad login check introduced in rev 6a2fd7807770 Goffi <goffi@goffi.org> parents: 818 diff changeset	993 request.finish()
9b9c0fe0a75f server: fixed bad login check introduced in rev 6a2fd7807770 Goffi <goffi@goffi.org> parents: 818 diff changeset	994 return
9b9c0fe0a75f server: fixed bad login check introduced in rev 6a2fd7807770 Goffi <goffi@goffi.org> parents: 818 diff changeset	995
9b9c0fe0a75f server: fixed bad login check introduced in rev 6a2fd7807770 Goffi <goffi@goffi.org> parents: 818 diff changeset	996 if login_jid.host == new_account_domain:
9b9c0fe0a75f server: fixed bad login check introduced in rev 6a2fd7807770 Goffi <goffi@goffi.org> parents: 818 diff changeset	997 # redirect "user@libervia.org" to the "user" profile
9b9c0fe0a75f server: fixed bad login check introduced in rev 6a2fd7807770 Goffi <goffi@goffi.org> parents: 818 diff changeset	998 login = login_jid.user
9b9c0fe0a75f server: fixed bad login check introduced in rev 6a2fd7807770 Goffi <goffi@goffi.org> parents: 818 diff changeset	999 login_jid = None
9b9c0fe0a75f server: fixed bad login check introduced in rev 6a2fd7807770 Goffi <goffi@goffi.org> parents: 818 diff changeset	1000 else:
9b9c0fe0a75f server: fixed bad login check introduced in rev 6a2fd7807770 Goffi <goffi@goffi.org> parents: 818 diff changeset	1001 login_jid = None
9b9c0fe0a75f server: fixed bad login check introduced in rev 6a2fd7807770 Goffi <goffi@goffi.org> parents: 818 diff changeset	1002
750 8ac862f6e5b3 browser and server sides: allow to connect with a JID that is not registered on the local server souliane <souliane@mailoo.org> parents: 746 diff changeset	1003 try:
915 e9e9d9d893a8 server: renamed getProfileName to profileNameGet following core change and new conventions. Goffi <goffi@goffi.org> parents: 914 diff changeset	1004 profile = self.sat_host.bridge.profileNameGet(login)
796 fad9c9f82ae3 browser and server sides: alert the user after he created a new profile using his XMPP account credentials souliane <souliane@mailoo.org> parents: 794 diff changeset	1005 except Exception: # XXX: ProfileUnknownError wouldn't work, it's encapsulated
819 9b9c0fe0a75f server: fixed bad login check introduced in rev 6a2fd7807770 Goffi <goffi@goffi.org> parents: 818 diff changeset	1006 if login_jid is not None and login_jid.user: # try to create a new sat profile using the XMPP credentials
871 54f6c5b86a87 server, browser: new "allow_registration" option to enable/disable new account registration through Liberia interface Goffi <goffi@goffi.org> parents: 869 diff changeset	1007 if not self.sat_host.options["allow_registration"]:
54f6c5b86a87 server, browser: new "allow_registration" option to enable/disable new account registration through Liberia interface Goffi <goffi@goffi.org> parents: 869 diff changeset	1008 log.warning(u"Trying to register JID account while registration is not allowed")
54f6c5b86a87 server, browser: new "allow_registration" option to enable/disable new account registration through Liberia interface Goffi <goffi@goffi.org> parents: 869 diff changeset	1009 request.write(C.PROFILE_AUTH_ERROR)
54f6c5b86a87 server, browser: new "allow_registration" option to enable/disable new account registration through Liberia interface Goffi <goffi@goffi.org> parents: 869 diff changeset	1010 request.finish()
54f6c5b86a87 server, browser: new "allow_registration" option to enable/disable new account registration through Liberia interface Goffi <goffi@goffi.org> parents: 869 diff changeset	1011 return
819 9b9c0fe0a75f server: fixed bad login check introduced in rev 6a2fd7807770 Goffi <goffi@goffi.org> parents: 818 diff changeset	1012 profile = login # FIXME: what if there is a resource?
801 68eadda8a59a server_side: fixed confusion between jid user and host when there's not arobase souliane <souliane@mailoo.org> parents: 796 diff changeset	1013 connect_method = "asyncConnectWithXMPPCredentials"
68eadda8a59a server_side: fixed confusion between jid user and host when there's not arobase souliane <souliane@mailoo.org> parents: 796 diff changeset	1014 register_with_ext_jid = True
68eadda8a59a server_side: fixed confusion between jid user and host when there's not arobase souliane <souliane@mailoo.org> parents: 796 diff changeset	1015 else: # non existing username
68eadda8a59a server_side: fixed confusion between jid user and host when there's not arobase souliane <souliane@mailoo.org> parents: 796 diff changeset	1016 request.write(C.PROFILE_AUTH_ERROR)
68eadda8a59a server_side: fixed confusion between jid user and host when there's not arobase souliane <souliane@mailoo.org> parents: 796 diff changeset	1017 request.finish()
68eadda8a59a server_side: fixed confusion between jid user and host when there's not arobase souliane <souliane@mailoo.org> parents: 796 diff changeset	1018 return
750 8ac862f6e5b3 browser and server sides: allow to connect with a JID that is not registered on the local server souliane <souliane@mailoo.org> parents: 746 diff changeset	1019 else:
819 9b9c0fe0a75f server: fixed bad login check introduced in rev 6a2fd7807770 Goffi <goffi@goffi.org> parents: 818 diff changeset	1020 if profile != login or (not password and profile not in self.sat_host.options['empty_password_allowed_warning_dangerous_list']):
794 6a2fd7807770 server_side: if a user tries to login with a full JID but his host is the local domain, login with the user part only souliane <souliane@mailoo.org> parents: 793 diff changeset	1021 # profiles with empty passwords are restricted to local frontends
6a2fd7807770 server_side: if a user tries to login with a full JID but his host is the local domain, login with the user part only souliane <souliane@mailoo.org> parents: 793 diff changeset	1022 request.write(C.PROFILE_AUTH_ERROR)
6a2fd7807770 server_side: if a user tries to login with a full JID but his host is the local domain, login with the user part only souliane <souliane@mailoo.org> parents: 793 diff changeset	1023 request.finish()
6a2fd7807770 server_side: if a user tries to login with a full JID but his host is the local domain, login with the user part only souliane <souliane@mailoo.org> parents: 793 diff changeset	1024 return
796 fad9c9f82ae3 browser and server sides: alert the user after he created a new profile using his XMPP account credentials souliane <souliane@mailoo.org> parents: 794 diff changeset	1025 register_with_ext_jid = False
794 6a2fd7807770 server_side: if a user tries to login with a full JID but his host is the local domain, login with the user part only souliane <souliane@mailoo.org> parents: 793 diff changeset	1026
914 0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1027 connect_method = "connect"
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1028
750 8ac862f6e5b3 browser and server sides: allow to connect with a JID that is not registered on the local server souliane <souliane@mailoo.org> parents: 746 diff changeset	1029 if self.waiting_profiles.getRequest(profile):
794 6a2fd7807770 server_side: if a user tries to login with a full JID but his host is the local domain, login with the user part only souliane <souliane@mailoo.org> parents: 793 diff changeset	1030 request.write(C.ALREADY_WAITING)
6a2fd7807770 server_side: if a user tries to login with a full JID but his host is the local domain, login with the user part only souliane <souliane@mailoo.org> parents: 793 diff changeset	1031 request.finish()
6a2fd7807770 server_side: if a user tries to login with a full JID but his host is the local domain, login with the user part only souliane <souliane@mailoo.org> parents: 793 diff changeset	1032 return
446 c406e46fe9c0 server_side: update the connection mechanism to handle profile passwords souliane <souliane@mailoo.org> parents: 445 diff changeset	1033
464 bea9788f3170 browser and server sides: don't handle the "connectionError" signal anymore, we now use asyncConnect errback: souliane <souliane@mailoo.org> parents: 462 diff changeset	1034 def auth_eb(failure):
bea9788f3170 browser and server sides: don't handle the "connectionError" signal anymore, we now use asyncConnect errback: souliane <souliane@mailoo.org> parents: 462 diff changeset	1035 fault = failure.value.faultString
750 8ac862f6e5b3 browser and server sides: allow to connect with a JID that is not registered on the local server souliane <souliane@mailoo.org> parents: 746 diff changeset	1036 self.waiting_profiles.purgeRequest(profile)
8ac862f6e5b3 browser and server sides: allow to connect with a JID that is not registered on the local server souliane <souliane@mailoo.org> parents: 746 diff changeset	1037 if fault in ('PasswordError', 'ProfileUnknownError'):
8ac862f6e5b3 browser and server sides: allow to connect with a JID that is not registered on the local server souliane <souliane@mailoo.org> parents: 746 diff changeset	1038 log.info(u"Profile %s doesn't exist or the submitted password is wrong" % profile)
481 bbdc5357dc00 browser and server sides: refactor HTTP request result values + handle "NoReply" error souliane <souliane@mailoo.org> parents: 476 diff changeset	1039 request.write(C.PROFILE_AUTH_ERROR)
464 bea9788f3170 browser and server sides: don't handle the "connectionError" signal anymore, we now use asyncConnect errback: souliane <souliane@mailoo.org> parents: 462 diff changeset	1040 elif fault == 'SASLAuthError':
750 8ac862f6e5b3 browser and server sides: allow to connect with a JID that is not registered on the local server souliane <souliane@mailoo.org> parents: 746 diff changeset	1041 log.info(u"The XMPP password of profile %s is wrong" % profile)
481 bbdc5357dc00 browser and server sides: refactor HTTP request result values + handle "NoReply" error souliane <souliane@mailoo.org> parents: 476 diff changeset	1042 request.write(C.XMPP_AUTH_ERROR)
bbdc5357dc00 browser and server sides: refactor HTTP request result values + handle "NoReply" error souliane <souliane@mailoo.org> parents: 476 diff changeset	1043 elif fault == 'NoReply':
bbdc5357dc00 browser and server sides: refactor HTTP request result values + handle "NoReply" error souliane <souliane@mailoo.org> parents: 476 diff changeset	1044 log.info(_("Did not receive a reply (the timeout expired or the connection is broken)"))
bbdc5357dc00 browser and server sides: refactor HTTP request result values + handle "NoReply" error souliane <souliane@mailoo.org> parents: 476 diff changeset	1045 request.write(C.NO_REPLY)
464 bea9788f3170 browser and server sides: don't handle the "connectionError" signal anymore, we now use asyncConnect errback: souliane <souliane@mailoo.org> parents: 462 diff changeset	1046 else:
793 249e49f56f67 browser and server sides: removed constant UNMANAGED_FAULT_STRING which is used only to be displayed to the user, but it doesn't mean anything to him souliane <souliane@mailoo.org> parents: 751 diff changeset	1047 log.error(u'Unmanaged fault string "%s" in errback for the connection of profile %s' % (fault, profile))
249e49f56f67 browser and server sides: removed constant UNMANAGED_FAULT_STRING which is used only to be displayed to the user, but it doesn't mean anything to him souliane <souliane@mailoo.org> parents: 751 diff changeset	1048 request.write(fault)
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1049 request.finish()
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1050
796 fad9c9f82ae3 browser and server sides: alert the user after he created a new profile using his XMPP account credentials souliane <souliane@mailoo.org> parents: 794 diff changeset	1051 self.waiting_profiles.setRequest(request, profile, register_with_ext_jid)
750 8ac862f6e5b3 browser and server sides: allow to connect with a JID that is not registered on the local server souliane <souliane@mailoo.org> parents: 746 diff changeset	1052 d = self.asyncBridgeCall(connect_method, profile, password)
8ac862f6e5b3 browser and server sides: allow to connect with a JID that is not registered on the local server souliane <souliane@mailoo.org> parents: 746 diff changeset	1053 d.addCallbacks(lambda connected: self._logged(profile, request) if connected else None, auth_eb)
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1054
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1055 def _registerNewAccount(self, request):
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1056 """Create a new account, or return error
446 c406e46fe9c0 server_side: update the connection mechanism to handle profile passwords souliane <souliane@mailoo.org> parents: 445 diff changeset	1057 @param request: request of the register form
c406e46fe9c0 server_side: update the connection mechanism to handle profile passwords souliane <souliane@mailoo.org> parents: 445 diff changeset	1058 @return: a constant indicating the state:
481 bbdc5357dc00 browser and server sides: refactor HTTP request result values + handle "NoReply" error souliane <souliane@mailoo.org> parents: 476 diff changeset	1059 - C.BAD_REQUEST: something is wrong in the request (bad arguments)
bbdc5357dc00 browser and server sides: refactor HTTP request result values + handle "NoReply" error souliane <souliane@mailoo.org> parents: 476 diff changeset	1060 - C.REGISTRATION_SUCCEED: new account has been successfully registered
bbdc5357dc00 browser and server sides: refactor HTTP request result values + handle "NoReply" error souliane <souliane@mailoo.org> parents: 476 diff changeset	1061 - C.ALREADY_EXISTS: the given profile already exists
793 249e49f56f67 browser and server sides: removed constant UNMANAGED_FAULT_STRING which is used only to be displayed to the user, but it doesn't mean anything to him souliane <souliane@mailoo.org> parents: 751 diff changeset	1062 - C.INTERNAL_ERROR or any unmanaged fault string
446 c406e46fe9c0 server_side: update the connection mechanism to handle profile passwords souliane <souliane@mailoo.org> parents: 445 diff changeset	1063 - server.NOT_DONE_YET: the profile is being processed, the return
c406e46fe9c0 server_side: update the connection mechanism to handle profile passwords souliane <souliane@mailoo.org> parents: 445 diff changeset	1064 value will be given later (one of those previously described)
c406e46fe9c0 server_side: update the connection mechanism to handle profile passwords souliane <souliane@mailoo.org> parents: 445 diff changeset	1065 """
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1066 try:
487 e588335b6aa8 browser and server side: force lower case for the profile name at new account creation + fixes CSS for textarea souliane <souliane@mailoo.org> parents: 482 diff changeset	1067 # XXX: for now libervia forces the creation to lower case
e588335b6aa8 browser and server side: force lower case for the profile name at new account creation + fixes CSS for textarea souliane <souliane@mailoo.org> parents: 482 diff changeset	1068 profile = login = request.args['register_login'][0].lower()
446 c406e46fe9c0 server_side: update the connection mechanism to handle profile passwords souliane <souliane@mailoo.org> parents: 445 diff changeset	1069 password = request.args['register_password'][0]
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1070 email = request.args['email'][0]
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1071 except KeyError:
481 bbdc5357dc00 browser and server sides: refactor HTTP request result values + handle "NoReply" error souliane <souliane@mailoo.org> parents: 476 diff changeset	1072 return C.BAD_REQUEST
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1073 if not re.match(r'^[a-z0-9_-]+$', login, re.IGNORECASE) or \
445 c0ff91cabea0 server_side, browser_side: new account password must contain at least 6 chars + cosmetic change for register warning message souliane <souliane@mailoo.org> parents: 444 diff changeset	1074 not re.match(r'^.+@.+\..+', email, re.IGNORECASE) or \
c0ff91cabea0 server_side, browser_side: new account password must contain at least 6 chars + cosmetic change for register warning message souliane <souliane@mailoo.org> parents: 444 diff changeset	1075 len(password) < C.PASSWORD_MIN_LENGTH:
481 bbdc5357dc00 browser and server sides: refactor HTTP request result values + handle "NoReply" error souliane <souliane@mailoo.org> parents: 476 diff changeset	1076 return C.BAD_REQUEST
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1077
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1078 def registered(result):
481 bbdc5357dc00 browser and server sides: refactor HTTP request result values + handle "NoReply" error souliane <souliane@mailoo.org> parents: 476 diff changeset	1079 request.write(C.REGISTRATION_SUCCEED)
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1080 request.finish()
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1081
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1082 def registeringError(failure):
374 f22a4bf9a67e server_side: fix error management at account creation souliane <souliane@mailoo.org> parents: 351 diff changeset	1083 reason = failure.value.faultString
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1084 if reason == "ConflictError":
481 bbdc5357dc00 browser and server sides: refactor HTTP request result values + handle "NoReply" error souliane <souliane@mailoo.org> parents: 476 diff changeset	1085 request.write(C.ALREADY_EXISTS)
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1086 elif reason == "InternalError":
481 bbdc5357dc00 browser and server sides: refactor HTTP request result values + handle "NoReply" error souliane <souliane@mailoo.org> parents: 476 diff changeset	1087 request.write(C.INTERNAL_ERROR)
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1088 else:
694 82123705474b massive (preventive) addition of 'u' (unicode) before the strings passed to logging functions souliane <souliane@mailoo.org> parents: 692 diff changeset	1089 log.error(u'Unknown registering error: %s' % (reason,))
793 249e49f56f67 browser and server sides: removed constant UNMANAGED_FAULT_STRING which is used only to be displayed to the user, but it doesn't mean anything to him souliane <souliane@mailoo.org> parents: 751 diff changeset	1090 request.write(reason)
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1091 request.finish()
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1092
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1093 d = self.asyncBridgeCall("registerSatAccount", email, password, profile)
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1094 d.addCallback(registered)
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1095 d.addErrback(registeringError)
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1096 return server.NOT_DONE_YET
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1097
446 c406e46fe9c0 server_side: update the connection mechanism to handle profile passwords souliane <souliane@mailoo.org> parents: 445 diff changeset	1098 def _logged(self, profile, request):
c406e46fe9c0 server_side: update the connection mechanism to handle profile passwords souliane <souliane@mailoo.org> parents: 445 diff changeset	1099 """Set everything when a user just logged in
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1100
446 c406e46fe9c0 server_side: update the connection mechanism to handle profile passwords souliane <souliane@mailoo.org> parents: 445 diff changeset	1101 @param profile
c406e46fe9c0 server_side: update the connection mechanism to handle profile passwords souliane <souliane@mailoo.org> parents: 445 diff changeset	1102 @param request
c406e46fe9c0 server_side: update the connection mechanism to handle profile passwords souliane <souliane@mailoo.org> parents: 445 diff changeset	1103 @return: a constant indicating the state:
481 bbdc5357dc00 browser and server sides: refactor HTTP request result values + handle "NoReply" error souliane <souliane@mailoo.org> parents: 476 diff changeset	1104 - C.PROFILE_LOGGED
bbdc5357dc00 browser and server sides: refactor HTTP request result values + handle "NoReply" error souliane <souliane@mailoo.org> parents: 476 diff changeset	1105 - C.SESSION_ACTIVE
446 c406e46fe9c0 server_side: update the connection mechanism to handle profile passwords souliane <souliane@mailoo.org> parents: 445 diff changeset	1106 """
796 fad9c9f82ae3 browser and server sides: alert the user after he created a new profile using his XMPP account credentials souliane <souliane@mailoo.org> parents: 794 diff changeset	1107 register_with_ext_jid = self.waiting_profiles.getRegisterWithExtJid(profile)
554 471b6babe960 server_side: set a timeout to reset the waiting connection requests after 5 minutes souliane <souliane@mailoo.org> parents: 553 diff changeset	1108 self.waiting_profiles.purgeRequest(profile)
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1109 _session = request.getSession()
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	1110 sat_session = session_iface.ISATSession(_session)
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1111 if sat_session.profile:
914 0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1112 log.error(_(u'/!\\ Session has already a profile, this should NEVER happen!'))
481 bbdc5357dc00 browser and server sides: refactor HTTP request result values + handle "NoReply" error souliane <souliane@mailoo.org> parents: 476 diff changeset	1113 request.write(C.SESSION_ACTIVE)
446 c406e46fe9c0 server_side: update the connection mechanism to handle profile passwords souliane <souliane@mailoo.org> parents: 445 diff changeset	1114 request.finish()
c406e46fe9c0 server_side: update the connection mechanism to handle profile passwords souliane <souliane@mailoo.org> parents: 445 diff changeset	1115 return
589 a5019e62c3e9 browser side: big refactoring to base Libervia on QuickFrontend, first draft: Goffi <goffi@goffi.org> parents: 566 diff changeset	1116 # we manage profile server side to avoid profile spoofing
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1117 sat_session.profile = profile
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1118 self.sat_host.prof_connected.add(profile)
914 0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1119 cache_dir = os.path.join(self.sat_host.cache_root_dir, regex.pathEscape(profile))
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1120 # FIXME: would be better to have a global /cache URL which redirect to profile's cache directory, without uuid
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1121 self.sat_host.cache_resource.putChild(sat_session.uuid, ProtectedFile(cache_dir))
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1122 log.debug(_(u"profile cache resource added from {uuid} to {path}").format(uuid=sat_session.uuid, path=cache_dir))
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1123
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1124 def onExpire():
694 82123705474b massive (preventive) addition of 'u' (unicode) before the strings passed to logging functions souliane <souliane@mailoo.org> parents: 692 diff changeset	1125 log.info(u"Session expired (profile=%s)" % (profile,))
914 0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1126 self.sat_host.cache_resource.delEntity(sat_session.uuid)
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1127 log.debug(_(u"profile cache resource {uuid} deleted").format(uuid = sat_session.uuid))
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1128 try:
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1129 #We purge the queue
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1130 del self.sat_host.signal_handler.queue[profile]
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1131 except KeyError:
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1132 pass
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1133 #and now we disconnect the profile
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1134 self.sat_host.bridge.disconnect(profile)
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1135
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1136 _session.notifyOnExpire(onExpire)
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1137
796 fad9c9f82ae3 browser and server sides: alert the user after he created a new profile using his XMPP account credentials souliane <souliane@mailoo.org> parents: 794 diff changeset	1138 request.write(C.PROFILE_LOGGED_REGISTERED_WITH_EXT_JID if register_with_ext_jid else C.PROFILE_LOGGED)
446 c406e46fe9c0 server_side: update the connection mechanism to handle profile passwords souliane <souliane@mailoo.org> parents: 445 diff changeset	1139 request.finish()
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1140
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1141 def jsonrpc_isConnected(self):
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1142 _session = self.request.getSession()
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	1143 profile = session_iface.ISATSession(_session).profile
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1144 return self.sat_host.bridge.isConnected(profile)
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1145
914 0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1146 def jsonrpc_connect(self):
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1147 _session = self.request.getSession()
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	1148 profile = session_iface.ISATSession(_session).profile
554 471b6babe960 server_side: set a timeout to reset the waiting connection requests after 5 minutes souliane <souliane@mailoo.org> parents: 553 diff changeset	1149 if self.waiting_profiles.getRequest(profile):
481 bbdc5357dc00 browser and server sides: refactor HTTP request result values + handle "NoReply" error souliane <souliane@mailoo.org> parents: 476 diff changeset	1150 raise jsonrpclib.Fault(1, C.ALREADY_WAITING) # FIXME: define some standard error codes for libervia
554 471b6babe960 server_side: set a timeout to reset the waiting connection requests after 5 minutes souliane <souliane@mailoo.org> parents: 553 diff changeset	1151 self.waiting_profiles.setRequest(self.request, profile)
914 0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1152 self.sat_host.bridge.connect(profile)
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1153 return server.NOT_DONE_YET
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1154
869 fa7703642c0e server, browser: replaced isRegistered call by a more generic getSessionMetadata which return a dictionary Goffi <goffi@goffi.org> parents: 867 diff changeset	1155 def jsonrpc_getSessionMetadata(self):
fa7703642c0e server, browser: replaced isRegistered call by a more generic getSessionMetadata which return a dictionary Goffi <goffi@goffi.org> parents: 867 diff changeset	1156 """Return metadata useful on session start
fa7703642c0e server, browser: replaced isRegistered call by a more generic getSessionMetadata which return a dictionary Goffi <goffi@goffi.org> parents: 867 diff changeset	1157
fa7703642c0e server, browser: replaced isRegistered call by a more generic getSessionMetadata which return a dictionary Goffi <goffi@goffi.org> parents: 867 diff changeset	1158 @return (dict): metadata which can have the following keys:
fa7703642c0e server, browser: replaced isRegistered call by a more generic getSessionMetadata which return a dictionary Goffi <goffi@goffi.org> parents: 867 diff changeset	1159 "plugged" (bool): True if a profile is already plugged
fa7703642c0e server, browser: replaced isRegistered call by a more generic getSessionMetadata which return a dictionary Goffi <goffi@goffi.org> parents: 867 diff changeset	1160 "warning" (unicode): a security warning message if plugged is False and if it make sense
fa7703642c0e server, browser: replaced isRegistered call by a more generic getSessionMetadata which return a dictionary Goffi <goffi@goffi.org> parents: 867 diff changeset	1161 this key may not be present
871 54f6c5b86a87 server, browser: new "allow_registration" option to enable/disable new account registration through Liberia interface Goffi <goffi@goffi.org> parents: 869 diff changeset	1162 "allow_registration" (bool): True if registration is allowed
54f6c5b86a87 server, browser: new "allow_registration" option to enable/disable new account registration through Liberia interface Goffi <goffi@goffi.org> parents: 869 diff changeset	1163 this key is only present if profile is unplugged
415 fadbba1d793f server_side: added support for SSL and related parameters: souliane <souliane@mailoo.org> parents: 413 diff changeset	1164 @return: a couple (registered, message) with:
869 fa7703642c0e server, browser: replaced isRegistered call by a more generic getSessionMetadata which return a dictionary Goffi <goffi@goffi.org> parents: 867 diff changeset	1165 - registered:
fa7703642c0e server, browser: replaced isRegistered call by a more generic getSessionMetadata which return a dictionary Goffi <goffi@goffi.org> parents: 867 diff changeset	1166 - message:
415 fadbba1d793f server_side: added support for SSL and related parameters: souliane <souliane@mailoo.org> parents: 413 diff changeset	1167 """
869 fa7703642c0e server, browser: replaced isRegistered call by a more generic getSessionMetadata which return a dictionary Goffi <goffi@goffi.org> parents: 867 diff changeset	1168 metadata = {}
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1169 _session = self.request.getSession()
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	1170 profile = session_iface.ISATSession(_session).profile
869 fa7703642c0e server, browser: replaced isRegistered call by a more generic getSessionMetadata which return a dictionary Goffi <goffi@goffi.org> parents: 867 diff changeset	1171 if profile:
fa7703642c0e server, browser: replaced isRegistered call by a more generic getSessionMetadata which return a dictionary Goffi <goffi@goffi.org> parents: 867 diff changeset	1172 metadata["plugged"] = True
fa7703642c0e server, browser: replaced isRegistered call by a more generic getSessionMetadata which return a dictionary Goffi <goffi@goffi.org> parents: 867 diff changeset	1173 else:
fa7703642c0e server, browser: replaced isRegistered call by a more generic getSessionMetadata which return a dictionary Goffi <goffi@goffi.org> parents: 867 diff changeset	1174 metadata["plugged"] = False
fa7703642c0e server, browser: replaced isRegistered call by a more generic getSessionMetadata which return a dictionary Goffi <goffi@goffi.org> parents: 867 diff changeset	1175 metadata["warning"] = self._getSecurityWarning()
871 54f6c5b86a87 server, browser: new "allow_registration" option to enable/disable new account registration through Liberia interface Goffi <goffi@goffi.org> parents: 869 diff changeset	1176 metadata["allow_registration"] = self.sat_host.options["allow_registration"]
869 fa7703642c0e server, browser: replaced isRegistered call by a more generic getSessionMetadata which return a dictionary Goffi <goffi@goffi.org> parents: 867 diff changeset	1177 return metadata
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1178
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1179 def jsonrpc_registerParams(self):
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1180 """Register the frontend specific parameters"""
696 c2f22ca12e23 browser and server side: remove unibox souliane <souliane@mailoo.org> parents: 694 diff changeset	1181 # params = """<params><individual>...</category></individual>"""
c2f22ca12e23 browser and server side: remove unibox souliane <souliane@mailoo.org> parents: 694 diff changeset	1182 # self.sat_host.bridge.paramsRegisterApp(params, C.SECURITY_LIMIT, C.APP_NAME)
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1183
914 0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1184 def jsonrpc_menusGet(self):
336 629c99bbd031 browser + server side: refactored menus: Goffi <goffi@goffi.org> parents: 333 diff changeset	1185 """Return the parameters XML for profile"""
629c99bbd031 browser + server side: refactored menus: Goffi <goffi@goffi.org> parents: 333 diff changeset	1186 # XXX: we put this method in Register because we get menus before being logged
914 0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1187 return self.sat_host.bridge.menusGet('', C.SECURITY_LIMIT)
336 629c99bbd031 browser + server side: refactored menus: Goffi <goffi@goffi.org> parents: 333 diff changeset	1188
819 9b9c0fe0a75f server: fixed bad login check introduced in rev 6a2fd7807770 Goffi <goffi@goffi.org> parents: 818 diff changeset	1189 def _getSecurityWarning(self):
415 fadbba1d793f server_side: added support for SSL and related parameters: souliane <souliane@mailoo.org> parents: 413 diff changeset	1190 """@return: a security warning message, or None if the connection is secure"""
810 3905bc24eb17 server: proper options handling Goffi <goffi@goffi.org> parents: 801 diff changeset	1191 if self.request.URLPath().scheme == 'https' or not self.sat_host.options['security_warning']:
415 fadbba1d793f server_side: added support for SSL and related parameters: souliane <souliane@mailoo.org> parents: 413 diff changeset	1192 return None
707 dfe4b0291daa server_side: remove unwanted "target" property in the HTTP to HTTPS link + use "<p>" instead of "<br>" souliane <souliane@mailoo.org> parents: 706 diff changeset	1193 text = "<p>" + D_("You are about to connect to an unsecure service.") + "</p><p> </p><p>"
dfe4b0291daa server_side: remove unwanted "target" property in the HTTP to HTTPS link + use "<p>" instead of "<br>" souliane <souliane@mailoo.org> parents: 706 diff changeset	1194
810 3905bc24eb17 server: proper options handling Goffi <goffi@goffi.org> parents: 801 diff changeset	1195 if self.sat_host.options['connection_type'] == 'both':
3905bc24eb17 server: proper options handling Goffi <goffi@goffi.org> parents: 801 diff changeset	1196 new_port = (':%s' % self.sat_host.options['port_https_ext']) if self.sat_host.options['port_https_ext'] != HTTPS_PORT else ''
3905bc24eb17 server: proper options handling Goffi <goffi@goffi.org> parents: 801 diff changeset	1197 url = "https://%s" % self.request.URLPath().netloc.replace(':%s' % self.sat_host.options['port'], new_port)
707 dfe4b0291daa server_side: remove unwanted "target" property in the HTTP to HTTPS link + use "<p>" instead of "<br>" souliane <souliane@mailoo.org> parents: 706 diff changeset	1198 text += D_('Please read our %(faq_prefix)ssecurity notice%(faq_suffix)s regarding HTTPS') % {'faq_prefix': '<a href="http://salut-a-toi.org/faq.html#https" target="#">', 'faq_suffix': '</a>'}
dfe4b0291daa server_side: remove unwanted "target" property in the HTTP to HTTPS link + use "<p>" instead of "<br>" souliane <souliane@mailoo.org> parents: 706 diff changeset	1199 text += "</p><p>" + D_('and use the secure version of this website:')
dfe4b0291daa server_side: remove unwanted "target" property in the HTTP to HTTPS link + use "<p>" instead of "<br>" souliane <souliane@mailoo.org> parents: 706 diff changeset	1200 text += '</p><p> </p><p align="center"><a href="%(url)s">%(url)s</a>' % {'url': url}
706 fe03637fe5a6 server_side: add a link to the FAQ in the HTTP/HTTPS warning dialog souliane <souliane@mailoo.org> parents: 705 diff changeset	1201 else:
841 4a01be961fd2 server: removed unused %(url)s for formatting HTTP warning message Goffi <goffi@goffi.org> parents: 823 diff changeset	1202 text += D_('You should ask your administrator to turn on HTTPS.')
707 dfe4b0291daa server_side: remove unwanted "target" property in the HTTP to HTTPS link + use "<p>" instead of "<br>" souliane <souliane@mailoo.org> parents: 706 diff changeset	1203
dfe4b0291daa server_side: remove unwanted "target" property in the HTTP to HTTPS link + use "<p>" instead of "<br>" souliane <souliane@mailoo.org> parents: 706 diff changeset	1204 return text + "</p><p> </p>"
415 fadbba1d793f server_side: added support for SSL and related parameters: souliane <souliane@mailoo.org> parents: 413 diff changeset	1205
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1206
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1207 class SignalHandler(jsonrpc.JSONRPC):
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1208
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1209 def __init__(self, sat_host):
858 7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	1210 web_resource.Resource.__init__(self)
451 1a0cec9b0f1e better PEP-8 compliance souliane <souliane@mailoo.org> parents: 449 diff changeset	1211 self.register = None
1a0cec9b0f1e better PEP-8 compliance souliane <souliane@mailoo.org> parents: 449 diff changeset	1212 self.sat_host = sat_host
744 03ccd68a6dab server side: actionNew now use a dedicated signal handler, which block it if security limit is exceeded Goffi <goffi@goffi.org> parents: 724 diff changeset	1213 self.signalDeferred = {} # dict of deferred (key: profile, value: Deferred)
03ccd68a6dab server side: actionNew now use a dedicated signal handler, which block it if security limit is exceeded Goffi <goffi@goffi.org> parents: 724 diff changeset	1214 # which manages the long polling HTTP request with signals
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1215 self.queue = {}
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1216
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1217 def plugRegister(self, register):
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1218 self.register = register
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1219
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1220 def jsonrpc_getSignals(self):
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1221 """Keep the connection alive until a signal is received, then send it
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1222 @return: (signal, *signal_args)"""
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1223 _session = self.request.getSession()
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	1224 profile = session_iface.ISATSession(_session).profile
451 1a0cec9b0f1e better PEP-8 compliance souliane <souliane@mailoo.org> parents: 449 diff changeset	1225 if profile in self.queue: # if we have signals to send in queue
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1226 if self.queue[profile]:
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1227 return self.queue[profile].pop(0)
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1228 else:
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1229 #the queue is empty, we delete the profile from queue
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1230 del self.queue[profile]
451 1a0cec9b0f1e better PEP-8 compliance souliane <souliane@mailoo.org> parents: 449 diff changeset	1231 _session.lock() # we don't want the session to expire as long as this connection is active
1a0cec9b0f1e better PEP-8 compliance souliane <souliane@mailoo.org> parents: 449 diff changeset	1232
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1233 def unlock(signal, profile):
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1234 _session.unlock()
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1235 try:
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1236 source_defer = self.signalDeferred[profile]
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1237 if source_defer.called and source_defer.result[0] == "disconnected":
438 582c435dab6b server side: new log system is used Goffi <goffi@goffi.org> parents: 435 diff changeset	1238 log.info(u"[%s] disconnected" % (profile,))
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1239 _session.expire()
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1240 except IndexError:
438 582c435dab6b server side: new log system is used Goffi <goffi@goffi.org> parents: 435 diff changeset	1241 log.error("Deferred result should be a tuple with fonction name first")
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1242
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1243 self.signalDeferred[profile] = defer.Deferred()
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1244 self.request.notifyFinish().addBoth(unlock, profile)
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1245 return self.signalDeferred[profile]
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1246
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1247 def getGenericCb(self, function_name):
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1248 """Return a generic function which send all params to signalDeferred.callback
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1249 function must have profile as last argument"""
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1250 def genericCb(*args):
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1251 profile = args[-1]
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1252 if not profile in self.sat_host.prof_connected:
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1253 return
744 03ccd68a6dab server side: actionNew now use a dedicated signal handler, which block it if security limit is exceeded Goffi <goffi@goffi.org> parents: 724 diff changeset	1254 signal_data = (function_name, args[:-1])
03ccd68a6dab server side: actionNew now use a dedicated signal handler, which block it if security limit is exceeded Goffi <goffi@goffi.org> parents: 724 diff changeset	1255 try:
03ccd68a6dab server side: actionNew now use a dedicated signal handler, which block it if security limit is exceeded Goffi <goffi@goffi.org> parents: 724 diff changeset	1256 signal_callback = self.signalDeferred[profile].callback
03ccd68a6dab server side: actionNew now use a dedicated signal handler, which block it if security limit is exceeded Goffi <goffi@goffi.org> parents: 724 diff changeset	1257 except KeyError:
03ccd68a6dab server side: actionNew now use a dedicated signal handler, which block it if security limit is exceeded Goffi <goffi@goffi.org> parents: 724 diff changeset	1258 self.queue.setdefault(profile,[]).append(signal_data)
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1259 else:
744 03ccd68a6dab server side: actionNew now use a dedicated signal handler, which block it if security limit is exceeded Goffi <goffi@goffi.org> parents: 724 diff changeset	1260 signal_callback(signal_data)
03ccd68a6dab server side: actionNew now use a dedicated signal handler, which block it if security limit is exceeded Goffi <goffi@goffi.org> parents: 724 diff changeset	1261 del self.signalDeferred[profile]
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1262 return genericCb
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1263
744 03ccd68a6dab server side: actionNew now use a dedicated signal handler, which block it if security limit is exceeded Goffi <goffi@goffi.org> parents: 724 diff changeset	1264 def actionNewHandler(self, action_data, action_id, security_limit, profile):
03ccd68a6dab server side: actionNew now use a dedicated signal handler, which block it if security limit is exceeded Goffi <goffi@goffi.org> parents: 724 diff changeset	1265 """actionNew handler
03ccd68a6dab server side: actionNew now use a dedicated signal handler, which block it if security limit is exceeded Goffi <goffi@goffi.org> parents: 724 diff changeset	1266
03ccd68a6dab server side: actionNew now use a dedicated signal handler, which block it if security limit is exceeded Goffi <goffi@goffi.org> parents: 724 diff changeset	1267 XXX: We need need a dedicated handler has actionNew use a security_limit which must be managed
03ccd68a6dab server side: actionNew now use a dedicated signal handler, which block it if security limit is exceeded Goffi <goffi@goffi.org> parents: 724 diff changeset	1268 @param action_data(dict): see bridge documentation
03ccd68a6dab server side: actionNew now use a dedicated signal handler, which block it if security limit is exceeded Goffi <goffi@goffi.org> parents: 724 diff changeset	1269 @param action_id(unicode): identitifer of the action
03ccd68a6dab server side: actionNew now use a dedicated signal handler, which block it if security limit is exceeded Goffi <goffi@goffi.org> parents: 724 diff changeset	1270 @param security_limit(int): %(doc_security_limit)s
03ccd68a6dab server side: actionNew now use a dedicated signal handler, which block it if security limit is exceeded Goffi <goffi@goffi.org> parents: 724 diff changeset	1271 @param profile(unicode): %(doc_profile)s
03ccd68a6dab server side: actionNew now use a dedicated signal handler, which block it if security limit is exceeded Goffi <goffi@goffi.org> parents: 724 diff changeset	1272 """
03ccd68a6dab server side: actionNew now use a dedicated signal handler, which block it if security limit is exceeded Goffi <goffi@goffi.org> parents: 724 diff changeset	1273 if not profile in self.sat_host.prof_connected:
03ccd68a6dab server side: actionNew now use a dedicated signal handler, which block it if security limit is exceeded Goffi <goffi@goffi.org> parents: 724 diff changeset	1274 return
796 fad9c9f82ae3 browser and server sides: alert the user after he created a new profile using his XMPP account credentials souliane <souliane@mailoo.org> parents: 794 diff changeset	1275 # FIXME: manage security limit in a dedicated method
fad9c9f82ae3 browser and server sides: alert the user after he created a new profile using his XMPP account credentials souliane <souliane@mailoo.org> parents: 794 diff changeset	1276 # raise an exception if it's not OK
fad9c9f82ae3 browser and server sides: alert the user after he created a new profile using his XMPP account credentials souliane <souliane@mailoo.org> parents: 794 diff changeset	1277 # and read value in sat.conf
744 03ccd68a6dab server side: actionNew now use a dedicated signal handler, which block it if security limit is exceeded Goffi <goffi@goffi.org> parents: 724 diff changeset	1278 if security_limit >= C.SECURITY_LIMIT:
03ccd68a6dab server side: actionNew now use a dedicated signal handler, which block it if security limit is exceeded Goffi <goffi@goffi.org> parents: 724 diff changeset	1279 log.debug(u"Ignoring action {action_id}, blocked by security limit".format(action_id=action_id))
03ccd68a6dab server side: actionNew now use a dedicated signal handler, which block it if security limit is exceeded Goffi <goffi@goffi.org> parents: 724 diff changeset	1280 return
03ccd68a6dab server side: actionNew now use a dedicated signal handler, which block it if security limit is exceeded Goffi <goffi@goffi.org> parents: 724 diff changeset	1281 signal_data = ("actionNew", (action_data, action_id, security_limit))
03ccd68a6dab server side: actionNew now use a dedicated signal handler, which block it if security limit is exceeded Goffi <goffi@goffi.org> parents: 724 diff changeset	1282 try:
03ccd68a6dab server side: actionNew now use a dedicated signal handler, which block it if security limit is exceeded Goffi <goffi@goffi.org> parents: 724 diff changeset	1283 signal_callback = self.signalDeferred[profile].callback
03ccd68a6dab server side: actionNew now use a dedicated signal handler, which block it if security limit is exceeded Goffi <goffi@goffi.org> parents: 724 diff changeset	1284 except KeyError:
03ccd68a6dab server side: actionNew now use a dedicated signal handler, which block it if security limit is exceeded Goffi <goffi@goffi.org> parents: 724 diff changeset	1285 self.queue.setdefault(profile,[]).append(signal_data)
03ccd68a6dab server side: actionNew now use a dedicated signal handler, which block it if security limit is exceeded Goffi <goffi@goffi.org> parents: 724 diff changeset	1286 else:
03ccd68a6dab server side: actionNew now use a dedicated signal handler, which block it if security limit is exceeded Goffi <goffi@goffi.org> parents: 724 diff changeset	1287 signal_callback(signal_data)
03ccd68a6dab server side: actionNew now use a dedicated signal handler, which block it if security limit is exceeded Goffi <goffi@goffi.org> parents: 724 diff changeset	1288 del self.signalDeferred[profile]
03ccd68a6dab server side: actionNew now use a dedicated signal handler, which block it if security limit is exceeded Goffi <goffi@goffi.org> parents: 724 diff changeset	1289
710 df8cb7bedfbf server_side: update connected signal handler according to sat changeset 1435 (7590bbf44eed) souliane <souliane@mailoo.org> parents: 707 diff changeset	1290 def connected(self, profile, jid_s):
df8cb7bedfbf server_side: update connected signal handler according to sat changeset 1435 (7590bbf44eed) souliane <souliane@mailoo.org> parents: 707 diff changeset	1291 """Connection is done.
df8cb7bedfbf server_side: update connected signal handler according to sat changeset 1435 (7590bbf44eed) souliane <souliane@mailoo.org> parents: 707 diff changeset	1292
df8cb7bedfbf server_side: update connected signal handler according to sat changeset 1435 (7590bbf44eed) souliane <souliane@mailoo.org> parents: 707 diff changeset	1293 @param profile (unicode): %(doc_profile)s
df8cb7bedfbf server_side: update connected signal handler according to sat changeset 1435 (7590bbf44eed) souliane <souliane@mailoo.org> parents: 707 diff changeset	1294 @param jid_s (unicode): the JID that we were assigned by the server, as the resource might differ from the JID we asked for.
df8cb7bedfbf server_side: update connected signal handler according to sat changeset 1435 (7590bbf44eed) souliane <souliane@mailoo.org> parents: 707 diff changeset	1295 """
df8cb7bedfbf server_side: update connected signal handler according to sat changeset 1435 (7590bbf44eed) souliane <souliane@mailoo.org> parents: 707 diff changeset	1296 # jid_s is handled in QuickApp.connectionHandler already
446 c406e46fe9c0 server_side: update the connection mechanism to handle profile passwords souliane <souliane@mailoo.org> parents: 445 diff changeset	1297 assert(self.register) # register must be plugged
554 471b6babe960 server_side: set a timeout to reset the waiting connection requests after 5 minutes souliane <souliane@mailoo.org> parents: 553 diff changeset	1298 request = self.register.waiting_profiles.getRequest(profile)
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1299 if request:
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1300 self.register._logged(profile, request)
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1301
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1302 def disconnected(self, profile):
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1303 if not profile in self.sat_host.prof_connected:
438 582c435dab6b server side: new log system is used Goffi <goffi@goffi.org> parents: 435 diff changeset	1304 log.error("'disconnected' signal received for a not connected profile")
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1305 return
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1306 self.sat_host.prof_connected.remove(profile)
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1307 if profile in self.signalDeferred:
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1308 self.signalDeferred[profile].callback(("disconnected",))
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1309 del self.signalDeferred[profile]
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1310 else:
451 1a0cec9b0f1e better PEP-8 compliance souliane <souliane@mailoo.org> parents: 449 diff changeset	1311 if profile not in self.queue:
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1312 self.queue[profile] = []
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1313 self.queue[profile].append(("disconnected",))
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1314
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1315 def render(self, request):
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1316 """
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1317 Render method wich reject access if user is not identified
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1318 """
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1319 _session = request.getSession()
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1320 parsed = jsonrpclib.loads(request.content.read())
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	1321 profile = session_iface.ISATSession(_session).profile
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1322 if not profile:
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1323 #user is not identified, we return a jsonrpc fault
481 bbdc5357dc00 browser and server sides: refactor HTTP request result values + handle "NoReply" error souliane <souliane@mailoo.org> parents: 476 diff changeset	1324 fault = jsonrpclib.Fault(C.ERRNUM_LIBERVIA, C.NOT_ALLOWED) # FIXME: define some standard error codes for libervia
482 437eefa53a01 misc: remove some pylint errors and warnings souliane <souliane@mailoo.org> parents: 481 diff changeset	1325 return jsonrpc.JSONRPC._cbRender(self, fault, request, parsed.get('id'), parsed.get('jsonrpc')) # pylint: disable=E1103
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1326 self.request = request
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1327 return jsonrpc.JSONRPC.render(self, request)
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1328
451 1a0cec9b0f1e better PEP-8 compliance souliane <souliane@mailoo.org> parents: 449 diff changeset	1329
858 7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	1330 class UploadManager(web_resource.Resource):
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1331 """This class manage the upload of a file
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1332 It redirect the stream to SàT core backend"""
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1333 isLeaf = True
451 1a0cec9b0f1e better PEP-8 compliance souliane <souliane@mailoo.org> parents: 449 diff changeset	1334 NAME = 'path' # name use by the FileUpload
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1335
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1336 def __init__(self, sat_host):
451 1a0cec9b0f1e better PEP-8 compliance souliane <souliane@mailoo.org> parents: 449 diff changeset	1337 self.sat_host = sat_host
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1338 self.upload_dir = tempfile.mkdtemp()
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1339 self.sat_host.addCleanup(shutil.rmtree, self.upload_dir)
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1340
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1341 def getTmpDir(self):
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1342 return self.upload_dir
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1343
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1344 def _getFileName(self, request):
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1345 """Generate unique filename for a file"""
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1346 raise NotImplementedError
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1347
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1348 def _fileWritten(self, request, filepath):
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1349 """Called once the file is actually written on disk
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1350 @param request: HTTP request object
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1351 @param filepath: full filepath on the server
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1352 @return: a tuple with the name of the async bridge method
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1353 to be called followed by its arguments.
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1354 """
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1355 raise NotImplementedError
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1356
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1357 def render(self, request):
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1358 """
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1359 Render method with some hacks:
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1360 - if login is requested, try to login with form data
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1361 - except login, every method is jsonrpc
869 fa7703642c0e server, browser: replaced isRegistered call by a more generic getSessionMetadata which return a dictionary Goffi <goffi@goffi.org> parents: 867 diff changeset	1362 - user doesn't need to be authentified for getSessionMetadata, but must be for all other methods
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1363 """
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1364 filename = self._getFileName(request)
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1365 filepath = os.path.join(self.upload_dir, filename)
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1366 #FIXME: the uploaded file is fully loaded in memory at form parsing time so far
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1367 # (see twisted.web.http.Request.requestReceived). A custom requestReceived should
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1368 # be written in the futur. In addition, it is not yet possible to get progression informations
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1369 # (see http://twistedmatrix.com/trac/ticket/288)
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1370
451 1a0cec9b0f1e better PEP-8 compliance souliane <souliane@mailoo.org> parents: 449 diff changeset	1371 with open(filepath, 'w') as f:
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1372 f.write(request.args[self.NAME][0])
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1373
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1374 def finish(d):
917 86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1375 error = isinstance(d, Exception) or isinstance(d, failure.Failure)
481 bbdc5357dc00 browser and server sides: refactor HTTP request result values + handle "NoReply" error souliane <souliane@mailoo.org> parents: 476 diff changeset	1376 request.write(C.UPLOAD_KO if error else C.UPLOAD_OK)
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1377 # TODO: would be great to re-use the original Exception class and message
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1378 # but it is lost in the middle of the backtrace and encapsulated within
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1379 # a DBusException instance --> extract the data from the backtrace?
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1380 request.finish()
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1381
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1382 d = JSONRPCMethodManager(self.sat_host).asyncBridgeCall(*self._fileWritten(request, filepath))
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1383 d.addCallbacks(lambda d: finish(d), lambda failure: finish(failure))
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1384 return server.NOT_DONE_YET
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1385
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1386
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1387 class UploadManagerRadioCol(UploadManager):
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1388 NAME = 'song'
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1389
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1390 def _getFileName(self, request):
394 ee61b0765d6c browser_side: radiocol supports MP3 souliane <souliane@mailoo.org> parents: 391 diff changeset	1391 extension = os.path.splitext(request.args['filename'][0])[1]
ee61b0765d6c browser_side: radiocol supports MP3 souliane <souliane@mailoo.org> parents: 391 diff changeset	1392 return "%s%s" % (str(uuid.uuid4()), extension) # XXX: chromium doesn't seem to play song without the .ogg extension, even with audio/ogg mime-type
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1393
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1394 def _fileWritten(self, request, filepath):
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1395 """Called once the file is actually written on disk
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1396 @param request: HTTP request object
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1397 @param filepath: full filepath on the server
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1398 @return: a tuple with the name of the async bridge method
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1399 to be called followed by its arguments.
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1400 """
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	1401 profile = session_iface.ISATSession(request.getSession()).profile
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1402 return ("radiocolSongAdded", request.args['referee'][0], filepath, profile)
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1403
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1404
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1405 class UploadManagerAvatar(UploadManager):
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1406 NAME = 'avatar_path'
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1407
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1408 def _getFileName(self, request):
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1409 return str(uuid.uuid4())
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1410
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1411 def _fileWritten(self, request, filepath):
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1412 """Called once the file is actually written on disk
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1413 @param request: HTTP request object
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1414 @param filepath: full filepath on the server
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1415 @return: a tuple with the name of the async bridge method
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1416 to be called followed by its arguments.
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1417 """
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	1418 profile = session_iface.ISATSession(request.getSession()).profile
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1419 return ("setAvatar", filepath, profile)
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1420
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1421
917 86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1422 class LiberviaPage(web_resource.Resource):
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1423 isLeaf = True # we handle subpages ourself
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1424 named_pages = {}
925 e00151140f77 server (pages): URIs handling: Goffi <goffi@goffi.org> parents: 924 diff changeset	1425 uri_callbacks = {}
917 86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1426
923 edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1427 def __init__(self, host, root_dir, name=None, redirect=None, access=None, parse_url=None,
917 86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1428 prepare_render=None, render=None, template=None):
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1429 """initiate LiberviaPages
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1430
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1431 LiberviaPages are the main resources of Libervia, using easy to set python files
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1432 The arguments are the variables found in page_meta.py
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1433 @param host(Libervia): the running instance of Libervia
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1434 @param root_dir(unicode): aboslute path of the page
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1435 @param name(unicode, None): if not None, a unique name to identify the page
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1436 can then be used for e.g. redirection
923 edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1437 "/" is not allowed in names (as it can be used to construct URL paths)
edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1438 @param redirect(unicode, None): if not None, this page will be a redirected
edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1439 parameter is used as in self.pageRedirect. parse_url will not be skipped
edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1440 using this redirect parameter is called "full redirection"
edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1441 using self.pageRedirect is called "partial redirection" (because some rendering method
edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1442 can still be used, e.g. parse_url)
917 86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1443 @param access(unicode, None): permission needed to access the page
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1444 None means public access.
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1445 Pages inherit from parent pages: e.g. if a "settings" page is restricted to admins,
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1446 and if "settings/blog" is public, it still can only be accessed by admins.
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1447 see C.PAGES_ACCESS_* for details
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1448 @param parse_url(callable, None): if set it will be called to handle the URL path
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1449 after this method, the page will be rendered if noting is left in path (request.postpath)
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1450 else a the request will be transmitted to a subpage
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1451 @param prepare_render(callable, None): if set, will be used to prepare the rendering
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1452 that often means gathering data using the bridge
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1453 @param render(callable, None): if not template is set, this method will be called and
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1454 what it returns will be rendered.
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1455 This method is mutually exclusive with template and must return a unicode string.
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1456 @param template(unicode, None): path to the template to render.
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1457 This method is mutually exclusive with render
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1458 """
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1459
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1460 web_resource.Resource.__init__(self)
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1461 self.host = host
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1462 self.root_dir = root_dir
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1463 if name is not None:
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1464 if name in self.named_pages:
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1465 raise exceptions.ConflictError(_(u'a Libervia page named "{}" already exists'.format(name)))
923 edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1466 if u'/' in name:
edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1467 raise ValueError(_(u'"/" is not allowed in page names'))
edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1468 if not name:
edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1469 raise ValueError(_(u"a page name can't be empty"))
917 86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1470 self.named_pages[name] = self
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1471 if access is None:
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1472 access = C.PAGES_ACCESS_PUBLIC
922 16d1084d1371 server (pages): added "None" access (page is not rendered at all) and some HTTP code constants + helper methods to get session data Goffi <goffi@goffi.org> parents: 921 diff changeset	1473 if access not in (C.PAGES_ACCESS_PUBLIC, C.PAGES_ACCESS_PROFILE, C.PAGES_ACCESS_NONE):
16d1084d1371 server (pages): added "None" access (page is not rendered at all) and some HTTP code constants + helper methods to get session data Goffi <goffi@goffi.org> parents: 921 diff changeset	1474 raise NotImplementedError(_(u"{} access is not implemented yet").format(access))
16d1084d1371 server (pages): added "None" access (page is not rendered at all) and some HTTP code constants + helper methods to get session data Goffi <goffi@goffi.org> parents: 921 diff changeset	1475 self.access = access
923 edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1476 if redirect is not None:
edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1477 # only page access and name make sense in case of full redirection
edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1478 if not all(lambda x: x is not None
edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1479 for x in (parse_url, prepare_render, render, template)):
edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1480 raise ValueError(_(u"you can't use full page redirection with other rendering method,"
edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1481 u"check self.pageRedirect if you need to use them"))
edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1482 self.redirect = redirect
edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1483 else:
edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1484 self.redirect = None
917 86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1485 self.parse_url = parse_url
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1486 self.prepare_render = prepare_render
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1487 self.template = template
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1488 self.render_method = render
922 16d1084d1371 server (pages): added "None" access (page is not rendered at all) and some HTTP code constants + helper methods to get session data Goffi <goffi@goffi.org> parents: 921 diff changeset	1489 if access == C.PAGES_ACCESS_NONE:
16d1084d1371 server (pages): added "None" access (page is not rendered at all) and some HTTP code constants + helper methods to get session data Goffi <goffi@goffi.org> parents: 921 diff changeset	1490 # none pages just return a 404, no further check is needed
16d1084d1371 server (pages): added "None" access (page is not rendered at all) and some HTTP code constants + helper methods to get session data Goffi <goffi@goffi.org> parents: 921 diff changeset	1491 return
917 86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1492 if template is None:
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1493 if not callable(render):
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1494 log.error(_(u"render must be implemented and callable if template is not set"))
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1495 else:
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1496 if render is not None:
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1497 log.error(_(u"render can't be used at the same time as template"))
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1498 if parse_url is not None and not callable(parse_url):
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1499 log.error(_(u"parse_url must be a callable"))
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1500
925 e00151140f77 server (pages): URIs handling: Goffi <goffi@goffi.org> parents: 924 diff changeset	1501 @classmethod
e00151140f77 server (pages): URIs handling: Goffi <goffi@goffi.org> parents: 924 diff changeset	1502 def importPages(cls, host, parent=None, path=None):
917 86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1503 if path is None:
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1504 path = []
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1505 if parent is None:
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1506 root_dir = os.path.join(os.path.dirname(libervia.__file__), C.PAGES_DIR)
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1507 parent = host
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1508 else:
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1509 root_dir = parent.root_dir
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1510 for d in os.listdir(root_dir):
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1511 dir_path = os.path.join(root_dir, d)
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1512 if not os.path.isdir(dir_path):
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1513 continue
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1514 meta_path = os.path.join(dir_path, C.PAGES_META_FILE)
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1515 if os.path.isfile(meta_path):
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1516 page_data = {}
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1517 # we don't want to force the presence of __init__.py
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1518 # so we use execfile instead of import.
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1519 # TODO: when moved to Python 3, __init__.py is not mandatory anymore
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1520 # so we can switch to import
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1521 execfile(meta_path, page_data)
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1522 resource = LiberviaPage(
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1523 host,
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1524 dir_path,
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1525 name=page_data.get('name'),
923 edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1526 redirect=page_data.get('redirect'),
917 86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1527 access=page_data.get('access'),
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1528 parse_url=page_data.get('parse_url'),
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1529 prepare_render=page_data.get('prepare_render'),
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1530 render=page_data.get('render'),
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1531 template=page_data.get('template'))
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1532 parent.putChild(d, resource)
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1533 new_path = path + [d]
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1534 log.info(u"Added /{path} page".format(path=u'[...]/'.join(new_path)))
925 e00151140f77 server (pages): URIs handling: Goffi <goffi@goffi.org> parents: 924 diff changeset	1535 if 'uri_handlers' in page_data:
e00151140f77 server (pages): URIs handling: Goffi <goffi@goffi.org> parents: 924 diff changeset	1536 if not isinstance(page_data, dict):
e00151140f77 server (pages): URIs handling: Goffi <goffi@goffi.org> parents: 924 diff changeset	1537 log.error(_(u'uri_handlers must be a dict'))
e00151140f77 server (pages): URIs handling: Goffi <goffi@goffi.org> parents: 924 diff changeset	1538 else:
e00151140f77 server (pages): URIs handling: Goffi <goffi@goffi.org> parents: 924 diff changeset	1539 for uri_tuple, cb_name in page_data['uri_handlers'].iteritems():
e00151140f77 server (pages): URIs handling: Goffi <goffi@goffi.org> parents: 924 diff changeset	1540 if len(uri_tuple) != 2 or not isinstance(cb_name, basestring):
e00151140f77 server (pages): URIs handling: Goffi <goffi@goffi.org> parents: 924 diff changeset	1541 log.error(_(u"invalid uri_tuple"))
e00151140f77 server (pages): URIs handling: Goffi <goffi@goffi.org> parents: 924 diff changeset	1542 continue
e00151140f77 server (pages): URIs handling: Goffi <goffi@goffi.org> parents: 924 diff changeset	1543 log.info(_(u'setting {}/{} URIs handler').format(*uri_tuple))
e00151140f77 server (pages): URIs handling: Goffi <goffi@goffi.org> parents: 924 diff changeset	1544 try:
e00151140f77 server (pages): URIs handling: Goffi <goffi@goffi.org> parents: 924 diff changeset	1545 cb = page_data[cb_name]
e00151140f77 server (pages): URIs handling: Goffi <goffi@goffi.org> parents: 924 diff changeset	1546 except KeyError:
e00151140f77 server (pages): URIs handling: Goffi <goffi@goffi.org> parents: 924 diff changeset	1547 log.error(_(u'missing {name} method to handle {1}/{2}').format(
e00151140f77 server (pages): URIs handling: Goffi <goffi@goffi.org> parents: 924 diff changeset	1548 name = cb_name, *uri_tuple))
e00151140f77 server (pages): URIs handling: Goffi <goffi@goffi.org> parents: 924 diff changeset	1549 continue
e00151140f77 server (pages): URIs handling: Goffi <goffi@goffi.org> parents: 924 diff changeset	1550 else:
e00151140f77 server (pages): URIs handling: Goffi <goffi@goffi.org> parents: 924 diff changeset	1551 cls.registerURI(uri_tuple, cb, new_path)
e00151140f77 server (pages): URIs handling: Goffi <goffi@goffi.org> parents: 924 diff changeset	1552
917 86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1553 LiberviaPage.importPages(host, resource, new_path)
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1554
925 e00151140f77 server (pages): URIs handling: Goffi <goffi@goffi.org> parents: 924 diff changeset	1555 @classmethod
e00151140f77 server (pages): URIs handling: Goffi <goffi@goffi.org> parents: 924 diff changeset	1556 def registerURI(cls, uri_tuple, get_uri_cb, pre_path):
e00151140f77 server (pages): URIs handling: Goffi <goffi@goffi.org> parents: 924 diff changeset	1557 """register a URI handler
e00151140f77 server (pages): URIs handling: Goffi <goffi@goffi.org> parents: 924 diff changeset	1558
e00151140f77 server (pages): URIs handling: Goffi <goffi@goffi.org> parents: 924 diff changeset	1559 @param uri_tuple(tuple[unicode, unicode]): type or URIs handler
e00151140f77 server (pages): URIs handling: Goffi <goffi@goffi.org> parents: 924 diff changeset	1560 type/subtype as returned by tools/common/parseXMPPUri
e00151140f77 server (pages): URIs handling: Goffi <goffi@goffi.org> parents: 924 diff changeset	1561 @param get_uri_cb(callable): method which take uri_data dict as only argument
e00151140f77 server (pages): URIs handling: Goffi <goffi@goffi.org> parents: 924 diff changeset	1562 and return path with correct arguments relative to page itself
e00151140f77 server (pages): URIs handling: Goffi <goffi@goffi.org> parents: 924 diff changeset	1563 @param pre_path(list[unicode]): prefix path to reference the handler page
e00151140f77 server (pages): URIs handling: Goffi <goffi@goffi.org> parents: 924 diff changeset	1564 """
e00151140f77 server (pages): URIs handling: Goffi <goffi@goffi.org> parents: 924 diff changeset	1565 if uri_tuple in cls.uri_callbacks:
e00151140f77 server (pages): URIs handling: Goffi <goffi@goffi.org> parents: 924 diff changeset	1566 log.info(_(u"{}/{} URIs are already handled, replacing by the new handler").format(*uri_tuple))
e00151140f77 server (pages): URIs handling: Goffi <goffi@goffi.org> parents: 924 diff changeset	1567 cls.uri_callbacks[uri_tuple] = {u'callback': get_uri_cb,
e00151140f77 server (pages): URIs handling: Goffi <goffi@goffi.org> parents: 924 diff changeset	1568 u'pre_path': pre_path}
e00151140f77 server (pages): URIs handling: Goffi <goffi@goffi.org> parents: 924 diff changeset	1569
917 86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1570 def getChildWithDefault(self, path, request):
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1571 # we handle children ourselves
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1572 raise exceptions.InternalError(u"this method should not be used with LiberviaPage")
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1573
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1574 def nextPath(self, request):
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1575 """get next URL path segment, and update request accordingly
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1576
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1577 will move first segment of postpath in prepath
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1578 @param request(server.Request): current HTTP request
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1579 @return (unicode): unquoted segment
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1580 @raise IndexError: there is no segment left
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1581 """
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1582 pathElement = request.postpath.pop(0)
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1583 request.prepath.append(pathElement)
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1584 return urllib.unquote(pathElement).decode('utf-8')
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1585
923 edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1586 def pageRedirect(self, page_path, request, skip_parse_url=True):
edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1587 """redirect a page to a named page
edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1588
edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1589 the workflow will continue with the workflow of the named page,
edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1590 skipping named page's parse_url method if it exist.
edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1591 @param page_path(unicode): path to page (elements are separated by "/"):
edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1592 if path starts with a "/":
edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1593 path is a full path starting from root
edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1594 else:
edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1595 - first element is name as registered in name variable
edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1596 - following element are subpages path
edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1597 e.g.: "blog" redirect to page named "blog"
edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1598 "blog/atom.xml" redirect to atom.xml subpage of "blog"
edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1599 "/common/blog/atom.xml" redirect to the page at the fiven full path
edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1600 @param request(server.Request): current HTTP request
edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1601 @param skip_parse_url(bool): if True, parse_url method on redirect page will be skipped
edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1602 @raise KeyError: there is no known page with this name
edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1603 """
edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1604 # FIXME: render non LiberviaPage resources
edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1605 path = page_path.rstrip(u'/').split(u'/')
edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1606 if not path[0]:
edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1607 redirect_page = self.host.root
edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1608 else:
edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1609 redirect_page = self.named_pages[path[0]]
edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1610
edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1611 for subpage in path[1:]:
edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1612 redirect_page = redirect_page.childen[subpage]
edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1613
edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1614 redirect_page.renderPage(request, skip_parse_url=True)
edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1615 raise failure.Failure(exceptions.CancelError(u'page redirection is used'))
edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1616
922 16d1084d1371 server (pages): added "None" access (page is not rendered at all) and some HTTP code constants + helper methods to get session data Goffi <goffi@goffi.org> parents: 921 diff changeset	1617 def pageError(self, request, code=C.HTTP_NOT_FOUND):
917 86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1618 """generate an error page and terminate the request
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1619
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1620 @param request(server.Request): HTTP request
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1621 @param core(int): error code to use
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1622 """
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1623 template = u'error/' + unicode(code) + '.html'
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1624
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1625 request.setResponseCode(code)
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1626
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1627 rendered = self.host.renderer.render(
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1628 template,
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1629 root_path = '/templates/',
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1630 error_code = code,
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1631 **request.template_data)
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1632
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1633 self.writeData(rendered, request)
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1634 raise failure.Failure(exceptions.CancelError(u'error page is used'))
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1635
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1636 def writeData(self, data, request):
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1637 if data is None:
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1638 self.pageError(request)
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1639 request.write(data.encode('utf-8'))
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1640 request.finish()
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1641
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1642 def _subpagesHandler(self, dummy, request):
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1643 """render subpage if suitable
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1644
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1645 this method checks if there is still an unmanaged part of the path
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1646 and check if it corresponds to a subpage. If so, it render the subpage
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1647 else it render a NoResource.
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1648 If there is no unmanaged part of the segment, current page workflow is pursued
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1649 """
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1650 if request.postpath:
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1651 subpage = self.nextPath(request)
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1652 try:
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1653 child = self.children[subpage]
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1654 except KeyError:
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1655 self.pageError(request)
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1656 else:
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1657 child.render(request)
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1658 raise failure.Failure(exceptions.CancelError(u'subpage page is used'))
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1659
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1660 def _prepare_render(self, dummy, request):
926 612e33fd32a8 server (pages): fixed _prepare_render handling Goffi <goffi@goffi.org> parents: 925 diff changeset	1661 return defer.maybeDeferred(self.prepare_render, self, request)
917 86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1662
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1663 def _render_method(self, dummy, request):
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1664 return defer.maybeDeferred(self.render_method, self, request)
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1665
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1666 def _render_template(self, dummy, template_data):
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1667 return self.host.renderer.render(
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1668 self.template,
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1669 root_path = '/templates/',
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1670 **template_data)
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1671
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1672 def _renderEb(self, failure_, request):
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1673 """don't raise error on CancelError"""
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1674 failure_.trap(exceptions.CancelError)
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1675
922 16d1084d1371 server (pages): added "None" access (page is not rendered at all) and some HTTP code constants + helper methods to get session data Goffi <goffi@goffi.org> parents: 921 diff changeset	1676 def getProfile(self, request):
16d1084d1371 server (pages): added "None" access (page is not rendered at all) and some HTTP code constants + helper methods to get session data Goffi <goffi@goffi.org> parents: 921 diff changeset	1677 """helper method to easily get current profile
16d1084d1371 server (pages): added "None" access (page is not rendered at all) and some HTTP code constants + helper methods to get session data Goffi <goffi@goffi.org> parents: 921 diff changeset	1678
16d1084d1371 server (pages): added "None" access (page is not rendered at all) and some HTTP code constants + helper methods to get session data Goffi <goffi@goffi.org> parents: 921 diff changeset	1679 @return (unicode, None): current profile
16d1084d1371 server (pages): added "None" access (page is not rendered at all) and some HTTP code constants + helper methods to get session data Goffi <goffi@goffi.org> parents: 921 diff changeset	1680 None if no profile session is started
16d1084d1371 server (pages): added "None" access (page is not rendered at all) and some HTTP code constants + helper methods to get session data Goffi <goffi@goffi.org> parents: 921 diff changeset	1681 """
16d1084d1371 server (pages): added "None" access (page is not rendered at all) and some HTTP code constants + helper methods to get session data Goffi <goffi@goffi.org> parents: 921 diff changeset	1682 sat_session = self.host.getSessionData(request, session_iface.ISATSession)
16d1084d1371 server (pages): added "None" access (page is not rendered at all) and some HTTP code constants + helper methods to get session data Goffi <goffi@goffi.org> parents: 921 diff changeset	1683 return sat_session.profile
16d1084d1371 server (pages): added "None" access (page is not rendered at all) and some HTTP code constants + helper methods to get session data Goffi <goffi@goffi.org> parents: 921 diff changeset	1684
16d1084d1371 server (pages): added "None" access (page is not rendered at all) and some HTTP code constants + helper methods to get session data Goffi <goffi@goffi.org> parents: 921 diff changeset	1685 def getRData(self, request):
16d1084d1371 server (pages): added "None" access (page is not rendered at all) and some HTTP code constants + helper methods to get session data Goffi <goffi@goffi.org> parents: 921 diff changeset	1686 """helper method to get request data dict
16d1084d1371 server (pages): added "None" access (page is not rendered at all) and some HTTP code constants + helper methods to get session data Goffi <goffi@goffi.org> parents: 921 diff changeset	1687
16d1084d1371 server (pages): added "None" access (page is not rendered at all) and some HTTP code constants + helper methods to get session data Goffi <goffi@goffi.org> parents: 921 diff changeset	1688 this dictionnary if for the request only, it is not saved in session
16d1084d1371 server (pages): added "None" access (page is not rendered at all) and some HTTP code constants + helper methods to get session data Goffi <goffi@goffi.org> parents: 921 diff changeset	1689 It is mainly used to pass data between pages/methods called during request workflow
16d1084d1371 server (pages): added "None" access (page is not rendered at all) and some HTTP code constants + helper methods to get session data Goffi <goffi@goffi.org> parents: 921 diff changeset	1690 @return (dict): request data
16d1084d1371 server (pages): added "None" access (page is not rendered at all) and some HTTP code constants + helper methods to get session data Goffi <goffi@goffi.org> parents: 921 diff changeset	1691 """
16d1084d1371 server (pages): added "None" access (page is not rendered at all) and some HTTP code constants + helper methods to get session data Goffi <goffi@goffi.org> parents: 921 diff changeset	1692 try:
16d1084d1371 server (pages): added "None" access (page is not rendered at all) and some HTTP code constants + helper methods to get session data Goffi <goffi@goffi.org> parents: 921 diff changeset	1693 return request.data
16d1084d1371 server (pages): added "None" access (page is not rendered at all) and some HTTP code constants + helper methods to get session data Goffi <goffi@goffi.org> parents: 921 diff changeset	1694 except AttributeError:
16d1084d1371 server (pages): added "None" access (page is not rendered at all) and some HTTP code constants + helper methods to get session data Goffi <goffi@goffi.org> parents: 921 diff changeset	1695 request.data = {}
16d1084d1371 server (pages): added "None" access (page is not rendered at all) and some HTTP code constants + helper methods to get session data Goffi <goffi@goffi.org> parents: 921 diff changeset	1696 return request.data
16d1084d1371 server (pages): added "None" access (page is not rendered at all) and some HTTP code constants + helper methods to get session data Goffi <goffi@goffi.org> parents: 921 diff changeset	1697
16d1084d1371 server (pages): added "None" access (page is not rendered at all) and some HTTP code constants + helper methods to get session data Goffi <goffi@goffi.org> parents: 921 diff changeset	1698 def _checkAccess(self, data, request):
16d1084d1371 server (pages): added "None" access (page is not rendered at all) and some HTTP code constants + helper methods to get session data Goffi <goffi@goffi.org> parents: 921 diff changeset	1699 """Check access according to self.access
16d1084d1371 server (pages): added "None" access (page is not rendered at all) and some HTTP code constants + helper methods to get session data Goffi <goffi@goffi.org> parents: 921 diff changeset	1700
16d1084d1371 server (pages): added "None" access (page is not rendered at all) and some HTTP code constants + helper methods to get session data Goffi <goffi@goffi.org> parents: 921 diff changeset	1701 if access is not granted, show a HTTP_UNAUTHORIZED pageError and stop request,
16d1084d1371 server (pages): added "None" access (page is not rendered at all) and some HTTP code constants + helper methods to get session data Goffi <goffi@goffi.org> parents: 921 diff changeset	1702 else return data (so it can be inserted in deferred chain
16d1084d1371 server (pages): added "None" access (page is not rendered at all) and some HTTP code constants + helper methods to get session data Goffi <goffi@goffi.org> parents: 921 diff changeset	1703 """
16d1084d1371 server (pages): added "None" access (page is not rendered at all) and some HTTP code constants + helper methods to get session data Goffi <goffi@goffi.org> parents: 921 diff changeset	1704 if self.access == C.PAGES_ACCESS_PUBLIC:
16d1084d1371 server (pages): added "None" access (page is not rendered at all) and some HTTP code constants + helper methods to get session data Goffi <goffi@goffi.org> parents: 921 diff changeset	1705 pass
16d1084d1371 server (pages): added "None" access (page is not rendered at all) and some HTTP code constants + helper methods to get session data Goffi <goffi@goffi.org> parents: 921 diff changeset	1706 elif self.access == C.PAGES_ACCESS_PROFILE:
16d1084d1371 server (pages): added "None" access (page is not rendered at all) and some HTTP code constants + helper methods to get session data Goffi <goffi@goffi.org> parents: 921 diff changeset	1707 profile = self.getProfile(request)
16d1084d1371 server (pages): added "None" access (page is not rendered at all) and some HTTP code constants + helper methods to get session data Goffi <goffi@goffi.org> parents: 921 diff changeset	1708 if not profile:
16d1084d1371 server (pages): added "None" access (page is not rendered at all) and some HTTP code constants + helper methods to get session data Goffi <goffi@goffi.org> parents: 921 diff changeset	1709 # no session started, access is not granted
16d1084d1371 server (pages): added "None" access (page is not rendered at all) and some HTTP code constants + helper methods to get session data Goffi <goffi@goffi.org> parents: 921 diff changeset	1710 self.pageError(request, C.HTTP_UNAUTHORIZED)
16d1084d1371 server (pages): added "None" access (page is not rendered at all) and some HTTP code constants + helper methods to get session data Goffi <goffi@goffi.org> parents: 921 diff changeset	1711
16d1084d1371 server (pages): added "None" access (page is not rendered at all) and some HTTP code constants + helper methods to get session data Goffi <goffi@goffi.org> parents: 921 diff changeset	1712 return data
16d1084d1371 server (pages): added "None" access (page is not rendered at all) and some HTTP code constants + helper methods to get session data Goffi <goffi@goffi.org> parents: 921 diff changeset	1713
923 edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1714 def renderPage(self, request, skip_parse_url=False):
edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1715 # template_data are the variables passed to template
917 86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1716 if not hasattr(request, 'template_data'):
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1717 request.template_data = {}
922 16d1084d1371 server (pages): added "None" access (page is not rendered at all) and some HTTP code constants + helper methods to get session data Goffi <goffi@goffi.org> parents: 921 diff changeset	1718
16d1084d1371 server (pages): added "None" access (page is not rendered at all) and some HTTP code constants + helper methods to get session data Goffi <goffi@goffi.org> parents: 921 diff changeset	1719 # XXX: here is the code which need to be executed once
16d1084d1371 server (pages): added "None" access (page is not rendered at all) and some HTTP code constants + helper methods to get session data Goffi <goffi@goffi.org> parents: 921 diff changeset	1720 # at the beginning of the request hanling
917 86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1721 if request.postpath and not request.postpath[-1]:
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1722 # we don't differenciate URLs finishing with '/' or not
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1723 del request.postpath[-1]
922 16d1084d1371 server (pages): added "None" access (page is not rendered at all) and some HTTP code constants + helper methods to get session data Goffi <goffi@goffi.org> parents: 921 diff changeset	1724
917 86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1725 d = defer.Deferred()
922 16d1084d1371 server (pages): added "None" access (page is not rendered at all) and some HTTP code constants + helper methods to get session data Goffi <goffi@goffi.org> parents: 921 diff changeset	1726 d.addCallback(self._checkAccess, request)
16d1084d1371 server (pages): added "None" access (page is not rendered at all) and some HTTP code constants + helper methods to get session data Goffi <goffi@goffi.org> parents: 921 diff changeset	1727
923 edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1728 if self.redirect is not None:
edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1729 self.pageRedirect(self.redirect, request, skip_parse_url=False)
edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1730
edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1731 if self.parse_url is not None and not skip_parse_url:
917 86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1732 d.addCallback(self.parse_url, request)
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1733
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1734 d.addCallback(self._subpagesHandler, request)
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1735
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1736 if self.prepare_render:
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1737 d.addCallback(self._prepare_render, request)
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1738
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1739 if self.template:
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1740 d.addCallback(self._render_template, request.template_data)
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1741 elif self.render_method:
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1742 d.addCallback(self._render_method, request)
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1743
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1744 d.addCallback(self.writeData, request)
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1745 d.addErrback(self._renderEb, request)
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1746 d.callback(self)
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1747 return server.NOT_DONE_YET
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1748
923 edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1749 def render_GET(self, request):
edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1750 return self.renderPage(request)
edb322c87ea4 server (pages): pages now handle redirection, check self.pageRedirect docstring for details Goffi <goffi@goffi.org> parents: 922 diff changeset	1751
917 86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1752
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1753 class Libervia(service.Service):
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1754
810 3905bc24eb17 server: proper options handling Goffi <goffi@goffi.org> parents: 801 diff changeset	1755 def __init__(self, options):
3905bc24eb17 server: proper options handling Goffi <goffi@goffi.org> parents: 801 diff changeset	1756 self.options = options
444 b64e528fb524 server side: use of bridge's getReady to be sure that backend is initialised at launch Goffi <goffi@goffi.org> parents: 438 diff changeset	1757 self.initialised = defer.Deferred()
470 34ce41e014c4 server side: options managing improvments: Goffi <goffi@goffi.org> parents: 465 diff changeset	1758
881 6bdee34fa2f4 server: added base_url_ext option to handle different external URLs (e.g.: if there is a proxy) Goffi <goffi@goffi.org> parents: 875 diff changeset	1759 if self.options['base_url_ext']:
6bdee34fa2f4 server: added base_url_ext option to handle different external URLs (e.g.: if there is a proxy) Goffi <goffi@goffi.org> parents: 875 diff changeset	1760 self.base_url_ext = self.options.pop('base_url_ext')
6bdee34fa2f4 server: added base_url_ext option to handle different external URLs (e.g.: if there is a proxy) Goffi <goffi@goffi.org> parents: 875 diff changeset	1761 if self.base_url_ext[-1] != '/':
6bdee34fa2f4 server: added base_url_ext option to handle different external URLs (e.g.: if there is a proxy) Goffi <goffi@goffi.org> parents: 875 diff changeset	1762 self.base_url_ext += '/'
884 763da94ba28b blog (atom): base_url_ext can now only specify scheme, or netloc, or path, it will be used to complete data coming from request's path Goffi <goffi@goffi.org> parents: 881 diff changeset	1763 self.base_url_ext_data = urlparse.urlsplit(self.base_url_ext)
881 6bdee34fa2f4 server: added base_url_ext option to handle different external URLs (e.g.: if there is a proxy) Goffi <goffi@goffi.org> parents: 875 diff changeset	1764 else:
6bdee34fa2f4 server: added base_url_ext option to handle different external URLs (e.g.: if there is a proxy) Goffi <goffi@goffi.org> parents: 875 diff changeset	1765 self.base_url_ext = None
884 763da94ba28b blog (atom): base_url_ext can now only specify scheme, or netloc, or path, it will be used to complete data coming from request's path Goffi <goffi@goffi.org> parents: 881 diff changeset	1766 # we split empty string anyway so we can do things like
763da94ba28b blog (atom): base_url_ext can now only specify scheme, or netloc, or path, it will be used to complete data coming from request's path Goffi <goffi@goffi.org> parents: 881 diff changeset	1767 # scheme = self.base_url_ext_data.scheme or 'https'
763da94ba28b blog (atom): base_url_ext can now only specify scheme, or netloc, or path, it will be used to complete data coming from request's path Goffi <goffi@goffi.org> parents: 881 diff changeset	1768 self.base_url_ext_data = urlparse.urlsplit('')
763da94ba28b blog (atom): base_url_ext can now only specify scheme, or netloc, or path, it will be used to complete data coming from request's path Goffi <goffi@goffi.org> parents: 881 diff changeset	1769
810 3905bc24eb17 server: proper options handling Goffi <goffi@goffi.org> parents: 801 diff changeset	1770 if not self.options['port_https_ext']:
3905bc24eb17 server: proper options handling Goffi <goffi@goffi.org> parents: 801 diff changeset	1771 self.options['port_https_ext'] = self.options['port_https']
3905bc24eb17 server: proper options handling Goffi <goffi@goffi.org> parents: 801 diff changeset	1772 if self.options['data_dir'] == DATA_DIR_DEFAULT:
3905bc24eb17 server: proper options handling Goffi <goffi@goffi.org> parents: 801 diff changeset	1773 coerceDataDir(self.options['data_dir']) # this is not done when using the default value
470 34ce41e014c4 server side: options managing improvments: Goffi <goffi@goffi.org> parents: 465 diff changeset	1774
810 3905bc24eb17 server: proper options handling Goffi <goffi@goffi.org> parents: 801 diff changeset	1775 self.html_dir = os.path.join(self.options['data_dir'], C.HTML_DIR)
3905bc24eb17 server: proper options handling Goffi <goffi@goffi.org> parents: 801 diff changeset	1776 self.themes_dir = os.path.join(self.options['data_dir'], C.THEMES_DIR)
470 34ce41e014c4 server side: options managing improvments: Goffi <goffi@goffi.org> parents: 465 diff changeset	1777
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1778 self._cleanup = []
470 34ce41e014c4 server side: options managing improvments: Goffi <goffi@goffi.org> parents: 465 diff changeset	1779
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1780 self.signal_handler = SignalHandler(self)
451 1a0cec9b0f1e better PEP-8 compliance souliane <souliane@mailoo.org> parents: 449 diff changeset	1781 self.sessions = {} # key = session value = user
1a0cec9b0f1e better PEP-8 compliance souliane <souliane@mailoo.org> parents: 449 diff changeset	1782 self.prof_connected = set() # Profiles connected
470 34ce41e014c4 server side: options managing improvments: Goffi <goffi@goffi.org> parents: 465 diff changeset	1783
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1784 ## bridge ##
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1785 try:
914 0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1786 self.bridge = Bridge()
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1787 except BridgeExceptionNoService:
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1788 print(u"Can't connect to SàT backend, are you sure it's launched ?")
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1789 sys.exit(1)
914 0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1790 self.bridge.bridgeConnect(callback=self._bridgeCb, errback=self._bridgeEb)
553 8492c2bb463b server_side: enable HTTP gzip compression souliane <souliane@mailoo.org> parents: 522 diff changeset	1791
914 0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1792 def backendReady(self, dummy):
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1793 self.root = root = LiberviaRootResource(self.options, self.html_dir)
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1794 _register = Register(self)
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1795 _upload_radiocol = UploadManagerRadioCol(self)
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1796 _upload_avatar = UploadManagerAvatar(self)
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1797 self.signal_handler.plugRegister(_register)
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1798 self.bridge.register_signal("connected", self.signal_handler.connected)
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1799 self.bridge.register_signal("disconnected", self.signal_handler.disconnected)
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1800 #core
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1801 for signal_name in ['presenceUpdate', 'messageNew', 'subscribe', 'contactDeleted',
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1802 'newContact', 'entityDataUpdated', 'paramUpdate']:
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1803 self.bridge.register_signal(signal_name, self.signal_handler.getGenericCb(signal_name))
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1804 # XXX: actionNew is handled separately because the handler must manage security_limit
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1805 self.bridge.register_signal('actionNew', self.signal_handler.actionNewHandler)
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1806 #plugins
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1807 for signal_name in ['psEvent', 'mucRoomJoined', 'tarotGameStarted', 'tarotGameNew', 'tarotGameChooseContrat',
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1808 'tarotGameShowCards', 'tarotGameInvalidCards', 'tarotGameCardsPlayed', 'tarotGameYourTurn', 'tarotGameScore', 'tarotGamePlayers',
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1809 'radiocolStarted', 'radiocolPreload', 'radiocolPlay', 'radiocolNoUpload', 'radiocolUploadOk', 'radiocolSongRejected', 'radiocolPlayers',
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1810 'mucRoomLeft', 'mucRoomUserChangedNick', 'chatStateReceived']:
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1811 self.bridge.register_signal(signal_name, self.signal_handler.getGenericCb(signal_name), "plugin")
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1812 self.media_dir = self.bridge.getConfig('', 'media_dir')
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1813 self.local_dir = self.bridge.getConfig('', 'local_dir')
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1814 self.cache_root_dir = os.path.join(
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1815 self.local_dir,
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1816 C.CACHE_DIR)
858 7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	1817
914 0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1818 # JSON APIs
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1819 self.putChild('json_signal_api', self.signal_handler)
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1820 self.putChild('json_api', MethodHandler(self))
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1821 self.putChild('register_api', _register)
858 7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	1822
914 0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1823 # files upload
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1824 self.putChild('upload_radiocol', _upload_radiocol)
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1825 self.putChild('upload_avatar', _upload_avatar)
858 7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	1826
914 0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1827 # static pages
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1828 self.putChild('blog', MicroBlog(self))
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1829 self.putChild(C.THEMES_URL, ProtectedFile(self.themes_dir))
858 7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	1830
917 86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1831 LiberviaPage.importPages(self)
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1832
914 0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1833 # media dirs
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1834 # FIXME: get rid of dirname and "/" in C.XXX_DIR
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1835 self.putChild(os.path.dirname(C.MEDIA_DIR), ProtectedFile(self.media_dir))
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1836 self.cache_resource = web_resource.NoResource()
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1837 self.putChild(C.CACHE_DIR, self.cache_resource)
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1838
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1839 # special
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1840 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
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1841 # pyjamas tests, redirected only for dev versions
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1842 if self.version[-1] == 'D':
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1843 self.putChild('test', web_util.Redirect('/libervia_test.html'))
858 7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	1844
7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	1845
914 0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1846 wrapped = web_resource.EncodingResourceWrapper(root, [server.GzipEncoderFactory()])
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1847 self.site = server.Site(wrapped)
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1848 self.site.sessionFactory = LiberviaSession
917 86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1849 self.renderer = template.Renderer(self)
86563d6c83b0 server: Libervia pages: Goffi <goffi@goffi.org> parents: 915 diff changeset	1850 self.putChild('templates', ProtectedFile(self.renderer.base_dir))
444 b64e528fb524 server side: use of bridge's getReady to be sure that backend is initialised at launch Goffi <goffi@goffi.org> parents: 438 diff changeset	1851
914 0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1852
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1853 def _bridgeCb(self):
444 b64e528fb524 server side: use of bridge's getReady to be sure that backend is initialised at launch Goffi <goffi@goffi.org> parents: 438 diff changeset	1854 self.bridge.getReady(lambda: self.initialised.callback(None),
b64e528fb524 server side: use of bridge's getReady to be sure that backend is initialised at launch Goffi <goffi@goffi.org> parents: 438 diff changeset	1855 lambda failure: self.initialised.errback(Exception(failure)))
914 0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1856 self.initialised.addCallback(self.backendReady)
694 82123705474b massive (preventive) addition of 'u' (unicode) before the strings passed to logging functions souliane <souliane@mailoo.org> parents: 692 diff changeset	1857 self.initialised.addErrback(lambda failure: log.error(u"Init error: %s" % failure))
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1858
914 0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1859 def _bridgeEb(self, failure):
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1860 log.error(u"Can't connect to bridge: {}".format(failure))
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1861
682 e6bb64bd6b4d server side: implemented methods to get SàT and Libervia versions Goffi <goffi@goffi.org> parents: 679 diff changeset	1862 @property
e6bb64bd6b4d server side: implemented methods to get SàT and Libervia versions Goffi <goffi@goffi.org> parents: 679 diff changeset	1863 def version(self):
e6bb64bd6b4d server side: implemented methods to get SàT and Libervia versions Goffi <goffi@goffi.org> parents: 679 diff changeset	1864 """Return the short version of Libervia"""
e6bb64bd6b4d server side: implemented methods to get SàT and Libervia versions Goffi <goffi@goffi.org> parents: 679 diff changeset	1865 return C.APP_VERSION
e6bb64bd6b4d server side: implemented methods to get SàT and Libervia versions Goffi <goffi@goffi.org> parents: 679 diff changeset	1866
e6bb64bd6b4d server side: implemented methods to get SàT and Libervia versions Goffi <goffi@goffi.org> parents: 679 diff changeset	1867 @property
e6bb64bd6b4d server side: implemented methods to get SàT and Libervia versions Goffi <goffi@goffi.org> parents: 679 diff changeset	1868 def full_version(self):
e6bb64bd6b4d server side: implemented methods to get SàT and Libervia versions Goffi <goffi@goffi.org> parents: 679 diff changeset	1869 """Return the full version of Libervia (with extra data when in development mode)"""
e6bb64bd6b4d server side: implemented methods to get SàT and Libervia versions Goffi <goffi@goffi.org> parents: 679 diff changeset	1870 version = self.version
e6bb64bd6b4d server side: implemented methods to get SàT and Libervia versions Goffi <goffi@goffi.org> parents: 679 diff changeset	1871 if version[-1] == 'D':
e6bb64bd6b4d server side: implemented methods to get SàT and Libervia versions Goffi <goffi@goffi.org> parents: 679 diff changeset	1872 # we are in debug version, we add extra data
e6bb64bd6b4d server side: implemented methods to get SàT and Libervia versions Goffi <goffi@goffi.org> parents: 679 diff changeset	1873 try:
e6bb64bd6b4d server side: implemented methods to get SàT and Libervia versions Goffi <goffi@goffi.org> parents: 679 diff changeset	1874 return self._version_cache
e6bb64bd6b4d server side: implemented methods to get SàT and Libervia versions Goffi <goffi@goffi.org> parents: 679 diff changeset	1875 except AttributeError:
e6bb64bd6b4d server side: implemented methods to get SàT and Libervia versions Goffi <goffi@goffi.org> parents: 679 diff changeset	1876 self._version_cache = u"{} ({})".format(version, utils.getRepositoryData(libervia))
e6bb64bd6b4d server side: implemented methods to get SàT and Libervia versions Goffi <goffi@goffi.org> parents: 679 diff changeset	1877 return self._version_cache
e6bb64bd6b4d server side: implemented methods to get SàT and Libervia versions Goffi <goffi@goffi.org> parents: 679 diff changeset	1878 else:
e6bb64bd6b4d server side: implemented methods to get SàT and Libervia versions Goffi <goffi@goffi.org> parents: 679 diff changeset	1879 return version
e6bb64bd6b4d server side: implemented methods to get SàT and Libervia versions Goffi <goffi@goffi.org> parents: 679 diff changeset	1880
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1881 def addCleanup(self, callback, args, *kwargs):
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1882 """Add cleaning method to call when service is stopped
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1883 cleaning method will be called in reverse order of they insertion
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1884 @param callback: callable to call on service stop
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1885 @param *args: list of arguments of the callback
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1886 @param **kwargs: list of keyword arguments of the callback"""
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1887 self._cleanup.insert(0, (callback, args, kwargs))
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1888
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1889 def startService(self):
446 c406e46fe9c0 server_side: update the connection mechanism to handle profile passwords souliane <souliane@mailoo.org> parents: 445 diff changeset	1890 """Connect the profile for Libervia and start the HTTP(S) server(s)"""
c406e46fe9c0 server_side: update the connection mechanism to handle profile passwords souliane <souliane@mailoo.org> parents: 445 diff changeset	1891 def eb(e):
694 82123705474b massive (preventive) addition of 'u' (unicode) before the strings passed to logging functions souliane <souliane@mailoo.org> parents: 692 diff changeset	1892 log.error(_(u"Connection failed: %s") % e)
446 c406e46fe9c0 server_side: update the connection mechanism to handle profile passwords souliane <souliane@mailoo.org> parents: 445 diff changeset	1893 self.stop()
c406e46fe9c0 server_side: update the connection mechanism to handle profile passwords souliane <souliane@mailoo.org> parents: 445 diff changeset	1894
444 b64e528fb524 server side: use of bridge's getReady to be sure that backend is initialised at launch Goffi <goffi@goffi.org> parents: 438 diff changeset	1895 def initOk(dummy):
859 0e9341e537d6 server: catch exceptions on service profile connection check, and show an helping message if an error is caught Goffi <goffi@goffi.org> parents: 858 diff changeset	1896 try:
0e9341e537d6 server: catch exceptions on service profile connection check, and show an helping message if an error is caught Goffi <goffi@goffi.org> parents: 858 diff changeset	1897 connected = self.bridge.isConnected(C.SERVICE_PROFILE)
0e9341e537d6 server: catch exceptions on service profile connection check, and show an helping message if an error is caught Goffi <goffi@goffi.org> parents: 858 diff changeset	1898 except Exception as e:
0e9341e537d6 server: catch exceptions on service profile connection check, and show an helping message if an error is caught Goffi <goffi@goffi.org> parents: 858 diff changeset	1899 # we don't want the traceback
0e9341e537d6 server: catch exceptions on service profile connection check, and show an helping message if an error is caught Goffi <goffi@goffi.org> parents: 858 diff changeset	1900 msg = [l for l in unicode(e).split('\n') if l][-1]
0e9341e537d6 server: catch exceptions on service profile connection check, and show an helping message if an error is caught Goffi <goffi@goffi.org> parents: 858 diff changeset	1901 log.error(u"Can't check service profile ({profile}), are you sure it exists ?\n{error}".format(
0e9341e537d6 server: catch exceptions on service profile connection check, and show an helping message if an error is caught Goffi <goffi@goffi.org> parents: 858 diff changeset	1902 profile=C.SERVICE_PROFILE, error=msg))
0e9341e537d6 server: catch exceptions on service profile connection check, and show an helping message if an error is caught Goffi <goffi@goffi.org> parents: 858 diff changeset	1903 self.stop()
0e9341e537d6 server: catch exceptions on service profile connection check, and show an helping message if an error is caught Goffi <goffi@goffi.org> parents: 858 diff changeset	1904 return
0e9341e537d6 server: catch exceptions on service profile connection check, and show an helping message if an error is caught Goffi <goffi@goffi.org> parents: 858 diff changeset	1905 if not connected:
914 0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1906 self.bridge.connect(C.SERVICE_PROFILE, self.options['passphrase'],
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1907 {}, callback=self._startService, errback=eb)
472 42c8e91af048 server side: fixed start sequence when SERVICE_PROFILE is already connected Goffi <goffi@goffi.org> parents: 471 diff changeset	1908 else:
42c8e91af048 server side: fixed start sequence when SERVICE_PROFILE is already connected Goffi <goffi@goffi.org> parents: 471 diff changeset	1909 self._startService()
446 c406e46fe9c0 server_side: update the connection mechanism to handle profile passwords souliane <souliane@mailoo.org> parents: 445 diff changeset	1910
444 b64e528fb524 server side: use of bridge's getReady to be sure that backend is initialised at launch Goffi <goffi@goffi.org> parents: 438 diff changeset	1911 self.initialised.addCallback(initOk)
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	1912
914 0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1913 ## URLs ##
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	1914
914 0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1915 def putChild(self, path, resource):
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1916 """Add a child to the root resource"""
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1917 # FIXME: check that no information is leaked (c.f. https://twistedmatrix.com/documents/current/web/howto/using-twistedweb.html#request-encoders)
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1918 self.root.putChild(path, web_resource.EncodingResourceWrapper(resource, [server.GzipEncoderFactory()]))
0c0551967bdf server, browser: partial Libervia fix Goffi <goffi@goffi.org> parents: 913 diff changeset	1919
920 8cea8bf41b03 server: new purgeSession and getSessionData helper methods Goffi <goffi@goffi.org> parents: 919 diff changeset	1920 ## Sessions ##
8cea8bf41b03 server: new purgeSession and getSessionData helper methods Goffi <goffi@goffi.org> parents: 919 diff changeset	1921
8cea8bf41b03 server: new purgeSession and getSessionData helper methods Goffi <goffi@goffi.org> parents: 919 diff changeset	1922 def purgeSession(self, request):
8cea8bf41b03 server: new purgeSession and getSessionData helper methods Goffi <goffi@goffi.org> parents: 919 diff changeset	1923 """helper method to purge a session during request handling"""
8cea8bf41b03 server: new purgeSession and getSessionData helper methods Goffi <goffi@goffi.org> parents: 919 diff changeset	1924 session = request.session
8cea8bf41b03 server: new purgeSession and getSessionData helper methods Goffi <goffi@goffi.org> parents: 919 diff changeset	1925 if session is not None:
8cea8bf41b03 server: new purgeSession and getSessionData helper methods Goffi <goffi@goffi.org> parents: 919 diff changeset	1926 log.debug(_(u"session purge"))
8cea8bf41b03 server: new purgeSession and getSessionData helper methods Goffi <goffi@goffi.org> parents: 919 diff changeset	1927 session.expire()
8cea8bf41b03 server: new purgeSession and getSessionData helper methods Goffi <goffi@goffi.org> parents: 919 diff changeset	1928 # FIXME: not clean but it seems that it's the best way to reset
8cea8bf41b03 server: new purgeSession and getSessionData helper methods Goffi <goffi@goffi.org> parents: 919 diff changeset	1929 # session during request handling
8cea8bf41b03 server: new purgeSession and getSessionData helper methods Goffi <goffi@goffi.org> parents: 919 diff changeset	1930 request._secureSession = request._insecureSession = None
8cea8bf41b03 server: new purgeSession and getSessionData helper methods Goffi <goffi@goffi.org> parents: 919 diff changeset	1931
8cea8bf41b03 server: new purgeSession and getSessionData helper methods Goffi <goffi@goffi.org> parents: 919 diff changeset	1932 def getSessionData(self, request, *args):
8cea8bf41b03 server: new purgeSession and getSessionData helper methods Goffi <goffi@goffi.org> parents: 919 diff changeset	1933 """helper method to retrieve session data
8cea8bf41b03 server: new purgeSession and getSessionData helper methods Goffi <goffi@goffi.org> parents: 919 diff changeset	1934
8cea8bf41b03 server: new purgeSession and getSessionData helper methods Goffi <goffi@goffi.org> parents: 919 diff changeset	1935 @param request(server.Request): request linked to the session
8cea8bf41b03 server: new purgeSession and getSessionData helper methods Goffi <goffi@goffi.org> parents: 919 diff changeset	1936 @param *args(zope.interface.Interface): interface of the session to get
8cea8bf41b03 server: new purgeSession and getSessionData helper methods Goffi <goffi@goffi.org> parents: 919 diff changeset	1937 @return (iterator(data)): requested session data
8cea8bf41b03 server: new purgeSession and getSessionData helper methods Goffi <goffi@goffi.org> parents: 919 diff changeset	1938 """
8cea8bf41b03 server: new purgeSession and getSessionData helper methods Goffi <goffi@goffi.org> parents: 919 diff changeset	1939 session = request.getSession()
924 94f88277c2e7 libervia (pages): getSessionData return one session if used with one argument, else an iterator Goffi <goffi@goffi.org> parents: 923 diff changeset	1940 if len(args) == 1:
94f88277c2e7 libervia (pages): getSessionData return one session if used with one argument, else an iterator Goffi <goffi@goffi.org> parents: 923 diff changeset	1941 return args[0](session)
94f88277c2e7 libervia (pages): getSessionData return one session if used with one argument, else an iterator Goffi <goffi@goffi.org> parents: 923 diff changeset	1942 else:
94f88277c2e7 libervia (pages): getSessionData return one session if used with one argument, else an iterator Goffi <goffi@goffi.org> parents: 923 diff changeset	1943 return (iface(session) for iface in args)
920 8cea8bf41b03 server: new purgeSession and getSessionData helper methods Goffi <goffi@goffi.org> parents: 919 diff changeset	1944
813 6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	1945 ## TLS related methods ##
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	1946
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	1947 def _TLSOptionsCheck(self):
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	1948 """Check options coherence if TLS is activated, and update missing values
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	1949
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	1950 Must be called only if TLS is activated
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	1951 """
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	1952 if not self.options['tls_certificate']:
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	1953 log.error(u"a TLS certificate is needed to activate HTTPS connection")
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	1954 self.quit(1)
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	1955 if not self.options['tls_private_key']:
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	1956 self.options['tls_private_key'] = self.options['tls_certificate']
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	1957
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	1958
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	1959 if not self.options['tls_private_key']:
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	1960 self.options['tls_private_key'] = self.options['tls_certificate']
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	1961
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	1962 def _loadCertificates(self, f):
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	1963 """Read a .pem file with a list of certificates
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	1964
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	1965 @param f (file): file obj (opened .pem file)
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	1966 @return (list[OpenSSL.crypto.X509]): list of certificates
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	1967 @raise OpenSSL.crypto.Error: error while parsing the file
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	1968 """
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	1969 # XXX: didn't found any method to load a .pem file with several certificates
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	1970 # so the certificates split is done here
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	1971 certificates = []
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	1972 buf = []
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	1973 while True:
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	1974 line = f.readline()
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	1975 buf.append(line)
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	1976 if '-----END CERTIFICATE-----' in line:
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	1977 certificates.append(OpenSSL.crypto.load_certificate(OpenSSL.crypto.FILETYPE_PEM, ''.join(buf)))
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	1978 buf=[]
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	1979 elif not line:
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	1980 log.debug(u"{} certificate(s) found".format(len(certificates)))
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	1981 return certificates
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	1982
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	1983 def _loadPKey(self, f):
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	1984 """Read a private key from a .pem file
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	1985
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	1986 @param f (file): file obj (opened .pem file)
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	1987 @return (list[OpenSSL.crypto.PKey]): private key object
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	1988 @raise OpenSSL.crypto.Error: error while parsing the file
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	1989 """
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	1990 return OpenSSL.crypto.load_privatekey(OpenSSL.crypto.FILETYPE_PEM, f.read())
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	1991
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	1992 def _loadCertificate(self, f):
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	1993 """Read a public certificate from a .pem file
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	1994
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	1995 @param f (file): file obj (opened .pem file)
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	1996 @return (list[OpenSSL.crypto.X509]): public certificate
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	1997 @raise OpenSSL.crypto.Error: error while parsing the file
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	1998 """
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	1999 return OpenSSL.crypto.load_certificate(OpenSSL.crypto.FILETYPE_PEM, f.read())
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	2000
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	2001 def _getTLSContextFactory(self):
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	2002 """Load TLS certificate and build the context factory needed for listenSSL"""
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	2003 if ssl is None:
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	2004 raise ImportError(u"Python module pyOpenSSL is not installed!")
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	2005
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	2006 cert_options = {}
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	2007
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	2008 for name, option, method in [('privateKey', 'tls_private_key', self._loadPKey),
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	2009 ('certificate', 'tls_certificate', self._loadCertificate),
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	2010 ('extraCertChain', 'tls_chain', self._loadCertificates)]:
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	2011 path = self.options[option]
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	2012 if not path:
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	2013 assert option=='tls_chain'
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	2014 continue
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	2015 log.debug(u"loading {option} from {path}".format(option=option, path=path))
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	2016 try:
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	2017 with open(path) as f:
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	2018 cert_options[name] = method(f)
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	2019 except IOError as e:
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	2020 log.error(u"Error while reading file {path} for option {option}: {error}".format(path=path, option=option, error=e))
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	2021 self.quit(2)
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	2022 except OpenSSL.crypto.Error:
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	2023 log.error(u"Error while parsing file {path} for option {option}, are you sure it is a valid .pem file?".format(path=path, option=option))
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	2024 if option=='tls_private_key' and self.options['tls_certificate'] == path:
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	2025 log.error(u"You are using the same file for private key and public certificate, make sure that both a in {path} or use --tls_private_key option".format(path=path))
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	2026 self.quit(2)
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	2027
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	2028 return ssl.CertificateOptions(**cert_options)
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	2029
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	2030 ## service management ##
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	2031
472 42c8e91af048 server side: fixed start sequence when SERVICE_PROFILE is already connected Goffi <goffi@goffi.org> parents: 471 diff changeset	2032 def _startService(self, dummy=None):
449 981ed669d3b3 /!\ reorganize all the file hierarchy, move the code and launching script to src: souliane <souliane@mailoo.org> parents: 448 diff changeset	2033 """Actually start the HTTP(S) server(s) after the profile for Libervia is connected.
813 6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	2034
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	2035 @raise ImportError: OpenSSL is not available
449 981ed669d3b3 /!\ reorganize all the file hierarchy, move the code and launching script to src: souliane <souliane@mailoo.org> parents: 448 diff changeset	2036 @raise IOError: the certificate file doesn't exist
981ed669d3b3 /!\ reorganize all the file hierarchy, move the code and launching script to src: souliane <souliane@mailoo.org> parents: 448 diff changeset	2037 @raise OpenSSL.crypto.Error: the certificate file is invalid
981ed669d3b3 /!\ reorganize all the file hierarchy, move the code and launching script to src: souliane <souliane@mailoo.org> parents: 448 diff changeset	2038 """
810 3905bc24eb17 server: proper options handling Goffi <goffi@goffi.org> parents: 801 diff changeset	2039 if self.options['connection_type'] in ('https', 'both'):
813 6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	2040 self._TLSOptionsCheck()
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	2041 context_factory = self._getTLSContextFactory()
6e27604ec95a server: added --tls_private_key and --tls_chain options. --tls_certificate .pem file will be used for private_key if --tls_private_key is not specified. Goffi <goffi@goffi.org> parents: 812 diff changeset	2042 reactor.listenSSL(self.options['port_https'], self.site, context_factory)
810 3905bc24eb17 server: proper options handling Goffi <goffi@goffi.org> parents: 801 diff changeset	2043 if self.options['connection_type'] in ('http', 'both'):
3905bc24eb17 server: proper options handling Goffi <goffi@goffi.org> parents: 801 diff changeset	2044 if self.options['connection_type'] == 'both' and self.options['redirect_to_https']:
3905bc24eb17 server: proper options handling Goffi <goffi@goffi.org> parents: 801 diff changeset	2045 reactor.listenTCP(self.options['port'], server.Site(RedirectToHTTPS(self.options['port'], self.options['port_https_ext'])))
446 c406e46fe9c0 server_side: update the connection mechanism to handle profile passwords souliane <souliane@mailoo.org> parents: 445 diff changeset	2046 else:
810 3905bc24eb17 server: proper options handling Goffi <goffi@goffi.org> parents: 801 diff changeset	2047 reactor.listenTCP(self.options['port'], self.site)
446 c406e46fe9c0 server_side: update the connection mechanism to handle profile passwords souliane <souliane@mailoo.org> parents: 445 diff changeset	2048
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	2049 def stopService(self):
473 d1565906f228 server_side: fixed some forgotten print statement Goffi <goffi@goffi.org> parents: 472 diff changeset	2050 log.info(_("launching cleaning methods"))
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	2051 for callback, args, kwargs in self._cleanup:
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	2052 callback(args, *kwargs)
859 0e9341e537d6 server: catch exceptions on service profile connection check, and show an helping message if an error is caught Goffi <goffi@goffi.org> parents: 858 diff changeset	2053 try:
0e9341e537d6 server: catch exceptions on service profile connection check, and show an helping message if an error is caught Goffi <goffi@goffi.org> parents: 858 diff changeset	2054 self.bridge.disconnect(C.SERVICE_PROFILE)
0e9341e537d6 server: catch exceptions on service profile connection check, and show an helping message if an error is caught Goffi <goffi@goffi.org> parents: 858 diff changeset	2055 except Exception:
0e9341e537d6 server: catch exceptions on service profile connection check, and show an helping message if an error is caught Goffi <goffi@goffi.org> parents: 858 diff changeset	2056 log.warning(u"Can't disconnect service profile")
331 06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	2057
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	2058 def run(self):
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	2059 reactor.run()
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	2060
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	2061 def stop(self):
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	2062 reactor.stop()
06a48d805547 server side: make Libervia a Twisted plugin, and add it the --port argument + add a config file for the port. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 330 diff changeset	2063
812 fd6965c16e7e server: added "quit" method to exit with an exit code when reactor is running Goffi <goffi@goffi.org> parents: 810 diff changeset	2064 def quit(self, exit_code=None):
fd6965c16e7e server: added "quit" method to exit with an exit code when reactor is running Goffi <goffi@goffi.org> parents: 810 diff changeset	2065 """Exit app when reactor is running
fd6965c16e7e server: added "quit" method to exit with an exit code when reactor is running Goffi <goffi@goffi.org> parents: 810 diff changeset	2066
fd6965c16e7e server: added "quit" method to exit with an exit code when reactor is running Goffi <goffi@goffi.org> parents: 810 diff changeset	2067 @param exit_code(None, int): exit code
fd6965c16e7e server: added "quit" method to exit with an exit code when reactor is running Goffi <goffi@goffi.org> parents: 810 diff changeset	2068 """
fd6965c16e7e server: added "quit" method to exit with an exit code when reactor is running Goffi <goffi@goffi.org> parents: 810 diff changeset	2069 self.stop()
fd6965c16e7e server: added "quit" method to exit with an exit code when reactor is running Goffi <goffi@goffi.org> parents: 810 diff changeset	2070 sys.exit(exit_code or 0)
fd6965c16e7e server: added "quit" method to exit with an exit code when reactor is running Goffi <goffi@goffi.org> parents: 810 diff changeset	2071
415 fadbba1d793f server_side: added support for SSL and related parameters: souliane <souliane@mailoo.org> parents: 413 diff changeset	2072
858 7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	2073 class RedirectToHTTPS(web_resource.Resource):
415 fadbba1d793f server_side: added support for SSL and related parameters: souliane <souliane@mailoo.org> parents: 413 diff changeset	2074
fadbba1d793f server_side: added support for SSL and related parameters: souliane <souliane@mailoo.org> parents: 413 diff changeset	2075 def __init__(self, old_port, new_port):
858 7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	2076 web_resource.Resource.__init__(self)
415 fadbba1d793f server_side: added support for SSL and related parameters: souliane <souliane@mailoo.org> parents: 413 diff changeset	2077 self.isLeaf = True
fadbba1d793f server_side: added support for SSL and related parameters: souliane <souliane@mailoo.org> parents: 413 diff changeset	2078 self.old_port = old_port
fadbba1d793f server_side: added support for SSL and related parameters: souliane <souliane@mailoo.org> parents: 413 diff changeset	2079 self.new_port = new_port
fadbba1d793f server_side: added support for SSL and related parameters: souliane <souliane@mailoo.org> parents: 413 diff changeset	2080
fadbba1d793f server_side: added support for SSL and related parameters: souliane <souliane@mailoo.org> parents: 413 diff changeset	2081 def render(self, request):
fadbba1d793f server_side: added support for SSL and related parameters: souliane <souliane@mailoo.org> parents: 413 diff changeset	2082 netloc = request.URLPath().netloc.replace(':%s' % self.old_port, ':%s' % self.new_port)
fadbba1d793f server_side: added support for SSL and related parameters: souliane <souliane@mailoo.org> parents: 413 diff changeset	2083 url = "https://" + netloc + request.uri
858 7dde76708892 server: URL redirections + misc: Goffi <goffi@goffi.org> parents: 856 diff changeset	2084 return web_util.redirectTo(url, request)
415 fadbba1d793f server_side: added support for SSL and related parameters: souliane <souliane@mailoo.org> parents: 413 diff changeset	2085
fadbba1d793f server_side: added support for SSL and related parameters: souliane <souliane@mailoo.org> parents: 413 diff changeset	2086
919 7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	2087 registerAdapter(session_iface.SATSession, server.Session, session_iface.ISATSession)
7b267496da1d server: moved session interfaces to session_iface module + added SATGuestSession Goffi <goffi@goffi.org> parents: 917 diff changeset	2088 registerAdapter(session_iface.SATGuestSession, server.Session, session_iface.ISATGuestSession)

Mercurial > libervia-web

annotate src/server/server.py @ 926:612e33fd32a8