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