Mercurial > libervia-web
annotate libervia.tac @ 318:c12c9a1acf2f
server_side: added support for paramsRegisterApp to define frontend's specific parameters like "Enable unibox"
| author | souliane <souliane@mailoo.org> |
|---|---|
| date | Fri, 03 Jan 2014 14:19:01 +0100 |
| parents | bbadd490e63c |
| children | 0b7934e75e76 |
| rev | line source |
|---|---|
| 0 | 1 #!/usr/bin/python |
| 2 # -*- coding: utf-8 -*- | |
| 3 | |
| 4 """ | |
| 5 Libervia: a Salut à Toi frontend | |
| 165 | 6 Copyright (C) 2011, 2012, 2013 Jérôme Poisson <goffi@goffi.org> |
| 0 | 7 |
| 8 This program is free software: you can redistribute it and/or modify | |
| 9 it under the terms of the GNU Affero General Public License as published by | |
| 10 the Free Software Foundation, either version 3 of the License, or | |
| 11 (at your option) any later version. | |
| 12 | |
| 13 This program is distributed in the hope that it will be useful, | |
| 14 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 16 GNU Affero General Public License for more details. | |
| 17 | |
| 18 You should have received a copy of the GNU Affero General Public License | |
| 19 along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 20 """ | |
| 21 | |
| 22 from twisted.application import internet, service | |
| 23 from twisted.internet import glib2reactor | |
| 24 glib2reactor.install() | |
| 25 from twisted.internet import reactor, defer | |
| 26 from twisted.web import server | |
| 27 from twisted.web import error as weberror | |
| 28 from twisted.web.static import File | |
| 61 | 29 from twisted.web.resource import Resource, NoResource |
|
172
631556a64850
server side: added root redirection to libervia.html
Goffi <goffi@goffi.org>
parents:
165
diff
changeset
|
30 from twisted.web.util import Redirect |
|
44
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
31 from twisted.python.components import registerAdapter |
|
219
36673d19c87e
server side: better async bridge calls handling
Goffi <goffi@goffi.org>
parents:
218
diff
changeset
|
32 from twisted.python.failure import Failure |
| 10 | 33 from twisted.words.protocols.jabber.jid import JID |
| 0 | 34 from txjsonrpc.web import jsonrpc |
| 35 from txjsonrpc import jsonrpclib | |
| 36 from sat_frontends.bridge.DBus import DBusBridgeFrontend,BridgeExceptionNoService | |
| 46 | 37 from logging import debug, info, warning, error |
| 127 | 38 import re, glob |
| 39 import os.path, sys | |
| 40 import tempfile, shutil, uuid | |
| 10 | 41 from server_side.blog import MicroBlog |
|
44
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
42 from zope.interface import Interface, Attribute, implements |
|
215
e830a0c60d32
server side: added the security_limit to setParam
souliane <souliane@mailoo.org>
parents:
214
diff
changeset
|
43 from xml.dom import minidom |
|
317
bbadd490e63c
misc: gather the constants in a single file, as it is done for other frontends
souliane <souliane@mailoo.org>
parents:
309
diff
changeset
|
44 from constants import Const |
|
318
c12c9a1acf2f
server_side: added support for paramsRegisterApp to define frontend's specific parameters like "Enable unibox"
souliane <souliane@mailoo.org>
parents:
317
diff
changeset
|
45 from sat.core.i18n import _, D_ |
| 10 | 46 |
|
215
e830a0c60d32
server side: added the security_limit to setParam
souliane <souliane@mailoo.org>
parents:
214
diff
changeset
|
47 |
|
44
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
48 class ISATSession(Interface): |
|
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
49 profile = Attribute("Sat profile") |
|
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
50 jid = Attribute("JID associated with the profile") |
|
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
51 |
|
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
52 class SATSession(object): |
|
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
53 implements(ISATSession) |
|
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
54 def __init__(self, session): |
|
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
55 self.profile = None |
|
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
56 self.jid = None |
|
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
57 |
|
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
58 class LiberviaSession(server.Session): |
|
317
bbadd490e63c
misc: gather the constants in a single file, as it is done for other frontends
souliane <souliane@mailoo.org>
parents:
309
diff
changeset
|
59 sessionTimeout = Const.TIMEOUT |
|
44
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
60 |
|
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
61 def __init__(self, *args, **kwargs): |
|
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
62 self.__lock = False |
|
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
63 server.Session.__init__(self, *args, **kwargs) |
|
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
64 |
|
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
65 def lock(self): |
|
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
66 """Prevent session from expiring""" |
|
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
67 self.__lock = True |
|
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
68 self._expireCall.reset(sys.maxint) |
|
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
69 |
|
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
70 def unlock(self): |
|
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
71 """Allow session to expire again, and touch it""" |
|
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
72 self.__lock = False |
|
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
73 self.touch() |
|
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
74 |
|
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
75 def touch(self): |
|
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
76 if not self.__lock: |
|
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
77 server.Session.touch(self) |
|
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
78 |
|
59
d0fa4e96a5e4
server side: 404 error is now sent instead of directory listing when requesting a directory
Goffi <goffi@goffi.org>
parents:
57
diff
changeset
|
79 class ProtectedFile(File): |
|
d0fa4e96a5e4
server side: 404 error is now sent instead of directory listing when requesting a directory
Goffi <goffi@goffi.org>
parents:
57
diff
changeset
|
80 """A File class which doens't show directory listing""" |
|
d0fa4e96a5e4
server side: 404 error is now sent instead of directory listing when requesting a directory
Goffi <goffi@goffi.org>
parents:
57
diff
changeset
|
81 |
|
d0fa4e96a5e4
server side: 404 error is now sent instead of directory listing when requesting a directory
Goffi <goffi@goffi.org>
parents:
57
diff
changeset
|
82 def directoryListing(self): |
|
d0fa4e96a5e4
server side: 404 error is now sent instead of directory listing when requesting a directory
Goffi <goffi@goffi.org>
parents:
57
diff
changeset
|
83 return NoResource() |
|
d0fa4e96a5e4
server side: 404 error is now sent instead of directory listing when requesting a directory
Goffi <goffi@goffi.org>
parents:
57
diff
changeset
|
84 |
| 46 | 85 class SATActionIDHandler(object): |
|
140
09a512d9a0c0
server side: fixed getHistory call and action result management
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
86 """Manage SàT action action_id lifecycle""" |
|
09a512d9a0c0
server side: fixed getHistory call and action result management
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
87 ID_LIFETIME = 30 #after this time (in seconds), action_id will be suppressed and action result will be ignored |
| 46 | 88 |
| 89 def __init__(self): | |
| 90 self.waiting_ids = {} | |
| 91 | |
|
140
09a512d9a0c0
server side: fixed getHistory call and action result management
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
92 def waitForId(self, callback, action_id, profile, *args, **kwargs): |
| 46 | 93 """Wait for an action result |
| 94 @param callback: method to call when action gave a result back | |
|
140
09a512d9a0c0
server side: fixed getHistory call and action result management
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
95 @param action_id: action_id to wait for |
|
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
96 @param profile: %(doc_profile)s |
| 46 | 97 @param *args: additional argument to pass to callback |
| 98 @param **kwargs: idem""" | |
|
140
09a512d9a0c0
server side: fixed getHistory call and action result management
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
99 action_tuple = (action_id, profile) |
|
09a512d9a0c0
server side: fixed getHistory call and action result management
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
100 self.waiting_ids[action_tuple] = (callback, args, kwargs) |
|
09a512d9a0c0
server side: fixed getHistory call and action result management
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
101 reactor.callLater(self.ID_LIFETIME, self.purgeID, action_tuple) |
| 46 | 102 |
|
140
09a512d9a0c0
server side: fixed getHistory call and action result management
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
103 def purgeID(self, action_tuple): |
|
09a512d9a0c0
server side: fixed getHistory call and action result management
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
104 """Called when an action_id has not be handled in time""" |
|
09a512d9a0c0
server side: fixed getHistory call and action result management
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
105 if action_tuple in self.waiting_ids: |
|
09a512d9a0c0
server side: fixed getHistory call and action result management
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
106 warning ("action of action_id %s [%s] has not been managed, action_id is now ignored" % action_tuple) |
|
09a512d9a0c0
server side: fixed getHistory call and action result management
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
107 del self.waiting_ids[action_tuple] |
| 46 | 108 |
|
140
09a512d9a0c0
server side: fixed getHistory call and action result management
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
109 def actionResultCb(self, answer_type, action_id, data, profile): |
| 46 | 110 """Manage the actionResult signal""" |
|
140
09a512d9a0c0
server side: fixed getHistory call and action result management
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
111 action_tuple = (action_id, profile) |
|
09a512d9a0c0
server side: fixed getHistory call and action result management
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
112 if action_tuple in self.waiting_ids: |
|
09a512d9a0c0
server side: fixed getHistory call and action result management
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
113 callback, args, kwargs = self.waiting_ids[action_tuple] |
|
09a512d9a0c0
server side: fixed getHistory call and action result management
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
114 del self.waiting_ids[action_tuple] |
|
09a512d9a0c0
server side: fixed getHistory call and action result management
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
115 callback(answer_type, action_id, data, *args, **kwargs) |
|
44
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
116 |
|
219
36673d19c87e
server side: better async bridge calls handling
Goffi <goffi@goffi.org>
parents:
218
diff
changeset
|
117 class JSONRPCMethodManager(jsonrpc.JSONRPC): |
| 0 | 118 |
| 119 def __init__(self, sat_host): | |
| 120 jsonrpc.JSONRPC.__init__(self) | |
| 121 self.sat_host=sat_host | |
|
219
36673d19c87e
server side: better async bridge calls handling
Goffi <goffi@goffi.org>
parents:
218
diff
changeset
|
122 |
|
36673d19c87e
server side: better async bridge calls handling
Goffi <goffi@goffi.org>
parents:
218
diff
changeset
|
123 def asyncBridgeCall(self, method_name, *args, **kwargs): |
|
36673d19c87e
server side: better async bridge calls handling
Goffi <goffi@goffi.org>
parents:
218
diff
changeset
|
124 """Call an asynchrone bridge method and return a deferred |
|
36673d19c87e
server side: better async bridge calls handling
Goffi <goffi@goffi.org>
parents:
218
diff
changeset
|
125 @param method_name: name of the method as a unicode |
|
36673d19c87e
server side: better async bridge calls handling
Goffi <goffi@goffi.org>
parents:
218
diff
changeset
|
126 @return: a deferred which trigger the result |
|
36673d19c87e
server side: better async bridge calls handling
Goffi <goffi@goffi.org>
parents:
218
diff
changeset
|
127 |
|
36673d19c87e
server side: better async bridge calls handling
Goffi <goffi@goffi.org>
parents:
218
diff
changeset
|
128 """ |
|
36673d19c87e
server side: better async bridge calls handling
Goffi <goffi@goffi.org>
parents:
218
diff
changeset
|
129 d = defer.Deferred() |
|
36673d19c87e
server side: better async bridge calls handling
Goffi <goffi@goffi.org>
parents:
218
diff
changeset
|
130 |
|
36673d19c87e
server side: better async bridge calls handling
Goffi <goffi@goffi.org>
parents:
218
diff
changeset
|
131 def _callback(*args): |
|
36673d19c87e
server side: better async bridge calls handling
Goffi <goffi@goffi.org>
parents:
218
diff
changeset
|
132 if not args: |
|
36673d19c87e
server side: better async bridge calls handling
Goffi <goffi@goffi.org>
parents:
218
diff
changeset
|
133 d.callback(None) |
|
36673d19c87e
server side: better async bridge calls handling
Goffi <goffi@goffi.org>
parents:
218
diff
changeset
|
134 else: |
|
36673d19c87e
server side: better async bridge calls handling
Goffi <goffi@goffi.org>
parents:
218
diff
changeset
|
135 if len(args) != 1: |
|
36673d19c87e
server side: better async bridge calls handling
Goffi <goffi@goffi.org>
parents:
218
diff
changeset
|
136 Exception("Multiple return arguments not supported") |
|
36673d19c87e
server side: better async bridge calls handling
Goffi <goffi@goffi.org>
parents:
218
diff
changeset
|
137 d.callback(args[0]) |
|
36673d19c87e
server side: better async bridge calls handling
Goffi <goffi@goffi.org>
parents:
218
diff
changeset
|
138 |
|
36673d19c87e
server side: better async bridge calls handling
Goffi <goffi@goffi.org>
parents:
218
diff
changeset
|
139 def _errback(result): |
|
317
bbadd490e63c
misc: gather the constants in a single file, as it is done for other frontends
souliane <souliane@mailoo.org>
parents:
309
diff
changeset
|
140 d.errback(Failure(jsonrpclib.Fault(Const.ERRNUM_BRIDGE_ERRBACK, unicode(result)))) |
|
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
141 |
|
277
ea2d4f464b5a
server side: fixed bad async bridge calls management
Goffi <goffi@goffi.org>
parents:
275
diff
changeset
|
142 kwargs["callback"] = _callback |
|
219
36673d19c87e
server side: better async bridge calls handling
Goffi <goffi@goffi.org>
parents:
218
diff
changeset
|
143 kwargs["errback"] = _errback |
|
36673d19c87e
server side: better async bridge calls handling
Goffi <goffi@goffi.org>
parents:
218
diff
changeset
|
144 getattr(self.sat_host.bridge, method_name)(*args, **kwargs) |
|
36673d19c87e
server side: better async bridge calls handling
Goffi <goffi@goffi.org>
parents:
218
diff
changeset
|
145 return d |
|
36673d19c87e
server side: better async bridge calls handling
Goffi <goffi@goffi.org>
parents:
218
diff
changeset
|
146 |
|
36673d19c87e
server side: better async bridge calls handling
Goffi <goffi@goffi.org>
parents:
218
diff
changeset
|
147 |
|
36673d19c87e
server side: better async bridge calls handling
Goffi <goffi@goffi.org>
parents:
218
diff
changeset
|
148 class MethodHandler(JSONRPCMethodManager): |
|
36673d19c87e
server side: better async bridge calls handling
Goffi <goffi@goffi.org>
parents:
218
diff
changeset
|
149 |
|
36673d19c87e
server side: better async bridge calls handling
Goffi <goffi@goffi.org>
parents:
218
diff
changeset
|
150 def __init__(self, sat_host): |
|
36673d19c87e
server side: better async bridge calls handling
Goffi <goffi@goffi.org>
parents:
218
diff
changeset
|
151 JSONRPCMethodManager.__init__(self, sat_host) |
|
215
e830a0c60d32
server side: added the security_limit to setParam
souliane <souliane@mailoo.org>
parents:
214
diff
changeset
|
152 self.authorized_params = None |
| 0 | 153 |
| 154 def render(self, request): | |
| 1 | 155 self.session = request.getSession() |
|
44
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
156 profile = ISATSession(self.session).profile |
|
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
157 if not profile: |
| 0 | 158 #user is not identified, we return a jsonrpc fault |
| 159 parsed = jsonrpclib.loads(request.content.read()) | |
|
317
bbadd490e63c
misc: gather the constants in a single file, as it is done for other frontends
souliane <souliane@mailoo.org>
parents:
309
diff
changeset
|
160 fault = jsonrpclib.Fault(Const.ERRNUM_LIBERVIA, "Not allowed") #FIXME: define some standard error codes for libervia |
| 0 | 161 return jsonrpc.JSONRPC._cbRender(self, fault, request, parsed.get('id'), parsed.get('jsonrpc')) |
| 162 return jsonrpc.JSONRPC.render(self, request) | |
| 19 | 163 |
| 164 def jsonrpc_getProfileJid(self): | |
| 165 """Return the jid of the profile""" | |
|
44
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
166 sat_session = ISATSession(self.session) |
|
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
167 profile = sat_session.profile |
| 61 | 168 sat_session.jid = JID(self.sat_host.bridge.getParamA("JabberID", "Connection", profile_key=profile)) |
| 169 return sat_session.jid.full() | |
|
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
170 |
| 156 | 171 def jsonrpc_disconnect(self): |
| 172 """Disconnect the profile""" | |
| 173 sat_session = ISATSession(self.session) | |
| 174 profile = sat_session.profile | |
| 175 self.sat_host.bridge.disconnect(profile) | |
|
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
176 |
| 0 | 177 def jsonrpc_getContacts(self): |
| 178 """Return all passed args.""" | |
|
44
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
179 profile = ISATSession(self.session).profile |
| 1 | 180 return self.sat_host.bridge.getContacts(profile) |
| 20 | 181 |
|
54
f25c4077f6b9
addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents:
50
diff
changeset
|
182 def jsonrpc_addContact(self, entity, name, groups): |
|
f25c4077f6b9
addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents:
50
diff
changeset
|
183 """Subscribe to contact presence, and add it to the given groups""" |
|
f25c4077f6b9
addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents:
50
diff
changeset
|
184 profile = ISATSession(self.session).profile |
|
f25c4077f6b9
addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents:
50
diff
changeset
|
185 self.sat_host.bridge.addContact(entity, profile) |
|
f25c4077f6b9
addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents:
50
diff
changeset
|
186 self.sat_host.bridge.updateContact(entity, name, groups, profile) |
|
f25c4077f6b9
addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents:
50
diff
changeset
|
187 |
|
55
d5266c41ca24
Roster list update, contact deletion + some refactoring
Goffi <goffi@goffi.org>
parents:
54
diff
changeset
|
188 def jsonrpc_delContact(self, entity): |
|
d5266c41ca24
Roster list update, contact deletion + some refactoring
Goffi <goffi@goffi.org>
parents:
54
diff
changeset
|
189 """Remove contact from contacts list""" |
|
d5266c41ca24
Roster list update, contact deletion + some refactoring
Goffi <goffi@goffi.org>
parents:
54
diff
changeset
|
190 profile = ISATSession(self.session).profile |
|
d5266c41ca24
Roster list update, contact deletion + some refactoring
Goffi <goffi@goffi.org>
parents:
54
diff
changeset
|
191 self.sat_host.bridge.delContact(entity, profile) |
|
d5266c41ca24
Roster list update, contact deletion + some refactoring
Goffi <goffi@goffi.org>
parents:
54
diff
changeset
|
192 |
|
57
e552a67b933d
Contact update + add dedication in About dialog
Goffi <goffi@goffi.org>
parents:
55
diff
changeset
|
193 def jsonrpc_updateContact(self, entity, name, groups): |
|
e552a67b933d
Contact update + add dedication in About dialog
Goffi <goffi@goffi.org>
parents:
55
diff
changeset
|
194 """Update contact's roster item""" |
|
e552a67b933d
Contact update + add dedication in About dialog
Goffi <goffi@goffi.org>
parents:
55
diff
changeset
|
195 profile = ISATSession(self.session).profile |
|
e552a67b933d
Contact update + add dedication in About dialog
Goffi <goffi@goffi.org>
parents:
55
diff
changeset
|
196 self.sat_host.bridge.updateContact(entity, name, groups, profile) |
|
e552a67b933d
Contact update + add dedication in About dialog
Goffi <goffi@goffi.org>
parents:
55
diff
changeset
|
197 |
|
54
f25c4077f6b9
addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents:
50
diff
changeset
|
198 def jsonrpc_subscription(self, sub_type, entity, name, groups): |
|
f25c4077f6b9
addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents:
50
diff
changeset
|
199 """Confirm (or infirm) subscription, |
|
f25c4077f6b9
addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents:
50
diff
changeset
|
200 and setup user roster in case of subscription""" |
|
f25c4077f6b9
addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents:
50
diff
changeset
|
201 profile = ISATSession(self.session).profile |
|
f25c4077f6b9
addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents:
50
diff
changeset
|
202 self.sat_host.bridge.subscription(sub_type, entity, profile) |
|
f25c4077f6b9
addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents:
50
diff
changeset
|
203 if sub_type == 'subscribed': |
|
f25c4077f6b9
addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents:
50
diff
changeset
|
204 self.sat_host.bridge.updateContact(entity, name, groups, profile) |
|
f25c4077f6b9
addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents:
50
diff
changeset
|
205 |
|
f25c4077f6b9
addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents:
50
diff
changeset
|
206 def jsonrpc_getWaitingSub(self): |
|
f25c4077f6b9
addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents:
50
diff
changeset
|
207 """Return list of room already joined by user""" |
|
f25c4077f6b9
addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents:
50
diff
changeset
|
208 profile = ISATSession(self.session).profile |
|
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
209 return self.sat_host.bridge.getWaitingSub(profile) |
|
54
f25c4077f6b9
addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents:
50
diff
changeset
|
210 |
|
279
2d6bd975a72d
browser_side: set your own presence status and display those of others
souliane <souliane@mailoo.org>
parents:
277
diff
changeset
|
211 def jsonrpc_setStatus(self, presence, status): |
|
2d6bd975a72d
browser_side: set your own presence status and display those of others
souliane <souliane@mailoo.org>
parents:
277
diff
changeset
|
212 """Change the presence and/or status |
|
2d6bd975a72d
browser_side: set your own presence status and display those of others
souliane <souliane@mailoo.org>
parents:
277
diff
changeset
|
213 @param presence: value from ("", "chat", "away", "dnd", "xa") |
|
2d6bd975a72d
browser_side: set your own presence status and display those of others
souliane <souliane@mailoo.org>
parents:
277
diff
changeset
|
214 @param status: any string to describe your status |
|
2d6bd975a72d
browser_side: set your own presence status and display those of others
souliane <souliane@mailoo.org>
parents:
277
diff
changeset
|
215 """ |
|
44
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
216 profile = ISATSession(self.session).profile |
|
279
2d6bd975a72d
browser_side: set your own presence status and display those of others
souliane <souliane@mailoo.org>
parents:
277
diff
changeset
|
217 self.sat_host.bridge.setPresence('', presence, 0, {'': status}, profile) |
| 20 | 218 |
|
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
219 |
|
297
19bcd39c77f6
server side: sendMessage is now async
Goffi <goffi@goffi.org>
parents:
296
diff
changeset
|
220 def jsonrpc_sendMessage(self, to_jid, msg, subject, type_, options={}): |
| 19 | 221 """send message""" |
|
44
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
222 profile = ISATSession(self.session).profile |
|
297
19bcd39c77f6
server side: sendMessage is now async
Goffi <goffi@goffi.org>
parents:
296
diff
changeset
|
223 return self.asyncBridgeCall("sendMessage", to_jid, msg, subject, type_, options, profile) |
| 0 | 224 |
|
297
19bcd39c77f6
server side: sendMessage is now async
Goffi <goffi@goffi.org>
parents:
296
diff
changeset
|
225 def jsonrpc_sendMblog(self, type_, dest, text, extra={}): |
|
201
aa76793da353
server + browser: message warning level/sending refactoring:
Goffi <goffi@goffi.org>
parents:
179
diff
changeset
|
226 """ Send microblog message |
|
297
19bcd39c77f6
server side: sendMessage is now async
Goffi <goffi@goffi.org>
parents:
296
diff
changeset
|
227 @param type_: one of "PUBLIC", "GROUP" |
|
201
aa76793da353
server + browser: message warning level/sending refactoring:
Goffi <goffi@goffi.org>
parents:
179
diff
changeset
|
228 @param dest: destinees (list of groups, ignored for "PUBLIC") |
|
aa76793da353
server + browser: message warning level/sending refactoring:
Goffi <goffi@goffi.org>
parents:
179
diff
changeset
|
229 @param text: microblog's text |
|
aa76793da353
server + browser: message warning level/sending refactoring:
Goffi <goffi@goffi.org>
parents:
179
diff
changeset
|
230 """ |
|
44
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
231 profile = ISATSession(self.session).profile |
|
259
a20815c75c15
server_side: extra data is now added for sendMblog, allowing to send rich text with the 'rich' key.
Goffi <goffi@goffi.org>
parents:
258
diff
changeset
|
232 extra['allow_comments'] = 'True' |
|
a20815c75c15
server_side: extra data is now added for sendMblog, allowing to send rich text with the 'rich' key.
Goffi <goffi@goffi.org>
parents:
258
diff
changeset
|
233 |
|
309
05e264e96a1c
browser_side: make unibox optional
souliane <souliane@mailoo.org>
parents:
308
diff
changeset
|
234 if not type_: # auto-detect |
|
05e264e96a1c
browser_side: make unibox optional
souliane <souliane@mailoo.org>
parents:
308
diff
changeset
|
235 type_ = "PUBLIC" if dest == [] else "GROUP" |
|
05e264e96a1c
browser_side: make unibox optional
souliane <souliane@mailoo.org>
parents:
308
diff
changeset
|
236 |
|
297
19bcd39c77f6
server side: sendMessage is now async
Goffi <goffi@goffi.org>
parents:
296
diff
changeset
|
237 if type_ in ("PUBLIC", "GROUP") and text: |
|
19bcd39c77f6
server side: sendMessage is now async
Goffi <goffi@goffi.org>
parents:
296
diff
changeset
|
238 if type_ == "PUBLIC": |
|
14
9bf8ed012adc
- Group microblog management, first draft
Goffi <goffi@goffi.org>
parents:
11
diff
changeset
|
239 #This text if for the public microblog |
|
133
4ad621df9e34
browser side: group blog is now used to send all microblogs
Goffi <goffi@goffi.org>
parents:
132
diff
changeset
|
240 print "sending public blog" |
|
259
a20815c75c15
server_side: extra data is now added for sendMblog, allowing to send rich text with the 'rich' key.
Goffi <goffi@goffi.org>
parents:
258
diff
changeset
|
241 return self.sat_host.bridge.sendGroupBlog("PUBLIC", [], text, extra, profile) |
|
14
9bf8ed012adc
- Group microblog management, first draft
Goffi <goffi@goffi.org>
parents:
11
diff
changeset
|
242 else: |
|
133
4ad621df9e34
browser side: group blog is now used to send all microblogs
Goffi <goffi@goffi.org>
parents:
132
diff
changeset
|
243 print "sending group blog" |
|
259
a20815c75c15
server_side: extra data is now added for sendMblog, allowing to send rich text with the 'rich' key.
Goffi <goffi@goffi.org>
parents:
258
diff
changeset
|
244 return self.sat_host.bridge.sendGroupBlog("GROUP", [dest], text, extra, profile) |
|
202
2bc6cf004e61
browser, server: comments handling:
Goffi <goffi@goffi.org>
parents:
201
diff
changeset
|
245 else: |
|
2bc6cf004e61
browser, server: comments handling:
Goffi <goffi@goffi.org>
parents:
201
diff
changeset
|
246 raise Exception("Invalid data") |
|
2bc6cf004e61
browser, server: comments handling:
Goffi <goffi@goffi.org>
parents:
201
diff
changeset
|
247 |
|
282
ae3ec654836d
browser_side: added blog item modification/deletion
souliane <souliane@mailoo.org>
parents:
279
diff
changeset
|
248 def jsonrpc_deleteMblog(self, pub_data, comments): |
|
ae3ec654836d
browser_side: added blog item modification/deletion
souliane <souliane@mailoo.org>
parents:
279
diff
changeset
|
249 """Delete a microblog node |
|
ae3ec654836d
browser_side: added blog item modification/deletion
souliane <souliane@mailoo.org>
parents:
279
diff
changeset
|
250 @param pub_data: a tuple (service, comment node identifier, item identifier) |
|
ae3ec654836d
browser_side: added blog item modification/deletion
souliane <souliane@mailoo.org>
parents:
279
diff
changeset
|
251 @param comments: comments node identifier (for main item) or False |
|
ae3ec654836d
browser_side: added blog item modification/deletion
souliane <souliane@mailoo.org>
parents:
279
diff
changeset
|
252 """ |
|
ae3ec654836d
browser_side: added blog item modification/deletion
souliane <souliane@mailoo.org>
parents:
279
diff
changeset
|
253 profile = ISATSession(self.session).profile |
|
ae3ec654836d
browser_side: added blog item modification/deletion
souliane <souliane@mailoo.org>
parents:
279
diff
changeset
|
254 return self.sat_host.bridge.deleteGroupBlog(pub_data, comments if comments else '', profile) |
|
ae3ec654836d
browser_side: added blog item modification/deletion
souliane <souliane@mailoo.org>
parents:
279
diff
changeset
|
255 |
|
ae3ec654836d
browser_side: added blog item modification/deletion
souliane <souliane@mailoo.org>
parents:
279
diff
changeset
|
256 def jsonrpc_updateMblog(self, pub_data, comments, message, extra={}): |
|
ae3ec654836d
browser_side: added blog item modification/deletion
souliane <souliane@mailoo.org>
parents:
279
diff
changeset
|
257 """Modify a microblog node |
|
ae3ec654836d
browser_side: added blog item modification/deletion
souliane <souliane@mailoo.org>
parents:
279
diff
changeset
|
258 @param pub_data: a tuple (service, comment node identifier, item identifier) |
|
ae3ec654836d
browser_side: added blog item modification/deletion
souliane <souliane@mailoo.org>
parents:
279
diff
changeset
|
259 @param comments: comments node identifier (for main item) or False |
|
ae3ec654836d
browser_side: added blog item modification/deletion
souliane <souliane@mailoo.org>
parents:
279
diff
changeset
|
260 @param message: new message |
|
ae3ec654836d
browser_side: added blog item modification/deletion
souliane <souliane@mailoo.org>
parents:
279
diff
changeset
|
261 @param extra: dict which option name as key, which can be: |
|
ae3ec654836d
browser_side: added blog item modification/deletion
souliane <souliane@mailoo.org>
parents:
279
diff
changeset
|
262 - allow_comments: True to accept an other level of comments, False else (default: False) |
|
ae3ec654836d
browser_side: added blog item modification/deletion
souliane <souliane@mailoo.org>
parents:
279
diff
changeset
|
263 - rich: if present, contain rich text in currently selected syntax |
|
ae3ec654836d
browser_side: added blog item modification/deletion
souliane <souliane@mailoo.org>
parents:
279
diff
changeset
|
264 """ |
|
ae3ec654836d
browser_side: added blog item modification/deletion
souliane <souliane@mailoo.org>
parents:
279
diff
changeset
|
265 profile = ISATSession(self.session).profile |
|
ae3ec654836d
browser_side: added blog item modification/deletion
souliane <souliane@mailoo.org>
parents:
279
diff
changeset
|
266 if comments: |
|
ae3ec654836d
browser_side: added blog item modification/deletion
souliane <souliane@mailoo.org>
parents:
279
diff
changeset
|
267 extra['allow_comments'] = 'True' |
|
ae3ec654836d
browser_side: added blog item modification/deletion
souliane <souliane@mailoo.org>
parents:
279
diff
changeset
|
268 return self.sat_host.bridge.updateGroupBlog(pub_data, comments if comments else '', message, extra, profile) |
|
ae3ec654836d
browser_side: added blog item modification/deletion
souliane <souliane@mailoo.org>
parents:
279
diff
changeset
|
269 |
|
261
3df0c3634c29
browser side: management of extra data for sendMblogComment, allowing to send rich text for comments
Goffi <goffi@goffi.org>
parents:
259
diff
changeset
|
270 def jsonrpc_sendMblogComment(self, node, text, extra={}): |
|
202
2bc6cf004e61
browser, server: comments handling:
Goffi <goffi@goffi.org>
parents:
201
diff
changeset
|
271 """ Send microblog message |
|
2bc6cf004e61
browser, server: comments handling:
Goffi <goffi@goffi.org>
parents:
201
diff
changeset
|
272 @param node: url of the comments node |
|
2bc6cf004e61
browser, server: comments handling:
Goffi <goffi@goffi.org>
parents:
201
diff
changeset
|
273 @param text: comment |
|
2bc6cf004e61
browser, server: comments handling:
Goffi <goffi@goffi.org>
parents:
201
diff
changeset
|
274 """ |
|
2bc6cf004e61
browser, server: comments handling:
Goffi <goffi@goffi.org>
parents:
201
diff
changeset
|
275 profile = ISATSession(self.session).profile |
|
2bc6cf004e61
browser, server: comments handling:
Goffi <goffi@goffi.org>
parents:
201
diff
changeset
|
276 if node and text: |
|
261
3df0c3634c29
browser side: management of extra data for sendMblogComment, allowing to send rich text for comments
Goffi <goffi@goffi.org>
parents:
259
diff
changeset
|
277 return self.sat_host.bridge.sendGroupBlogComment(node, text, extra, profile) |
|
201
aa76793da353
server + browser: message warning level/sending refactoring:
Goffi <goffi@goffi.org>
parents:
179
diff
changeset
|
278 else: |
|
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
279 raise Exception("Invalid data") |
|
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
280 |
|
132
30d8e328559b
server & browser side: microblogging refactoring first draft
Goffi <goffi@goffi.org>
parents:
131
diff
changeset
|
281 def jsonrpc_getLastMblogs(self, publisher_jid, max_item): |
|
30d8e328559b
server & browser side: microblogging refactoring first draft
Goffi <goffi@goffi.org>
parents:
131
diff
changeset
|
282 """Get last microblogs posted by a contact |
|
30d8e328559b
server & browser side: microblogging refactoring first draft
Goffi <goffi@goffi.org>
parents:
131
diff
changeset
|
283 @param publisher_jid: jid of the publisher |
|
30d8e328559b
server & browser side: microblogging refactoring first draft
Goffi <goffi@goffi.org>
parents:
131
diff
changeset
|
284 @param max_item: number of items to ask |
|
30d8e328559b
server & browser side: microblogging refactoring first draft
Goffi <goffi@goffi.org>
parents:
131
diff
changeset
|
285 @return list of microblog data (dict)""" |
|
30d8e328559b
server & browser side: microblogging refactoring first draft
Goffi <goffi@goffi.org>
parents:
131
diff
changeset
|
286 profile = ISATSession(self.session).profile |
|
219
36673d19c87e
server side: better async bridge calls handling
Goffi <goffi@goffi.org>
parents:
218
diff
changeset
|
287 d = self.asyncBridgeCall("getLastGroupBlogs", publisher_jid, max_item, profile) |
|
132
30d8e328559b
server & browser side: microblogging refactoring first draft
Goffi <goffi@goffi.org>
parents:
131
diff
changeset
|
288 return d |
|
30d8e328559b
server & browser side: microblogging refactoring first draft
Goffi <goffi@goffi.org>
parents:
131
diff
changeset
|
289 |
|
30d8e328559b
server & browser side: microblogging refactoring first draft
Goffi <goffi@goffi.org>
parents:
131
diff
changeset
|
290 def jsonrpc_getMassiveLastMblogs(self, publishers_type, publishers_list, max_item): |
|
30d8e328559b
server & browser side: microblogging refactoring first draft
Goffi <goffi@goffi.org>
parents:
131
diff
changeset
|
291 """Get lasts microblogs posted by several contacts at once |
|
30d8e328559b
server & browser side: microblogging refactoring first draft
Goffi <goffi@goffi.org>
parents:
131
diff
changeset
|
292 @param publishers_type: one of "ALL", "GROUP", "JID" |
|
30d8e328559b
server & browser side: microblogging refactoring first draft
Goffi <goffi@goffi.org>
parents:
131
diff
changeset
|
293 @param publishers_list: list of publishers type (empty list of all, list of groups or list of jids) |
|
30d8e328559b
server & browser side: microblogging refactoring first draft
Goffi <goffi@goffi.org>
parents:
131
diff
changeset
|
294 @param max_item: number of items to ask |
|
30d8e328559b
server & browser side: microblogging refactoring first draft
Goffi <goffi@goffi.org>
parents:
131
diff
changeset
|
295 @return: dictionary key=publisher's jid, value=list of microblog data (dict)""" |
|
30d8e328559b
server & browser side: microblogging refactoring first draft
Goffi <goffi@goffi.org>
parents:
131
diff
changeset
|
296 profile = ISATSession(self.session).profile |
|
219
36673d19c87e
server side: better async bridge calls handling
Goffi <goffi@goffi.org>
parents:
218
diff
changeset
|
297 d = self.asyncBridgeCall("getMassiveLastGroupBlogs", publishers_type, publishers_list, max_item, profile) |
|
135
ceef355156de
server + browser side: groupblog subscription + fixed blog insertion order
Goffi <goffi@goffi.org>
parents:
133
diff
changeset
|
298 self.sat_host.bridge.massiveSubscribeGroupBlogs(publishers_type, publishers_list, profile) |
|
132
30d8e328559b
server & browser side: microblogging refactoring first draft
Goffi <goffi@goffi.org>
parents:
131
diff
changeset
|
299 return d |
|
14
9bf8ed012adc
- Group microblog management, first draft
Goffi <goffi@goffi.org>
parents:
11
diff
changeset
|
300 |
|
202
2bc6cf004e61
browser, server: comments handling:
Goffi <goffi@goffi.org>
parents:
201
diff
changeset
|
301 def jsonrpc_getMblogComments(self, service, node): |
|
2bc6cf004e61
browser, server: comments handling:
Goffi <goffi@goffi.org>
parents:
201
diff
changeset
|
302 """Get all comments of given node |
|
2bc6cf004e61
browser, server: comments handling:
Goffi <goffi@goffi.org>
parents:
201
diff
changeset
|
303 @param service: jid of the service hosting the node |
|
2bc6cf004e61
browser, server: comments handling:
Goffi <goffi@goffi.org>
parents:
201
diff
changeset
|
304 @param node: comments node |
|
2bc6cf004e61
browser, server: comments handling:
Goffi <goffi@goffi.org>
parents:
201
diff
changeset
|
305 """ |
|
2bc6cf004e61
browser, server: comments handling:
Goffi <goffi@goffi.org>
parents:
201
diff
changeset
|
306 profile = ISATSession(self.session).profile |
|
219
36673d19c87e
server side: better async bridge calls handling
Goffi <goffi@goffi.org>
parents:
218
diff
changeset
|
307 d = self.asyncBridgeCall("getGroupBlogComments", service, node, profile) |
|
202
2bc6cf004e61
browser, server: comments handling:
Goffi <goffi@goffi.org>
parents:
201
diff
changeset
|
308 return d |
|
2bc6cf004e61
browser, server: comments handling:
Goffi <goffi@goffi.org>
parents:
201
diff
changeset
|
309 |
|
2bc6cf004e61
browser, server: comments handling:
Goffi <goffi@goffi.org>
parents:
201
diff
changeset
|
310 |
| 20 | 311 def jsonrpc_getPresenceStatus(self): |
| 312 """Get Presence information for connected contacts""" | |
|
44
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
313 profile = ISATSession(self.session).profile |
|
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
314 return self.sat_host.bridge.getPresenceStatus(profile) |
| 20 | 315 |
| 123 | 316 def jsonrpc_getHistory(self, from_jid, to_jid, size, between): |
| 19 | 317 """Return history for the from_jid/to_jid couple""" |
|
44
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
318 sat_session = ISATSession(self.session) |
|
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
319 profile = sat_session.profile |
|
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
320 sat_jid = sat_session.jid |
|
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
321 if not sat_jid: |
| 19 | 322 error("No jid saved for this profile") |
| 323 return {} | |
|
44
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
324 if JID(from_jid).userhost() != sat_jid.userhost() and JID(to_jid).userhost() != sat_jid.userhost(): |
| 19 | 325 error("Trying to get history from a different jid, maybe a hack attempt ?") |
| 326 return {} | |
|
219
36673d19c87e
server side: better async bridge calls handling
Goffi <goffi@goffi.org>
parents:
218
diff
changeset
|
327 d = self.asyncBridgeCall("getHistory", from_jid, to_jid, size, between, profile) |
| 123 | 328 def show(result_dbus): |
| 329 result = [] | |
| 330 for line in result_dbus: | |
| 331 #XXX: we have to do this stupid thing because Python D-Bus use its own types instead of standard types | |
| 332 # and txJsonRPC doesn't accept D-Bus types, resulting in a empty query | |
|
235
b304cdf13a3b
browser and server side: XHTML handling, first draft:
Goffi <goffi@goffi.org>
parents:
229
diff
changeset
|
333 timestamp, from_jid, to_jid, message, mess_type, extra = line |
|
b304cdf13a3b
browser and server side: XHTML handling, first draft:
Goffi <goffi@goffi.org>
parents:
229
diff
changeset
|
334 result.append((float(timestamp), unicode(from_jid), unicode(to_jid), unicode(message), unicode(mess_type), dict(extra))) |
| 123 | 335 return result |
| 336 d.addCallback(show) | |
| 337 return d | |
| 19 | 338 |
| 50 | 339 def jsonrpc_joinMUC(self, room_jid, nick): |
|
266
cc778206b7ae
bridge: added inviteMUC + modify joinMUC to make it accept room_jid = ""
souliane <souliane@mailoo.org>
parents:
261
diff
changeset
|
340 """Join a Multi-User Chat room |
|
cc778206b7ae
bridge: added inviteMUC + modify joinMUC to make it accept room_jid = ""
souliane <souliane@mailoo.org>
parents:
261
diff
changeset
|
341 @room_jid: leave empty string to generate a unique name |
|
cc778206b7ae
bridge: added inviteMUC + modify joinMUC to make it accept room_jid = ""
souliane <souliane@mailoo.org>
parents:
261
diff
changeset
|
342 """ |
| 50 | 343 profile = ISATSession(self.session).profile |
| 344 try: | |
|
266
cc778206b7ae
bridge: added inviteMUC + modify joinMUC to make it accept room_jid = ""
souliane <souliane@mailoo.org>
parents:
261
diff
changeset
|
345 if room_jid != "": |
|
cc778206b7ae
bridge: added inviteMUC + modify joinMUC to make it accept room_jid = ""
souliane <souliane@mailoo.org>
parents:
261
diff
changeset
|
346 room_jid = JID(room_jid).userhost() |
| 50 | 347 except: |
| 348 warning('Invalid room jid') | |
| 349 return | |
|
266
cc778206b7ae
bridge: added inviteMUC + modify joinMUC to make it accept room_jid = ""
souliane <souliane@mailoo.org>
parents:
261
diff
changeset
|
350 d = self.asyncBridgeCall("joinMUC", room_jid, nick, {}, profile) |
|
cc778206b7ae
bridge: added inviteMUC + modify joinMUC to make it accept room_jid = ""
souliane <souliane@mailoo.org>
parents:
261
diff
changeset
|
351 return d |
|
cc778206b7ae
bridge: added inviteMUC + modify joinMUC to make it accept room_jid = ""
souliane <souliane@mailoo.org>
parents:
261
diff
changeset
|
352 |
|
cc778206b7ae
bridge: added inviteMUC + modify joinMUC to make it accept room_jid = ""
souliane <souliane@mailoo.org>
parents:
261
diff
changeset
|
353 def jsonrpc_inviteMUC(self, contact_jid, room_jid): |
|
cc778206b7ae
bridge: added inviteMUC + modify joinMUC to make it accept room_jid = ""
souliane <souliane@mailoo.org>
parents:
261
diff
changeset
|
354 """Invite a user to a Multi-User Chat room""" |
|
cc778206b7ae
bridge: added inviteMUC + modify joinMUC to make it accept room_jid = ""
souliane <souliane@mailoo.org>
parents:
261
diff
changeset
|
355 profile = ISATSession(self.session).profile |
|
cc778206b7ae
bridge: added inviteMUC + modify joinMUC to make it accept room_jid = ""
souliane <souliane@mailoo.org>
parents:
261
diff
changeset
|
356 try: |
|
cc778206b7ae
bridge: added inviteMUC + modify joinMUC to make it accept room_jid = ""
souliane <souliane@mailoo.org>
parents:
261
diff
changeset
|
357 room_jid = JID(room_jid).userhost() |
|
cc778206b7ae
bridge: added inviteMUC + modify joinMUC to make it accept room_jid = ""
souliane <souliane@mailoo.org>
parents:
261
diff
changeset
|
358 except: |
|
cc778206b7ae
bridge: added inviteMUC + modify joinMUC to make it accept room_jid = ""
souliane <souliane@mailoo.org>
parents:
261
diff
changeset
|
359 warning('Invalid room jid') |
|
cc778206b7ae
bridge: added inviteMUC + modify joinMUC to make it accept room_jid = ""
souliane <souliane@mailoo.org>
parents:
261
diff
changeset
|
360 return |
|
cc778206b7ae
bridge: added inviteMUC + modify joinMUC to make it accept room_jid = ""
souliane <souliane@mailoo.org>
parents:
261
diff
changeset
|
361 room_id = room_jid.split("@")[0] |
|
cc778206b7ae
bridge: added inviteMUC + modify joinMUC to make it accept room_jid = ""
souliane <souliane@mailoo.org>
parents:
261
diff
changeset
|
362 service = room_jid.split("@")[1] |
|
cc778206b7ae
bridge: added inviteMUC + modify joinMUC to make it accept room_jid = ""
souliane <souliane@mailoo.org>
parents:
261
diff
changeset
|
363 self.sat_host.bridge.inviteMUC(contact_jid, service, room_id, {}, profile) |
| 50 | 364 |
|
179
8475a29d7214
closing a group chat widget now leave the muc room (bug 11)
Goffi <goffi@goffi.org>
parents:
172
diff
changeset
|
365 def jsonrpc_mucLeave(self, room_jid): |
|
8475a29d7214
closing a group chat widget now leave the muc room (bug 11)
Goffi <goffi@goffi.org>
parents:
172
diff
changeset
|
366 """Quit a Multi-User Chat room""" |
|
8475a29d7214
closing a group chat widget now leave the muc room (bug 11)
Goffi <goffi@goffi.org>
parents:
172
diff
changeset
|
367 profile = ISATSession(self.session).profile |
|
8475a29d7214
closing a group chat widget now leave the muc room (bug 11)
Goffi <goffi@goffi.org>
parents:
172
diff
changeset
|
368 try: |
|
8475a29d7214
closing a group chat widget now leave the muc room (bug 11)
Goffi <goffi@goffi.org>
parents:
172
diff
changeset
|
369 room_jid = JID(room_jid) |
|
8475a29d7214
closing a group chat widget now leave the muc room (bug 11)
Goffi <goffi@goffi.org>
parents:
172
diff
changeset
|
370 except: |
|
8475a29d7214
closing a group chat widget now leave the muc room (bug 11)
Goffi <goffi@goffi.org>
parents:
172
diff
changeset
|
371 warning('Invalid room jid') |
|
8475a29d7214
closing a group chat widget now leave the muc room (bug 11)
Goffi <goffi@goffi.org>
parents:
172
diff
changeset
|
372 return |
|
8475a29d7214
closing a group chat widget now leave the muc room (bug 11)
Goffi <goffi@goffi.org>
parents:
172
diff
changeset
|
373 self.sat_host.bridge.mucLeave(room_jid.userhost(), profile) |
|
8475a29d7214
closing a group chat widget now leave the muc room (bug 11)
Goffi <goffi@goffi.org>
parents:
172
diff
changeset
|
374 |
| 121 | 375 def jsonrpc_getRoomsJoined(self): |
|
30
7684e3ceb12d
server_side: added getRoomJoined method
Goffi <goffi@goffi.org>
parents:
24
diff
changeset
|
376 """Return list of room already joined by user""" |
|
44
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
377 profile = ISATSession(self.session).profile |
|
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
378 return self.sat_host.bridge.getRoomsJoined(profile) |
|
30
7684e3ceb12d
server_side: added getRoomJoined method
Goffi <goffi@goffi.org>
parents:
24
diff
changeset
|
379 |
|
268
79970bf6af93
browser_side: added class RoomAndContactsChooser:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
380 def jsonrpc_launchTarotGame(self, other_players, room_jid=""): |
|
79970bf6af93
browser_side: added class RoomAndContactsChooser:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
381 """Create a room, invite the other players and start a Tarot game |
|
79970bf6af93
browser_side: added class RoomAndContactsChooser:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
382 @param room_jid: leave empty string to generate a unique room name |
|
79970bf6af93
browser_side: added class RoomAndContactsChooser:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
383 """ |
|
44
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
384 profile = ISATSession(self.session).profile |
|
268
79970bf6af93
browser_side: added class RoomAndContactsChooser:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
385 try: |
|
79970bf6af93
browser_side: added class RoomAndContactsChooser:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
386 if room_jid != "": |
|
79970bf6af93
browser_side: added class RoomAndContactsChooser:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
387 room_jid = JID(room_jid).userhost() |
|
79970bf6af93
browser_side: added class RoomAndContactsChooser:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
388 except: |
|
79970bf6af93
browser_side: added class RoomAndContactsChooser:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
389 warning('Invalid room jid') |
|
79970bf6af93
browser_side: added class RoomAndContactsChooser:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
390 return |
|
79970bf6af93
browser_side: added class RoomAndContactsChooser:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
391 self.sat_host.bridge.tarotGameLaunch(other_players, room_jid, profile) |
|
11
331c093e4eb3
magicBox is now able to send global microblog
Goffi <goffi@goffi.org>
parents:
10
diff
changeset
|
392 |
| 36 | 393 def jsonrpc_getTarotCardsPaths(self): |
| 394 """Give the path of all the tarot cards""" | |
| 77 | 395 _join = os.path.join |
| 396 _media_dir = _join(self.sat_host.media_dir,'') | |
|
317
bbadd490e63c
misc: gather the constants in a single file, as it is done for other frontends
souliane <souliane@mailoo.org>
parents:
309
diff
changeset
|
397 return map(lambda x: _join(Const.MEDIA_DIR, x[len(_media_dir):]), glob.glob(_join(_media_dir, Const.CARDS_DIR, '*_*.png'))); |
| 36 | 398 |
|
37
b306aa090438
Tarot game: game launching (first hand showed), and contract selection
Goffi <goffi@goffi.org>
parents:
36
diff
changeset
|
399 def jsonrpc_tarotGameReady(self, player, referee): |
|
b306aa090438
Tarot game: game launching (first hand showed), and contract selection
Goffi <goffi@goffi.org>
parents:
36
diff
changeset
|
400 """Tell to the server that we are ready to start the game""" |
|
44
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
401 profile = ISATSession(self.session).profile |
|
153
ada146bac8fe
server side: fixed tarotGameReady call
Goffi <goffi@goffi.org>
parents:
151
diff
changeset
|
402 self.sat_host.bridge.tarotGameReady(player, referee, profile) |
| 36 | 403 |
|
37
b306aa090438
Tarot game: game launching (first hand showed), and contract selection
Goffi <goffi@goffi.org>
parents:
36
diff
changeset
|
404 def jsonrpc_tarotGameContratChoosed(self, player_nick, referee, contrat): |
|
b306aa090438
Tarot game: game launching (first hand showed), and contract selection
Goffi <goffi@goffi.org>
parents:
36
diff
changeset
|
405 """Tell to the server that we are ready to start the game""" |
|
44
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
406 profile = ISATSession(self.session).profile |
|
37
b306aa090438
Tarot game: game launching (first hand showed), and contract selection
Goffi <goffi@goffi.org>
parents:
36
diff
changeset
|
407 self.sat_host.bridge.tarotGameContratChoosed(player_nick, referee, contrat, profile) |
|
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
408 |
|
39
305e81c7a32c
Tarot game: a game can now be finished
Goffi <goffi@goffi.org>
parents:
38
diff
changeset
|
409 def jsonrpc_tarotGamePlayCards(self, player_nick, referee, cards): |
| 128 | 410 """Tell to the server the cards we want to put on the table""" |
|
44
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
411 profile = ISATSession(self.session).profile |
|
39
305e81c7a32c
Tarot game: a game can now be finished
Goffi <goffi@goffi.org>
parents:
38
diff
changeset
|
412 self.sat_host.bridge.tarotGamePlayCards(player_nick, referee, cards, profile) |
| 36 | 413 |
|
268
79970bf6af93
browser_side: added class RoomAndContactsChooser:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
414 def jsonrpc_launchRadioCollective(self, invited, room_jid=""): |
|
79970bf6af93
browser_side: added class RoomAndContactsChooser:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
415 """Create a room, invite people, and start a radio collective |
|
79970bf6af93
browser_side: added class RoomAndContactsChooser:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
416 @param room_jid: leave empty string to generate a unique room name |
|
79970bf6af93
browser_side: added class RoomAndContactsChooser:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
417 """ |
|
125
f9d63624699f
radio collective integration, first draft
Goffi <goffi@goffi.org>
parents:
124
diff
changeset
|
418 profile = ISATSession(self.session).profile |
|
268
79970bf6af93
browser_side: added class RoomAndContactsChooser:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
419 try: |
|
79970bf6af93
browser_side: added class RoomAndContactsChooser:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
420 if room_jid != "": |
|
79970bf6af93
browser_side: added class RoomAndContactsChooser:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
421 room_jid = JID(room_jid).userhost() |
|
79970bf6af93
browser_side: added class RoomAndContactsChooser:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
422 except: |
|
79970bf6af93
browser_side: added class RoomAndContactsChooser:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
423 warning('Invalid room jid') |
|
79970bf6af93
browser_side: added class RoomAndContactsChooser:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
424 return |
|
79970bf6af93
browser_side: added class RoomAndContactsChooser:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
425 self.sat_host.bridge.radiocolLaunch(invited, room_jid, profile) |
|
125
f9d63624699f
radio collective integration, first draft
Goffi <goffi@goffi.org>
parents:
124
diff
changeset
|
426 |
| 137 | 427 def jsonrpc_getEntityData(self, jid, keys): |
| 428 """Get cached data for an entit | |
| 429 @param jid: jid of contact from who we want data | |
| 430 @param keys: name of data we want (list) | |
| 431 @return: requested data""" | |
|
124
6d1f4a3da29b
server: fixed buggy vcard cache retrieving, fixes avatar issue
Goffi <goffi@goffi.org>
parents:
123
diff
changeset
|
432 profile = ISATSession(self.session).profile |
| 137 | 433 return self.sat_host.bridge.getEntityData(jid, keys, profile) |
|
110
dfc02690deb4
browser side: CSS: header, unibox, tabs + drag'n' drop reworked
Adrien Vigneron <adrienvigneron@mailoo.org>
parents:
107
diff
changeset
|
434 |
|
204
890776a6fdb7
browser + server: vcard is requested when no avatar data is found in cache
Goffi <goffi@goffi.org>
parents:
202
diff
changeset
|
435 def jsonrpc_getCard(self, jid): |
|
890776a6fdb7
browser + server: vcard is requested when no avatar data is found in cache
Goffi <goffi@goffi.org>
parents:
202
diff
changeset
|
436 """Get VCard for entiry |
|
890776a6fdb7
browser + server: vcard is requested when no avatar data is found in cache
Goffi <goffi@goffi.org>
parents:
202
diff
changeset
|
437 @param jid: jid of contact from who we want data |
|
890776a6fdb7
browser + server: vcard is requested when no avatar data is found in cache
Goffi <goffi@goffi.org>
parents:
202
diff
changeset
|
438 @return: id to retrieve the profile""" |
|
890776a6fdb7
browser + server: vcard is requested when no avatar data is found in cache
Goffi <goffi@goffi.org>
parents:
202
diff
changeset
|
439 profile = ISATSession(self.session).profile |
|
890776a6fdb7
browser + server: vcard is requested when no avatar data is found in cache
Goffi <goffi@goffi.org>
parents:
202
diff
changeset
|
440 return self.sat_host.bridge.getCard(jid, profile) |
|
890776a6fdb7
browser + server: vcard is requested when no avatar data is found in cache
Goffi <goffi@goffi.org>
parents:
202
diff
changeset
|
441 |
|
214
7b26be266ab1
plugin XEP-0085: Chat State Notifications
souliane <souliane@mailoo.org>
parents:
204
diff
changeset
|
442 def jsonrpc_getParamsUI(self): |
|
215
e830a0c60d32
server side: added the security_limit to setParam
souliane <souliane@mailoo.org>
parents:
214
diff
changeset
|
443 """Return the parameters XML for profile""" |
|
214
7b26be266ab1
plugin XEP-0085: Chat State Notifications
souliane <souliane@mailoo.org>
parents:
204
diff
changeset
|
444 profile = ISATSession(self.session).profile |
|
318
c12c9a1acf2f
server_side: added support for paramsRegisterApp to define frontend's specific parameters like "Enable unibox"
souliane <souliane@mailoo.org>
parents:
317
diff
changeset
|
445 d = self.asyncBridgeCall("getParams", Const.SECURITY_LIMIT, Const.APP_NAME, profile) |
|
215
e830a0c60d32
server side: added the security_limit to setParam
souliane <souliane@mailoo.org>
parents:
214
diff
changeset
|
446 |
|
e830a0c60d32
server side: added the security_limit to setParam
souliane <souliane@mailoo.org>
parents:
214
diff
changeset
|
447 def setAuthorizedParams(d): |
|
e830a0c60d32
server side: added the security_limit to setParam
souliane <souliane@mailoo.org>
parents:
214
diff
changeset
|
448 if self.authorized_params is None: |
|
e830a0c60d32
server side: added the security_limit to setParam
souliane <souliane@mailoo.org>
parents:
214
diff
changeset
|
449 self.authorized_params = {} |
|
e830a0c60d32
server side: added the security_limit to setParam
souliane <souliane@mailoo.org>
parents:
214
diff
changeset
|
450 for cat in minidom.parseString(d.encode('utf-8')).getElementsByTagName("category"): |
|
e830a0c60d32
server side: added the security_limit to setParam
souliane <souliane@mailoo.org>
parents:
214
diff
changeset
|
451 params = cat.getElementsByTagName("param") |
|
e830a0c60d32
server side: added the security_limit to setParam
souliane <souliane@mailoo.org>
parents:
214
diff
changeset
|
452 params_list = [param.getAttribute("name") for param in params] |
|
e830a0c60d32
server side: added the security_limit to setParam
souliane <souliane@mailoo.org>
parents:
214
diff
changeset
|
453 self.authorized_params[cat.getAttribute("name")] = params_list |
|
218
4e6467efd6bf
browser_side: small improvements for parameters panel
souliane <souliane@mailoo.org>
parents:
215
diff
changeset
|
454 if self.authorized_params: |
|
4e6467efd6bf
browser_side: small improvements for parameters panel
souliane <souliane@mailoo.org>
parents:
215
diff
changeset
|
455 return d |
|
4e6467efd6bf
browser_side: small improvements for parameters panel
souliane <souliane@mailoo.org>
parents:
215
diff
changeset
|
456 else: |
|
4e6467efd6bf
browser_side: small improvements for parameters panel
souliane <souliane@mailoo.org>
parents:
215
diff
changeset
|
457 return None |
|
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
458 |
|
215
e830a0c60d32
server side: added the security_limit to setParam
souliane <souliane@mailoo.org>
parents:
214
diff
changeset
|
459 d.addCallback(setAuthorizedParams) |
|
e830a0c60d32
server side: added the security_limit to setParam
souliane <souliane@mailoo.org>
parents:
214
diff
changeset
|
460 |
|
e830a0c60d32
server side: added the security_limit to setParam
souliane <souliane@mailoo.org>
parents:
214
diff
changeset
|
461 from sat.tools.xml_tools import paramsXml2xmlUI |
|
218
4e6467efd6bf
browser_side: small improvements for parameters panel
souliane <souliane@mailoo.org>
parents:
215
diff
changeset
|
462 d.addCallback(lambda d: paramsXml2xmlUI(d) if d else "") |
|
215
e830a0c60d32
server side: added the security_limit to setParam
souliane <souliane@mailoo.org>
parents:
214
diff
changeset
|
463 |
|
214
7b26be266ab1
plugin XEP-0085: Chat State Notifications
souliane <souliane@mailoo.org>
parents:
204
diff
changeset
|
464 return d |
|
148
8635bc9db9bf
added parameter management to test XMLUI, but it's currently deactivated for security reasons (need some configuration options) + separated mainTabPanel CSS from LiberviaTabPanel
Goffi <goffi@goffi.org>
parents:
140
diff
changeset
|
465 |
|
229
e632f77c4219
bridge: asyncGetParamA takes a security_limit argument
souliane <souliane@mailoo.org>
parents:
219
diff
changeset
|
466 def jsonrpc_asyncGetParamA(self, param, category, attribute="value"): |
|
e632f77c4219
bridge: asyncGetParamA takes a security_limit argument
souliane <souliane@mailoo.org>
parents:
219
diff
changeset
|
467 """Return the parameter value for profile""" |
|
e632f77c4219
bridge: asyncGetParamA takes a security_limit argument
souliane <souliane@mailoo.org>
parents:
219
diff
changeset
|
468 profile = ISATSession(self.session).profile |
|
317
bbadd490e63c
misc: gather the constants in a single file, as it is done for other frontends
souliane <souliane@mailoo.org>
parents:
309
diff
changeset
|
469 d = self.asyncBridgeCall("asyncGetParamA", param, category, attribute, Const.SECURITY_LIMIT, profile_key=profile) |
|
229
e632f77c4219
bridge: asyncGetParamA takes a security_limit argument
souliane <souliane@mailoo.org>
parents:
219
diff
changeset
|
470 return d |
|
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
471 |
|
214
7b26be266ab1
plugin XEP-0085: Chat State Notifications
souliane <souliane@mailoo.org>
parents:
204
diff
changeset
|
472 def jsonrpc_setParam(self, name, value, category): |
|
7b26be266ab1
plugin XEP-0085: Chat State Notifications
souliane <souliane@mailoo.org>
parents:
204
diff
changeset
|
473 profile = ISATSession(self.session).profile |
|
215
e830a0c60d32
server side: added the security_limit to setParam
souliane <souliane@mailoo.org>
parents:
214
diff
changeset
|
474 if category in self.authorized_params and name in self.authorized_params[category]: |
|
317
bbadd490e63c
misc: gather the constants in a single file, as it is done for other frontends
souliane <souliane@mailoo.org>
parents:
309
diff
changeset
|
475 return self.sat_host.bridge.setParam(name, value, category, Const.SECURITY_LIMIT, profile) |
|
215
e830a0c60d32
server side: added the security_limit to setParam
souliane <souliane@mailoo.org>
parents:
214
diff
changeset
|
476 else: |
|
e830a0c60d32
server side: added the security_limit to setParam
souliane <souliane@mailoo.org>
parents:
214
diff
changeset
|
477 warning("Trying to set parameter '%s' in category '%s' without authorization!!!" |
|
e830a0c60d32
server side: added the security_limit to setParam
souliane <souliane@mailoo.org>
parents:
214
diff
changeset
|
478 % (name, category)) |
|
148
8635bc9db9bf
added parameter management to test XMLUI, but it's currently deactivated for security reasons (need some configuration options) + separated mainTabPanel CSS from LiberviaTabPanel
Goffi <goffi@goffi.org>
parents:
140
diff
changeset
|
479 |
|
299
e4f586fc6101
server and browser side: updated callback system to follow core changes
Goffi <goffi@goffi.org>
parents:
297
diff
changeset
|
480 def jsonrpc_launchAction(self, callback_id, data): |
|
148
8635bc9db9bf
added parameter management to test XMLUI, but it's currently deactivated for security reasons (need some configuration options) + separated mainTabPanel CSS from LiberviaTabPanel
Goffi <goffi@goffi.org>
parents:
140
diff
changeset
|
481 profile = ISATSession(self.session).profile |
|
299
e4f586fc6101
server and browser side: updated callback system to follow core changes
Goffi <goffi@goffi.org>
parents:
297
diff
changeset
|
482 d = self.asyncBridgeCall("launchAction", callback_id, data, profile) |
|
e4f586fc6101
server and browser side: updated callback system to follow core changes
Goffi <goffi@goffi.org>
parents:
297
diff
changeset
|
483 return d |
|
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
484 |
|
214
7b26be266ab1
plugin XEP-0085: Chat State Notifications
souliane <souliane@mailoo.org>
parents:
204
diff
changeset
|
485 def jsonrpc_chatStateComposing(self, to_jid_s): |
|
242
a25aa882e09a
browser_side: add context menu for contact:
souliane <souliane@mailoo.org>
parents:
235
diff
changeset
|
486 """Call the method to process a "composing" state. |
|
214
7b26be266ab1
plugin XEP-0085: Chat State Notifications
souliane <souliane@mailoo.org>
parents:
204
diff
changeset
|
487 @param to_jid_s: contact the user is composing to |
|
7b26be266ab1
plugin XEP-0085: Chat State Notifications
souliane <souliane@mailoo.org>
parents:
204
diff
changeset
|
488 """ |
|
7b26be266ab1
plugin XEP-0085: Chat State Notifications
souliane <souliane@mailoo.org>
parents:
204
diff
changeset
|
489 profile = ISATSession(self.session).profile |
|
7b26be266ab1
plugin XEP-0085: Chat State Notifications
souliane <souliane@mailoo.org>
parents:
204
diff
changeset
|
490 self.sat_host.bridge.chatStateComposing(to_jid_s, profile) |
|
7b26be266ab1
plugin XEP-0085: Chat State Notifications
souliane <souliane@mailoo.org>
parents:
204
diff
changeset
|
491 |
|
242
a25aa882e09a
browser_side: add context menu for contact:
souliane <souliane@mailoo.org>
parents:
235
diff
changeset
|
492 def jsonrpc_getNewAccountDomain(self): |
|
a25aa882e09a
browser_side: add context menu for contact:
souliane <souliane@mailoo.org>
parents:
235
diff
changeset
|
493 """@return: the domain for new account creation""" |
|
a25aa882e09a
browser_side: add context menu for contact:
souliane <souliane@mailoo.org>
parents:
235
diff
changeset
|
494 d = self.asyncBridgeCall("getNewAccountDomain") |
|
a25aa882e09a
browser_side: add context menu for contact:
souliane <souliane@mailoo.org>
parents:
235
diff
changeset
|
495 return d |
|
214
7b26be266ab1
plugin XEP-0085: Chat State Notifications
souliane <souliane@mailoo.org>
parents:
204
diff
changeset
|
496 |
|
251
24335e82fef0
plugin XEP-249: added parameter Misc / Auto-join MUC on invitation:
souliane <souliane@mailoo.org>
parents:
242
diff
changeset
|
497 def jsonrpc_confirmationAnswer(self, confirmation_id, result, answer_data): |
|
24335e82fef0
plugin XEP-249: added parameter Misc / Auto-join MUC on invitation:
souliane <souliane@mailoo.org>
parents:
242
diff
changeset
|
498 """Send the user's answer to any previous 'askConfirmation' signal""" |
|
24335e82fef0
plugin XEP-249: added parameter Misc / Auto-join MUC on invitation:
souliane <souliane@mailoo.org>
parents:
242
diff
changeset
|
499 profile = ISATSession(self.session).profile |
|
24335e82fef0
plugin XEP-249: added parameter Misc / Auto-join MUC on invitation:
souliane <souliane@mailoo.org>
parents:
242
diff
changeset
|
500 self.sat_host.bridge.confirmationAnswer(confirmation_id, result, answer_data, profile) |
|
24335e82fef0
plugin XEP-249: added parameter Misc / Auto-join MUC on invitation:
souliane <souliane@mailoo.org>
parents:
242
diff
changeset
|
501 |
|
309
05e264e96a1c
browser_side: make unibox optional
souliane <souliane@mailoo.org>
parents:
308
diff
changeset
|
502 def jsonrpc_syntaxConvert(self, text, syntax_from=Const.SYNTAX_XHTML, syntax_to=Const.SYNTAX_CURRENT): |
|
282
ae3ec654836d
browser_side: added blog item modification/deletion
souliane <souliane@mailoo.org>
parents:
279
diff
changeset
|
503 """ Convert a text between two syntaxes |
|
ae3ec654836d
browser_side: added blog item modification/deletion
souliane <souliane@mailoo.org>
parents:
279
diff
changeset
|
504 @param text: text to convert |
|
ae3ec654836d
browser_side: added blog item modification/deletion
souliane <souliane@mailoo.org>
parents:
279
diff
changeset
|
505 @param syntax_from: source syntax (e.g. "markdown") |
|
ae3ec654836d
browser_side: added blog item modification/deletion
souliane <souliane@mailoo.org>
parents:
279
diff
changeset
|
506 @param syntax_to: dest syntax (e.g.: "XHTML") |
|
ae3ec654836d
browser_side: added blog item modification/deletion
souliane <souliane@mailoo.org>
parents:
279
diff
changeset
|
507 @param safe: clean resulting XHTML to avoid malicious code if True (forced here) |
|
ae3ec654836d
browser_side: added blog item modification/deletion
souliane <souliane@mailoo.org>
parents:
279
diff
changeset
|
508 @return: converted text """ |
|
ae3ec654836d
browser_side: added blog item modification/deletion
souliane <souliane@mailoo.org>
parents:
279
diff
changeset
|
509 profile = ISATSession(self.session).profile |
|
ae3ec654836d
browser_side: added blog item modification/deletion
souliane <souliane@mailoo.org>
parents:
279
diff
changeset
|
510 return self.sat_host.bridge.syntaxConvert(text, syntax_from, syntax_to, True, profile) |
|
ae3ec654836d
browser_side: added blog item modification/deletion
souliane <souliane@mailoo.org>
parents:
279
diff
changeset
|
511 |
|
251
24335e82fef0
plugin XEP-249: added parameter Misc / Auto-join MUC on invitation:
souliane <souliane@mailoo.org>
parents:
242
diff
changeset
|
512 |
|
219
36673d19c87e
server side: better async bridge calls handling
Goffi <goffi@goffi.org>
parents:
218
diff
changeset
|
513 class Register(JSONRPCMethodManager): |
| 0 | 514 """This class manage the registration procedure with SàT |
| 515 It provide an api for the browser, check password and setup the web server""" | |
| 516 | |
| 517 def __init__(self, sat_host): | |
|
219
36673d19c87e
server side: better async bridge calls handling
Goffi <goffi@goffi.org>
parents:
218
diff
changeset
|
518 JSONRPCMethodManager.__init__(self, sat_host) |
| 0 | 519 self.profiles_waiting={} |
| 520 self.request=None | |
| 521 | |
| 522 def getWaitingRequest(self, profile): | |
| 523 """Tell if a profile is trying to log in""" | |
| 524 if self.profiles_waiting.has_key(profile): | |
| 525 return self.profiles_waiting[profile] | |
| 526 else: | |
| 527 return None | |
| 528 | |
| 529 def render(self, request): | |
| 530 """ | |
| 531 Render method with some hacks: | |
| 532 - if login is requested, try to login with form data | |
| 533 - except login, every method is jsonrpc | |
|
318
c12c9a1acf2f
server_side: added support for paramsRegisterApp to define frontend's specific parameters like "Enable unibox"
souliane <souliane@mailoo.org>
parents:
317
diff
changeset
|
534 - user doesn't need to be authentified for isRegistered or registerParams, but must be for all other methods |
| 0 | 535 """ |
| 536 if request.postpath==['login']: | |
| 537 return self.login(request) | |
| 538 _session = request.getSession() | |
| 539 parsed = jsonrpclib.loads(request.content.read()) | |
|
318
c12c9a1acf2f
server_side: added support for paramsRegisterApp to define frontend's specific parameters like "Enable unibox"
souliane <souliane@mailoo.org>
parents:
317
diff
changeset
|
540 method = parsed.get("method") |
|
c12c9a1acf2f
server_side: added support for paramsRegisterApp to define frontend's specific parameters like "Enable unibox"
souliane <souliane@mailoo.org>
parents:
317
diff
changeset
|
541 if method != "isRegistered" and method != "registerParams": |
| 0 | 542 #if we don't call login or isRegistered, we need to be identified |
|
44
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
543 profile = ISATSession(_session).profile |
|
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
544 if not profile: |
| 0 | 545 #user is not identified, we return a jsonrpc fault |
|
317
bbadd490e63c
misc: gather the constants in a single file, as it is done for other frontends
souliane <souliane@mailoo.org>
parents:
309
diff
changeset
|
546 fault = jsonrpclib.Fault(Const.ERRNUM_LIBERVIA, "Not allowed") #FIXME: define some standard error codes for libervia |
| 0 | 547 return jsonrpc.JSONRPC._cbRender(self, fault, request, parsed.get('id'), parsed.get('jsonrpc')) |
| 548 self.request = request | |
| 549 return jsonrpc.JSONRPC.render(self, request) | |
| 550 | |
| 551 def login(self, request): | |
| 552 """ | |
| 553 this method is called with the POST information from the registering form | |
| 554 it test if the password is ok, and log in if it's the case, | |
| 555 else it return an error | |
| 556 @param request: request of the register formulaire, must have "login" and "password" as arguments | |
| 557 @return: A constant indicating the state: | |
| 558 - BAD REQUEST: something is wrong in the request (bad arguments, profile_key for login) | |
| 559 - AUTH ERROR: either the profile or the password is wrong | |
| 560 - ALREADY WAITING: a request has already be made for this profile | |
| 561 - server.NOT_DONE_YET: the profile is being processed, the return value will be given by self._logged or self._logginError | |
|
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
562 """ |
|
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
563 |
| 0 | 564 try: |
|
66
9d8e79ac4c9c
Login/Register box: integration of Adrien Vigneron's design
Goffi <goffi@goffi.org>
parents:
61
diff
changeset
|
565 if request.args['submit_type'][0] == 'login': |
|
9d8e79ac4c9c
Login/Register box: integration of Adrien Vigneron's design
Goffi <goffi@goffi.org>
parents:
61
diff
changeset
|
566 _login = request.args['login'][0] |
|
9d8e79ac4c9c
Login/Register box: integration of Adrien Vigneron's design
Goffi <goffi@goffi.org>
parents:
61
diff
changeset
|
567 if _login.startswith('@'): |
|
9d8e79ac4c9c
Login/Register box: integration of Adrien Vigneron's design
Goffi <goffi@goffi.org>
parents:
61
diff
changeset
|
568 raise Exception('No profile_key allowed') |
|
9d8e79ac4c9c
Login/Register box: integration of Adrien Vigneron's design
Goffi <goffi@goffi.org>
parents:
61
diff
changeset
|
569 _pass = request.args['login_password'][0] |
|
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
570 |
|
66
9d8e79ac4c9c
Login/Register box: integration of Adrien Vigneron's design
Goffi <goffi@goffi.org>
parents:
61
diff
changeset
|
571 elif request.args['submit_type'][0] == 'register': |
|
160
6f913f5adca8
server side: registration refactoring first draft; main registration code is moved to SàT backend
Goffi <goffi@goffi.org>
parents:
156
diff
changeset
|
572 return self._registerNewAccount(request) |
|
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
573 |
|
66
9d8e79ac4c9c
Login/Register box: integration of Adrien Vigneron's design
Goffi <goffi@goffi.org>
parents:
61
diff
changeset
|
574 else: |
|
9d8e79ac4c9c
Login/Register box: integration of Adrien Vigneron's design
Goffi <goffi@goffi.org>
parents:
61
diff
changeset
|
575 raise Exception('Unknown submit type') |
| 0 | 576 except KeyError: |
| 577 return "BAD REQUEST" | |
| 578 | |
| 579 _profile_check = self.sat_host.bridge.getProfileName(_login) | |
|
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
580 |
| 121 | 581 def profile_pass_cb(_profile_pass): |
| 582 if not _profile_check or _profile_check != _login or _profile_pass != _pass: | |
| 583 request.write("AUTH ERROR") | |
| 584 request.finish() | |
| 585 return | |
|
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
586 |
| 121 | 587 if self.profiles_waiting.has_key(_login): |
| 588 request.write("ALREADY WAITING") | |
| 589 request.finish() | |
| 590 return | |
|
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
591 |
| 121 | 592 if self.sat_host.bridge.isConnected(_login): |
| 593 request.write(self._logged(_login, request, finish=False)) | |
| 594 request.finish() | |
| 595 return | |
| 596 | |
| 597 self.profiles_waiting[_login] = request | |
|
219
36673d19c87e
server side: better async bridge calls handling
Goffi <goffi@goffi.org>
parents:
218
diff
changeset
|
598 d = self.asyncBridgeCall("asyncConnect", _login) |
| 155 | 599 return d |
|
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
600 |
| 121 | 601 def profile_pass_errback(ignore): |
| 602 error("INTERNAL ERROR: can't check profile password") | |
| 603 request.write("AUTH ERROR") | |
| 604 request.finish() | |
|
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
605 |
|
219
36673d19c87e
server side: better async bridge calls handling
Goffi <goffi@goffi.org>
parents:
218
diff
changeset
|
606 d = self.asyncBridgeCall("asyncGetParamA", "Password", "Connection", profile_key=_login) |
| 121 | 607 d.addCallbacks(profile_pass_cb, profile_pass_errback) |
| 0 | 608 |
| 609 return server.NOT_DONE_YET | |
| 610 | |
| 46 | 611 def _postAccountCreation(self, answer_type, id, data, profile): |
| 612 """Called when a account has just been created, | |
| 613 setup stuff has microblog access""" | |
| 614 def _connected(ignore): | |
|
219
36673d19c87e
server side: better async bridge calls handling
Goffi <goffi@goffi.org>
parents:
218
diff
changeset
|
615 mblog_d = self.asyncBridgeCall("setMicroblogAccess", "open", profile) |
| 46 | 616 mblog_d.addBoth(lambda ignore: self.sat_host.bridge.disconnect(profile)) |
|
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
617 |
|
219
36673d19c87e
server side: better async bridge calls handling
Goffi <goffi@goffi.org>
parents:
218
diff
changeset
|
618 d = self.asyncBridgeCall("asyncConnect", profile) |
| 46 | 619 d.addCallback(_connected) |
| 620 | |
|
160
6f913f5adca8
server side: registration refactoring first draft; main registration code is moved to SàT backend
Goffi <goffi@goffi.org>
parents:
156
diff
changeset
|
621 def _registerNewAccount(self, request): |
| 46 | 622 """Create a new account, or return error |
|
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
623 @param request: initial login request |
| 46 | 624 @return: "REGISTRATION" in case of success""" |
|
54
f25c4077f6b9
addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents:
50
diff
changeset
|
625 #TODO: must be moved in SàT core |
|
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
626 |
| 46 | 627 try: |
|
160
6f913f5adca8
server side: registration refactoring first draft; main registration code is moved to SàT backend
Goffi <goffi@goffi.org>
parents:
156
diff
changeset
|
628 profile = login = request.args['register_login'][0] |
|
6f913f5adca8
server side: registration refactoring first draft; main registration code is moved to SàT backend
Goffi <goffi@goffi.org>
parents:
156
diff
changeset
|
629 password = request.args['register_password'][0] #FIXME: password is ignored so far |
|
6f913f5adca8
server side: registration refactoring first draft; main registration code is moved to SàT backend
Goffi <goffi@goffi.org>
parents:
156
diff
changeset
|
630 email = request.args['email'][0] |
| 46 | 631 except KeyError: |
| 632 return "BAD REQUEST" | |
| 633 if not re.match(r'^[a-z0-9_-]+$', login, re.IGNORECASE) or \ | |
| 634 not re.match(r'^.+@.+\..+', email, re.IGNORECASE): | |
| 635 return "BAD REQUEST" | |
| 636 | |
|
160
6f913f5adca8
server side: registration refactoring first draft; main registration code is moved to SàT backend
Goffi <goffi@goffi.org>
parents:
156
diff
changeset
|
637 def registered(result): |
|
6f913f5adca8
server side: registration refactoring first draft; main registration code is moved to SàT backend
Goffi <goffi@goffi.org>
parents:
156
diff
changeset
|
638 request.write('REGISTRATION') |
|
6f913f5adca8
server side: registration refactoring first draft; main registration code is moved to SàT backend
Goffi <goffi@goffi.org>
parents:
156
diff
changeset
|
639 request.finish() |
|
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
640 |
|
160
6f913f5adca8
server side: registration refactoring first draft; main registration code is moved to SàT backend
Goffi <goffi@goffi.org>
parents:
156
diff
changeset
|
641 def registeringError(failure): |
|
6f913f5adca8
server side: registration refactoring first draft; main registration code is moved to SàT backend
Goffi <goffi@goffi.org>
parents:
156
diff
changeset
|
642 reason = str(failure.value) |
|
295
33e0eb212b14
server side: adapted registeringError reasons to new names in backend
Goffi <goffi@goffi.org>
parents:
282
diff
changeset
|
643 if reason == "ConflictError": |
|
160
6f913f5adca8
server side: registration refactoring first draft; main registration code is moved to SàT backend
Goffi <goffi@goffi.org>
parents:
156
diff
changeset
|
644 request.write('ALREADY EXISTS') |
|
295
33e0eb212b14
server side: adapted registeringError reasons to new names in backend
Goffi <goffi@goffi.org>
parents:
282
diff
changeset
|
645 elif reason == "InternalError": |
|
160
6f913f5adca8
server side: registration refactoring first draft; main registration code is moved to SàT backend
Goffi <goffi@goffi.org>
parents:
156
diff
changeset
|
646 request.write('INTERNAL') |
|
6f913f5adca8
server side: registration refactoring first draft; main registration code is moved to SàT backend
Goffi <goffi@goffi.org>
parents:
156
diff
changeset
|
647 else: |
|
6f913f5adca8
server side: registration refactoring first draft; main registration code is moved to SàT backend
Goffi <goffi@goffi.org>
parents:
156
diff
changeset
|
648 error('Unknown registering error: %s' % (reason,)) |
|
6f913f5adca8
server side: registration refactoring first draft; main registration code is moved to SàT backend
Goffi <goffi@goffi.org>
parents:
156
diff
changeset
|
649 request.write('Unknown error (%s)' % reason) |
|
6f913f5adca8
server side: registration refactoring first draft; main registration code is moved to SàT backend
Goffi <goffi@goffi.org>
parents:
156
diff
changeset
|
650 request.finish() |
|
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
651 |
|
219
36673d19c87e
server side: better async bridge calls handling
Goffi <goffi@goffi.org>
parents:
218
diff
changeset
|
652 d = self.asyncBridgeCall("registerSatAccount", email, password, profile) |
|
160
6f913f5adca8
server side: registration refactoring first draft; main registration code is moved to SàT backend
Goffi <goffi@goffi.org>
parents:
156
diff
changeset
|
653 d.addCallback(registered) |
|
6f913f5adca8
server side: registration refactoring first draft; main registration code is moved to SàT backend
Goffi <goffi@goffi.org>
parents:
156
diff
changeset
|
654 d.addErrback(registeringError) |
|
6f913f5adca8
server side: registration refactoring first draft; main registration code is moved to SàT backend
Goffi <goffi@goffi.org>
parents:
156
diff
changeset
|
655 return server.NOT_DONE_YET |
| 46 | 656 |
| 0 | 657 def __cleanWaiting(self, login): |
| 658 """Remove login from waiting queue""" | |
| 659 try: | |
| 660 del self.profiles_waiting[login] | |
| 661 except KeyError: | |
| 662 pass | |
| 663 | |
|
14
9bf8ed012adc
- Group microblog management, first draft
Goffi <goffi@goffi.org>
parents:
11
diff
changeset
|
664 def _logged(self, profile, request, finish=True): |
| 0 | 665 """Set everything when a user just logged |
| 666 and return "LOGGED" to the requester""" | |
| 61 | 667 def result(answer): |
| 668 if finish: | |
| 669 request.write(answer) | |
| 670 request.finish() | |
| 671 else: | |
| 672 return answer | |
|
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
673 |
|
14
9bf8ed012adc
- Group microblog management, first draft
Goffi <goffi@goffi.org>
parents:
11
diff
changeset
|
674 self.__cleanWaiting(profile) |
| 0 | 675 _session = request.getSession() |
|
44
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
676 sat_session = ISATSession(_session) |
|
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
677 if sat_session.profile: |
| 61 | 678 error (('/!\\ Session has already a profile, this should NEVER happen !')) |
| 679 return result('SESSION_ACTIVE') | |
|
44
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
680 sat_session.profile = profile |
| 24 | 681 self.sat_host.prof_connected.add(profile) |
|
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
682 |
|
45
7f106052326f
server side: user is now disconnected on session end, and queue is purged
Goffi <goffi@goffi.org>
parents:
44
diff
changeset
|
683 def onExpire(): |
| 156 | 684 info ("Session expired (profile=%s)" % (profile,)) |
|
45
7f106052326f
server side: user is now disconnected on session end, and queue is purged
Goffi <goffi@goffi.org>
parents:
44
diff
changeset
|
685 try: |
|
7f106052326f
server side: user is now disconnected on session end, and queue is purged
Goffi <goffi@goffi.org>
parents:
44
diff
changeset
|
686 #We purge the queue |
|
7f106052326f
server side: user is now disconnected on session end, and queue is purged
Goffi <goffi@goffi.org>
parents:
44
diff
changeset
|
687 del self.sat_host.signal_handler.queue[profile] |
|
7f106052326f
server side: user is now disconnected on session end, and queue is purged
Goffi <goffi@goffi.org>
parents:
44
diff
changeset
|
688 except KeyError: |
|
7f106052326f
server side: user is now disconnected on session end, and queue is purged
Goffi <goffi@goffi.org>
parents:
44
diff
changeset
|
689 pass |
| 130 | 690 #and now we disconnect the profile |
|
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
691 self.sat_host.bridge.disconnect(profile) |
|
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
692 |
|
45
7f106052326f
server side: user is now disconnected on session end, and queue is purged
Goffi <goffi@goffi.org>
parents:
44
diff
changeset
|
693 _session.notifyOnExpire(onExpire) |
|
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
694 |
|
14
9bf8ed012adc
- Group microblog management, first draft
Goffi <goffi@goffi.org>
parents:
11
diff
changeset
|
695 d = defer.Deferred() |
| 61 | 696 return result('LOGGED') |
| 0 | 697 |
| 698 def _logginError(self, login, request, error_type): | |
| 699 """Something went wrong during loggin, return an error""" | |
| 700 self.__cleanWaiting(login) | |
| 701 return error_type | |
| 702 | |
| 703 def jsonrpc_isConnected(self): | |
| 704 _session = self.request.getSession() | |
|
44
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
705 profile = ISATSession(_session).profile |
| 0 | 706 return self.sat_host.bridge.isConnected(profile) |
|
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
707 |
| 0 | 708 def jsonrpc_connect(self): |
| 709 _session = self.request.getSession() | |
|
44
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
710 profile = ISATSession(_session).profile |
| 0 | 711 if self.profiles_waiting.has_key(profile): |
|
296
92d76ab67156
server+browser side: fixed bridge errback handling
Goffi <goffi@goffi.org>
parents:
295
diff
changeset
|
712 raise jsonrpclib.Fault(1,'Already waiting') #FIXME: define some standard error codes for libervia |
| 0 | 713 self.profiles_waiting[profile] = self.request |
|
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
714 self.sat_host.bridge.connect(profile) |
| 0 | 715 return server.NOT_DONE_YET |
|
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
716 |
| 0 | 717 def jsonrpc_isRegistered(self): |
| 718 """Tell if the user is already registered""" | |
| 719 _session = self.request.getSession() | |
|
44
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
720 profile = ISATSession(_session).profile |
|
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
721 return bool(profile) |
|
251
24335e82fef0
plugin XEP-249: added parameter Misc / Auto-join MUC on invitation:
souliane <souliane@mailoo.org>
parents:
242
diff
changeset
|
722 |
|
318
c12c9a1acf2f
server_side: added support for paramsRegisterApp to define frontend's specific parameters like "Enable unibox"
souliane <souliane@mailoo.org>
parents:
317
diff
changeset
|
723 def jsonrpc_registerParams(self): |
|
c12c9a1acf2f
server_side: added support for paramsRegisterApp to define frontend's specific parameters like "Enable unibox"
souliane <souliane@mailoo.org>
parents:
317
diff
changeset
|
724 """Register the frontend specific parameters""" |
|
c12c9a1acf2f
server_side: added support for paramsRegisterApp to define frontend's specific parameters like "Enable unibox"
souliane <souliane@mailoo.org>
parents:
317
diff
changeset
|
725 params = """ |
|
c12c9a1acf2f
server_side: added support for paramsRegisterApp to define frontend's specific parameters like "Enable unibox"
souliane <souliane@mailoo.org>
parents:
317
diff
changeset
|
726 <params> |
|
c12c9a1acf2f
server_side: added support for paramsRegisterApp to define frontend's specific parameters like "Enable unibox"
souliane <souliane@mailoo.org>
parents:
317
diff
changeset
|
727 <individual> |
|
c12c9a1acf2f
server_side: added support for paramsRegisterApp to define frontend's specific parameters like "Enable unibox"
souliane <souliane@mailoo.org>
parents:
317
diff
changeset
|
728 <category name="%(category_name)s" label="%(category_label)s"> |
|
c12c9a1acf2f
server_side: added support for paramsRegisterApp to define frontend's specific parameters like "Enable unibox"
souliane <souliane@mailoo.org>
parents:
317
diff
changeset
|
729 <param name="%(param_name)s" label="%(param_label)s" value="true" type="bool" security="0"/> |
|
c12c9a1acf2f
server_side: added support for paramsRegisterApp to define frontend's specific parameters like "Enable unibox"
souliane <souliane@mailoo.org>
parents:
317
diff
changeset
|
730 </category> |
|
c12c9a1acf2f
server_side: added support for paramsRegisterApp to define frontend's specific parameters like "Enable unibox"
souliane <souliane@mailoo.org>
parents:
317
diff
changeset
|
731 </individual> |
|
c12c9a1acf2f
server_side: added support for paramsRegisterApp to define frontend's specific parameters like "Enable unibox"
souliane <souliane@mailoo.org>
parents:
317
diff
changeset
|
732 </params> |
|
c12c9a1acf2f
server_side: added support for paramsRegisterApp to define frontend's specific parameters like "Enable unibox"
souliane <souliane@mailoo.org>
parents:
317
diff
changeset
|
733 """ % { |
|
c12c9a1acf2f
server_side: added support for paramsRegisterApp to define frontend's specific parameters like "Enable unibox"
souliane <souliane@mailoo.org>
parents:
317
diff
changeset
|
734 'category_name': Const.ENABLE_UNIBOX_KEY, |
|
c12c9a1acf2f
server_side: added support for paramsRegisterApp to define frontend's specific parameters like "Enable unibox"
souliane <souliane@mailoo.org>
parents:
317
diff
changeset
|
735 'category_label': _(Const.ENABLE_UNIBOX_KEY), |
|
c12c9a1acf2f
server_side: added support for paramsRegisterApp to define frontend's specific parameters like "Enable unibox"
souliane <souliane@mailoo.org>
parents:
317
diff
changeset
|
736 'param_name': Const.ENABLE_UNIBOX_PARAM, |
|
c12c9a1acf2f
server_side: added support for paramsRegisterApp to define frontend's specific parameters like "Enable unibox"
souliane <souliane@mailoo.org>
parents:
317
diff
changeset
|
737 'param_label': _(Const.ENABLE_UNIBOX_PARAM) |
|
c12c9a1acf2f
server_side: added support for paramsRegisterApp to define frontend's specific parameters like "Enable unibox"
souliane <souliane@mailoo.org>
parents:
317
diff
changeset
|
738 } |
|
c12c9a1acf2f
server_side: added support for paramsRegisterApp to define frontend's specific parameters like "Enable unibox"
souliane <souliane@mailoo.org>
parents:
317
diff
changeset
|
739 |
|
c12c9a1acf2f
server_side: added support for paramsRegisterApp to define frontend's specific parameters like "Enable unibox"
souliane <souliane@mailoo.org>
parents:
317
diff
changeset
|
740 self.sat_host.bridge.paramsRegisterApp(params, Const.SECURITY_LIMIT, Const.APP_NAME) |
|
c12c9a1acf2f
server_side: added support for paramsRegisterApp to define frontend's specific parameters like "Enable unibox"
souliane <souliane@mailoo.org>
parents:
317
diff
changeset
|
741 |
|
251
24335e82fef0
plugin XEP-249: added parameter Misc / Auto-join MUC on invitation:
souliane <souliane@mailoo.org>
parents:
242
diff
changeset
|
742 |
| 0 | 743 class SignalHandler(jsonrpc.JSONRPC): |
|
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
744 |
| 0 | 745 def __init__(self, sat_host): |
| 746 Resource.__init__(self) | |
| 747 self.register=None | |
| 748 self.sat_host=sat_host | |
|
3
154d4caa57f4
server side: proper profile management in signals generic callback
Goffi <goffi@goffi.org>
parents:
2
diff
changeset
|
749 self.signalDeferred = {} |
|
45
7f106052326f
server side: user is now disconnected on session end, and queue is purged
Goffi <goffi@goffi.org>
parents:
44
diff
changeset
|
750 self.queue = {} |
|
2
669c531a857e
signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
751 |
| 0 | 752 def plugRegister(self, register): |
| 753 self.register = register | |
|
2
669c531a857e
signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
754 |
|
669c531a857e
signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
755 def jsonrpc_getSignals(self): |
|
669c531a857e
signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
756 """Keep the connection alive until a signal is received, then send it |
|
669c531a857e
signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
757 @return: (signal, *signal_args)""" |
|
3
154d4caa57f4
server side: proper profile management in signals generic callback
Goffi <goffi@goffi.org>
parents:
2
diff
changeset
|
758 _session = self.request.getSession() |
|
44
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
759 profile = ISATSession(_session).profile |
| 24 | 760 if profile in self.queue: #if we have signals to send in queue |
| 761 if self.queue[profile]: | |
| 762 return self.queue[profile].pop(0) | |
| 763 else: | |
| 764 #the queue is empty, we delete the profile from queue | |
| 765 del self.queue[profile] | |
|
44
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
766 _session.lock() #we don't want the session to expire as long as this connection is active |
| 156 | 767 def unlock(signal, profile): |
|
44
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
768 _session.unlock() |
| 156 | 769 try: |
| 770 source_defer = self.signalDeferred[profile] | |
| 771 if source_defer.called and source_defer.result[0] == "disconnected": | |
| 772 info(u"[%s] disconnected" % (profile,)) | |
| 773 _session.expire() | |
| 774 except IndexError: | |
| 775 error("Deferred result should be a tuple with fonction name first") | |
|
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
776 |
|
3
154d4caa57f4
server side: proper profile management in signals generic callback
Goffi <goffi@goffi.org>
parents:
2
diff
changeset
|
777 self.signalDeferred[profile] = defer.Deferred() |
| 156 | 778 self.request.notifyFinish().addBoth(unlock, profile) |
|
3
154d4caa57f4
server side: proper profile management in signals generic callback
Goffi <goffi@goffi.org>
parents:
2
diff
changeset
|
779 return self.signalDeferred[profile] |
|
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
780 |
|
2
669c531a857e
signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
781 def getGenericCb(self, function_name): |
|
3
154d4caa57f4
server side: proper profile management in signals generic callback
Goffi <goffi@goffi.org>
parents:
2
diff
changeset
|
782 """Return a generic function which send all params to signalDeferred.callback |
|
154d4caa57f4
server side: proper profile management in signals generic callback
Goffi <goffi@goffi.org>
parents:
2
diff
changeset
|
783 function must have profile as last argument""" |
|
2
669c531a857e
signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
784 def genericCb(*args): |
|
3
154d4caa57f4
server side: proper profile management in signals generic callback
Goffi <goffi@goffi.org>
parents:
2
diff
changeset
|
785 profile = args[-1] |
| 24 | 786 if not profile in self.sat_host.prof_connected: |
| 787 return | |
|
3
154d4caa57f4
server side: proper profile management in signals generic callback
Goffi <goffi@goffi.org>
parents:
2
diff
changeset
|
788 if profile in self.signalDeferred: |
|
154d4caa57f4
server side: proper profile management in signals generic callback
Goffi <goffi@goffi.org>
parents:
2
diff
changeset
|
789 self.signalDeferred[profile].callback((function_name,args[:-1])) |
| 24 | 790 del self.signalDeferred[profile] |
|
2
669c531a857e
signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
791 else: |
| 24 | 792 if not self.queue.has_key(profile): |
| 793 self.queue[profile] = [] | |
| 794 self.queue[profile].append((function_name, args[:-1])) | |
|
2
669c531a857e
signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
795 return genericCb |
|
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
796 |
| 0 | 797 def connected(self, profile): |
| 798 assert(self.register) #register must be plugged | |
| 799 request = self.register.getWaitingRequest(profile) | |
| 800 if request: | |
| 801 self.register._logged(profile, request) | |
| 802 | |
| 156 | 803 def disconnected(self, profile): |
| 804 if not profile in self.sat_host.prof_connected: | |
| 805 error("'disconnected' signal received for a not connected profile") | |
| 806 return | |
| 807 self.sat_host.prof_connected.remove(profile) | |
| 808 if profile in self.signalDeferred: | |
| 809 self.signalDeferred[profile].callback(("disconnected",)) | |
| 810 del self.signalDeferred[profile] | |
| 811 else: | |
| 812 if not self.queue.has_key(profile): | |
| 813 self.queue[profile] = [] | |
| 814 self.queue[profile].append(("disconnected",)) | |
|
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
815 |
| 156 | 816 |
| 0 | 817 def connectionError(self, error_type, profile): |
| 818 assert(self.register) #register must be plugged | |
| 819 request = self.register.getWaitingRequest(profile) | |
| 820 if request: #The user is trying to log in | |
| 821 if error_type == "AUTH_ERROR": | |
| 822 _error_t = "AUTH ERROR" | |
| 823 else: | |
| 824 _error_t = "UNKNOWN" | |
| 825 self.register._logginError(profile, request, _error_t) | |
| 826 | |
|
2
669c531a857e
signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
827 def render(self, request): |
|
669c531a857e
signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
828 """ |
|
669c531a857e
signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
829 Render method wich reject access if user is not identified |
|
669c531a857e
signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
830 """ |
|
669c531a857e
signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
831 _session = request.getSession() |
|
669c531a857e
signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
832 parsed = jsonrpclib.loads(request.content.read()) |
|
44
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
833 profile = ISATSession(_session).profile |
|
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
834 if not profile: |
|
2
669c531a857e
signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
835 #user is not identified, we return a jsonrpc fault |
|
317
bbadd490e63c
misc: gather the constants in a single file, as it is done for other frontends
souliane <souliane@mailoo.org>
parents:
309
diff
changeset
|
836 fault = jsonrpclib.Fault(Const.ERRNUM_LIBERVIA, "Not allowed") #FIXME: define some standard error codes for libervia |
|
2
669c531a857e
signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
837 return jsonrpc.JSONRPC._cbRender(self, fault, request, parsed.get('id'), parsed.get('jsonrpc')) |
|
669c531a857e
signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
838 self.request = request |
|
669c531a857e
signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
839 return jsonrpc.JSONRPC.render(self, request) |
| 0 | 840 |
| 127 | 841 class UploadManager(Resource): |
| 842 """This class manage the upload of a file | |
| 843 It redirect the stream to SàT core backend""" | |
| 844 isLeaf = True | |
|
151
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
845 NAME = 'path' #name use by the FileUpload |
| 127 | 846 |
| 847 def __init__(self, sat_host): | |
| 848 self.sat_host=sat_host | |
| 849 self.upload_dir = tempfile.mkdtemp() | |
| 850 self.sat_host.addCleanup(shutil.rmtree, self.upload_dir) | |
| 851 | |
| 128 | 852 def getTmpDir(self): |
| 853 return self.upload_dir | |
| 854 | |
|
151
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
855 def _getFileName(self, request): |
|
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
856 """Generate unique filename for a file""" |
|
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
857 raise NotImplementedError |
|
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
858 |
|
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
859 def _fileWritten(self, request, filepath): |
|
300
4f221f34bdc7
browser_side (plugins radiocol, xep-0054): handle upload errors
souliane <souliane@mailoo.org>
parents:
299
diff
changeset
|
860 """Called once the file is actually written on disk |
|
4f221f34bdc7
browser_side (plugins radiocol, xep-0054): handle upload errors
souliane <souliane@mailoo.org>
parents:
299
diff
changeset
|
861 @param request: HTTP request object |
|
4f221f34bdc7
browser_side (plugins radiocol, xep-0054): handle upload errors
souliane <souliane@mailoo.org>
parents:
299
diff
changeset
|
862 @param filepath: full filepath on the server |
|
4f221f34bdc7
browser_side (plugins radiocol, xep-0054): handle upload errors
souliane <souliane@mailoo.org>
parents:
299
diff
changeset
|
863 @return: a tuple with the name of the async bridge method |
|
4f221f34bdc7
browser_side (plugins radiocol, xep-0054): handle upload errors
souliane <souliane@mailoo.org>
parents:
299
diff
changeset
|
864 to be called followed by its arguments. |
|
4f221f34bdc7
browser_side (plugins radiocol, xep-0054): handle upload errors
souliane <souliane@mailoo.org>
parents:
299
diff
changeset
|
865 """ |
|
151
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
866 raise NotImplementedError |
|
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
867 |
| 127 | 868 def render(self, request): |
| 869 """ | |
| 870 Render method with some hacks: | |
| 871 - if login is requested, try to login with form data | |
| 872 - except login, every method is jsonrpc | |
| 873 - user doesn't need to be authentified for isRegistered, but must be for all other methods | |
| 874 """ | |
|
151
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
875 filename = self._getFileName(request) |
| 128 | 876 filepath = os.path.join(self.upload_dir, filename) |
|
151
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
877 #FIXME: the uploaded file is fully loaded in memory at form parsing time so far |
|
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
878 # (see twisted.web.http.Request.requestReceived). A custom requestReceived should |
|
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
879 # be written in the futur. In addition, it is not yet possible to get progression informations |
|
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
880 # (see http://twistedmatrix.com/trac/ticket/288) |
|
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
881 |
| 128 | 882 with open(filepath,'w') as f: |
|
151
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
883 f.write(request.args[self.NAME][0]) |
|
300
4f221f34bdc7
browser_side (plugins radiocol, xep-0054): handle upload errors
souliane <souliane@mailoo.org>
parents:
299
diff
changeset
|
884 |
|
4f221f34bdc7
browser_side (plugins radiocol, xep-0054): handle upload errors
souliane <souliane@mailoo.org>
parents:
299
diff
changeset
|
885 def finish(d): |
|
4f221f34bdc7
browser_side (plugins radiocol, xep-0054): handle upload errors
souliane <souliane@mailoo.org>
parents:
299
diff
changeset
|
886 error = isinstance(d, Exception) or isinstance (d, Failure) |
|
4f221f34bdc7
browser_side (plugins radiocol, xep-0054): handle upload errors
souliane <souliane@mailoo.org>
parents:
299
diff
changeset
|
887 request.write('KO' if error else 'OK') |
|
4f221f34bdc7
browser_side (plugins radiocol, xep-0054): handle upload errors
souliane <souliane@mailoo.org>
parents:
299
diff
changeset
|
888 # TODO: would be great to re-use the original Exception class and message |
|
4f221f34bdc7
browser_side (plugins radiocol, xep-0054): handle upload errors
souliane <souliane@mailoo.org>
parents:
299
diff
changeset
|
889 # but it is lost in the middle of the backtrace and encapsulated within |
|
4f221f34bdc7
browser_side (plugins radiocol, xep-0054): handle upload errors
souliane <souliane@mailoo.org>
parents:
299
diff
changeset
|
890 # a DBusException instance --> extract the data from the backtrace? |
|
4f221f34bdc7
browser_side (plugins radiocol, xep-0054): handle upload errors
souliane <souliane@mailoo.org>
parents:
299
diff
changeset
|
891 request.finish() |
|
4f221f34bdc7
browser_side (plugins radiocol, xep-0054): handle upload errors
souliane <souliane@mailoo.org>
parents:
299
diff
changeset
|
892 |
|
4f221f34bdc7
browser_side (plugins radiocol, xep-0054): handle upload errors
souliane <souliane@mailoo.org>
parents:
299
diff
changeset
|
893 d = JSONRPCMethodManager(self.sat_host).asyncBridgeCall(*self._fileWritten(request, filepath)) |
|
4f221f34bdc7
browser_side (plugins radiocol, xep-0054): handle upload errors
souliane <souliane@mailoo.org>
parents:
299
diff
changeset
|
894 d.addCallbacks(lambda d: finish(d), lambda failure: finish(failure)) |
|
4f221f34bdc7
browser_side (plugins radiocol, xep-0054): handle upload errors
souliane <souliane@mailoo.org>
parents:
299
diff
changeset
|
895 return server.NOT_DONE_YET |
|
4f221f34bdc7
browser_side (plugins radiocol, xep-0054): handle upload errors
souliane <souliane@mailoo.org>
parents:
299
diff
changeset
|
896 |
|
151
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
897 |
|
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
898 class UploadManagerRadioCol(UploadManager): |
|
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
899 NAME = 'song' |
|
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
900 |
|
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
901 def _getFileName(self, request): |
|
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
902 return "%s.ogg" % str(uuid.uuid4()) #XXX: chromium doesn't seem to play song without the .ogg extension, even with audio/ogg mime-type |
|
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
903 |
|
151
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
904 def _fileWritten(self, request, filepath): |
|
300
4f221f34bdc7
browser_side (plugins radiocol, xep-0054): handle upload errors
souliane <souliane@mailoo.org>
parents:
299
diff
changeset
|
905 """Called once the file is actually written on disk |
|
4f221f34bdc7
browser_side (plugins radiocol, xep-0054): handle upload errors
souliane <souliane@mailoo.org>
parents:
299
diff
changeset
|
906 @param request: HTTP request object |
|
4f221f34bdc7
browser_side (plugins radiocol, xep-0054): handle upload errors
souliane <souliane@mailoo.org>
parents:
299
diff
changeset
|
907 @param filepath: full filepath on the server |
|
4f221f34bdc7
browser_side (plugins radiocol, xep-0054): handle upload errors
souliane <souliane@mailoo.org>
parents:
299
diff
changeset
|
908 @return: a tuple with the name of the async bridge method |
|
4f221f34bdc7
browser_side (plugins radiocol, xep-0054): handle upload errors
souliane <souliane@mailoo.org>
parents:
299
diff
changeset
|
909 to be called followed by its arguments. |
|
4f221f34bdc7
browser_side (plugins radiocol, xep-0054): handle upload errors
souliane <souliane@mailoo.org>
parents:
299
diff
changeset
|
910 """ |
| 128 | 911 profile = ISATSession(request.getSession()).profile |
|
300
4f221f34bdc7
browser_side (plugins radiocol, xep-0054): handle upload errors
souliane <souliane@mailoo.org>
parents:
299
diff
changeset
|
912 return ("radiocolSongAdded", request.args['referee'][0], filepath, profile) |
|
4f221f34bdc7
browser_side (plugins radiocol, xep-0054): handle upload errors
souliane <souliane@mailoo.org>
parents:
299
diff
changeset
|
913 |
|
151
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
914 |
|
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
915 class UploadManagerAvatar(UploadManager): |
|
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
916 NAME = 'avatar_path' |
|
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
917 |
|
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
918 def _getFileName(self, request): |
|
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
919 return str(uuid.uuid4()) |
|
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
920 |
|
151
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
921 def _fileWritten(self, request, filepath): |
|
300
4f221f34bdc7
browser_side (plugins radiocol, xep-0054): handle upload errors
souliane <souliane@mailoo.org>
parents:
299
diff
changeset
|
922 """Called once the file is actually written on disk |
|
4f221f34bdc7
browser_side (plugins radiocol, xep-0054): handle upload errors
souliane <souliane@mailoo.org>
parents:
299
diff
changeset
|
923 @param request: HTTP request object |
|
4f221f34bdc7
browser_side (plugins radiocol, xep-0054): handle upload errors
souliane <souliane@mailoo.org>
parents:
299
diff
changeset
|
924 @param filepath: full filepath on the server |
|
4f221f34bdc7
browser_side (plugins radiocol, xep-0054): handle upload errors
souliane <souliane@mailoo.org>
parents:
299
diff
changeset
|
925 @return: a tuple with the name of the async bridge method |
|
4f221f34bdc7
browser_side (plugins radiocol, xep-0054): handle upload errors
souliane <souliane@mailoo.org>
parents:
299
diff
changeset
|
926 to be called followed by its arguments. |
|
4f221f34bdc7
browser_side (plugins radiocol, xep-0054): handle upload errors
souliane <souliane@mailoo.org>
parents:
299
diff
changeset
|
927 """ |
|
151
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
928 profile = ISATSession(request.getSession()).profile |
|
300
4f221f34bdc7
browser_side (plugins radiocol, xep-0054): handle upload errors
souliane <souliane@mailoo.org>
parents:
299
diff
changeset
|
929 return ("setAvatar", filepath, profile) |
|
4f221f34bdc7
browser_side (plugins radiocol, xep-0054): handle upload errors
souliane <souliane@mailoo.org>
parents:
299
diff
changeset
|
930 |
| 10 | 931 |
| 0 | 932 class Libervia(service.Service): |
|
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
933 |
| 0 | 934 def __init__(self): |
| 127 | 935 self._cleanup = [] |
|
317
bbadd490e63c
misc: gather the constants in a single file, as it is done for other frontends
souliane <souliane@mailoo.org>
parents:
309
diff
changeset
|
936 root = ProtectedFile(Const.LIBERVIA_DIR) |
| 0 | 937 self.signal_handler = SignalHandler(self) |
| 938 _register = Register(self) | |
|
151
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
939 _upload_radiocol = UploadManagerRadioCol(self) |
|
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
940 _upload_avatar = UploadManagerAvatar(self) |
| 0 | 941 self.signal_handler.plugRegister(_register) |
| 942 self.sessions = {} #key = session value = user | |
| 24 | 943 self.prof_connected = set() #Profiles connected |
| 46 | 944 self.action_handler = SATActionIDHandler() |
| 0 | 945 ## bridge ## |
| 946 try: | |
| 947 self.bridge=DBusBridgeFrontend() | |
| 948 except BridgeExceptionNoService: | |
| 949 print(u"Can't connect to SàT backend, are you sure it's launched ?") | |
| 950 sys.exit(1) | |
| 951 self.bridge.register("connected", self.signal_handler.connected) | |
| 156 | 952 self.bridge.register("disconnected", self.signal_handler.disconnected) |
| 0 | 953 self.bridge.register("connectionError", self.signal_handler.connectionError) |
|
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
954 self.bridge.register("actionResult", self.action_handler.actionResultCb) |
|
117
2e2e10785c33
server side: refactored signal according to SàT's bridge changes + getCardCache handling + updatedValue handling
Goffi <goffi@goffi.org>
parents:
110
diff
changeset
|
955 #core |
|
251
24335e82fef0
plugin XEP-249: added parameter Misc / Auto-join MUC on invitation:
souliane <souliane@mailoo.org>
parents:
242
diff
changeset
|
956 for signal_name in ['presenceUpdate', 'newMessage', 'subscribe', 'contactDeleted', 'newContact', 'entityDataUpdated', 'askConfirmation', 'newAlert']: |
|
2
669c531a857e
signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
957 self.bridge.register(signal_name, self.signal_handler.getGenericCb(signal_name)) |
|
117
2e2e10785c33
server side: refactored signal according to SàT's bridge changes + getCardCache handling + updatedValue handling
Goffi <goffi@goffi.org>
parents:
110
diff
changeset
|
958 #plugins |
|
2e2e10785c33
server side: refactored signal according to SàT's bridge changes + getCardCache handling + updatedValue handling
Goffi <goffi@goffi.org>
parents:
110
diff
changeset
|
959 for signal_name in ['personalEvent', 'roomJoined', 'roomUserJoined', 'roomUserLeft', 'tarotGameStarted', 'tarotGameNew', 'tarotGameChooseContrat', |
|
275
a763b2ac5d41
bridge + browser_side: bridge signals for games and their callbacks:
souliane <souliane@mailoo.org>
parents:
268
diff
changeset
|
960 'tarotGameShowCards', 'tarotGameInvalidCards', 'tarotGameCardsPlayed', 'tarotGameYourTurn', 'tarotGameScore', 'tarotGamePlayers', |
|
a763b2ac5d41
bridge + browser_side: bridge signals for games and their callbacks:
souliane <souliane@mailoo.org>
parents:
268
diff
changeset
|
961 'radiocolStarted', 'radiocolPreload', 'radiocolPlay', 'radiocolNoUpload', 'radiocolUploadOk', 'radiocolSongRejected', 'radiocolPlayers', |
|
a763b2ac5d41
bridge + browser_side: bridge signals for games and their callbacks:
souliane <souliane@mailoo.org>
parents:
268
diff
changeset
|
962 'roomLeft', 'chatStateReceived']: |
|
117
2e2e10785c33
server side: refactored signal according to SàT's bridge changes + getCardCache handling + updatedValue handling
Goffi <goffi@goffi.org>
parents:
110
diff
changeset
|
963 self.bridge.register(signal_name, self.signal_handler.getGenericCb(signal_name), "plugin") |
| 77 | 964 self.media_dir = self.bridge.getConfig('','media_dir') |
|
107
c3fb3292f582
browser side: CSS: changed tabs margin + fixed dragover background for chat panels
Goffi <goffi@goffi.org>
parents:
77
diff
changeset
|
965 self.local_dir = self.bridge.getConfig('','local_dir') |
|
172
631556a64850
server side: added root redirection to libervia.html
Goffi <goffi@goffi.org>
parents:
165
diff
changeset
|
966 root.putChild('', Redirect('libervia.html')) |
| 10 | 967 root.putChild('json_signal_api', self.signal_handler) |
| 968 root.putChild('json_api', MethodHandler(self)) | |
| 969 root.putChild('register_api', _register) | |
|
151
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
970 root.putChild('upload_radiocol', _upload_radiocol) |
|
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
971 root.putChild('upload_avatar', _upload_avatar) |
| 10 | 972 root.putChild('blog', MicroBlog(self)) |
|
59
d0fa4e96a5e4
server side: 404 error is now sent instead of directory listing when requesting a directory
Goffi <goffi@goffi.org>
parents:
57
diff
changeset
|
973 root.putChild('css', ProtectedFile("server_css/")) |
|
317
bbadd490e63c
misc: gather the constants in a single file, as it is done for other frontends
souliane <souliane@mailoo.org>
parents:
309
diff
changeset
|
974 root.putChild(os.path.dirname(Const.MEDIA_DIR), ProtectedFile(self.media_dir)) |
|
bbadd490e63c
misc: gather the constants in a single file, as it is done for other frontends
souliane <souliane@mailoo.org>
parents:
309
diff
changeset
|
975 root.putChild(os.path.dirname(Const.AVATARS_DIR), ProtectedFile(os.path.join(self.local_dir, Const.AVATARS_DIR))) |
|
151
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
976 root.putChild('radiocol', ProtectedFile(_upload_radiocol.getTmpDir(), defaultType="audio/ogg")) #We cheat for PoC because we know we are on the same host, so we use directly upload dir |
| 10 | 977 self.site = server.Site(root) |
|
44
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
978 self.site.sessionFactory = LiberviaSession |
| 0 | 979 |
| 127 | 980 def addCleanup(self, callback, *args, **kwargs): |
| 981 """Add cleaning method to call when service is stopped | |
| 982 cleaning method will be called in reverse order of they insertion | |
| 983 @param callback: callable to call on service stop | |
| 984 @param *args: list of arguments of the callback | |
| 985 @param **kwargs: list of keyword arguments of the callback""" | |
| 986 self._cleanup.insert(0, (callback, args, kwargs)) | |
| 987 | |
| 0 | 988 def startService(self): |
| 989 reactor.listenTCP(8080, self.site) | |
| 127 | 990 |
| 991 def stopService(self): | |
| 992 print "launching cleaning methods" | |
| 993 for callback, args, kwargs in self._cleanup: | |
| 994 callback(*args, **kwargs) | |
|
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
995 |
| 0 | 996 def run(self): |
| 997 reactor.run() | |
|
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
998 |
| 0 | 999 def stop(self): |
| 1000 reactor.stop() | |
| 1001 | |
|
44
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
1002 registerAdapter(SATSession, server.Session, ISATSession) |
|
317
bbadd490e63c
misc: gather the constants in a single file, as it is done for other frontends
souliane <souliane@mailoo.org>
parents:
309
diff
changeset
|
1003 application = service.Application(Const.APP_NAME) |
| 0 | 1004 service = Libervia() |
| 1005 service.setServiceParent(application) |