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