Mercurial > libervia-web
annotate libervia.tac @ 260:533d68585866
browser side: if 'xhtml' key is present in microblog data, rich content is displayed
author | Goffi <goffi@goffi.org> |
---|---|
date | Fri, 15 Nov 2013 15:34:55 +0100 |
parents | a20815c75c15 |
children | 3df0c3634c29 |
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 |
2bc6cf004e61
browser, server: comments handling:
Goffi <goffi@goffi.org>
parents:
201
diff
changeset
|
251 def jsonrpc_sendMblogComment(self, node, text): |
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: |
2bc6cf004e61
browser, server: comments handling:
Goffi <goffi@goffi.org>
parents:
201
diff
changeset
|
258 return self.sat_host.bridge.sendGroupBlogComment(node, text, 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): |
321 """Join a Multi-User Chat room""" | |
322 profile = ISATSession(self.session).profile | |
323 try: | |
324 room_jid = JID(room_jid) | |
325 except: | |
326 warning('Invalid room jid') | |
327 return | |
125
f9d63624699f
radio collective integration, first draft
Goffi <goffi@goffi.org>
parents:
124
diff
changeset
|
328 self.sat_host.bridge.joinMUC(room_jid.userhost(), nick, {}, profile) |
50 | 329 |
179
8475a29d7214
closing a group chat widget now leave the muc room (bug 11)
Goffi <goffi@goffi.org>
parents:
172
diff
changeset
|
330 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
|
331 """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
|
332 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
|
333 try: |
8475a29d7214
closing a group chat widget now leave the muc room (bug 11)
Goffi <goffi@goffi.org>
parents:
172
diff
changeset
|
334 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
|
335 except: |
8475a29d7214
closing a group chat widget now leave the muc room (bug 11)
Goffi <goffi@goffi.org>
parents:
172
diff
changeset
|
336 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
|
337 return |
8475a29d7214
closing a group chat widget now leave the muc room (bug 11)
Goffi <goffi@goffi.org>
parents:
172
diff
changeset
|
338 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
|
339 |
121 | 340 def jsonrpc_getRoomsJoined(self): |
30
7684e3ceb12d
server_side: added getRoomJoined method
Goffi <goffi@goffi.org>
parents:
24
diff
changeset
|
341 """Return list of room already joined by user""" |
44
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
342 profile = ISATSession(self.session).profile |
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
343 return self.sat_host.bridge.getRoomsJoined(profile) |
30
7684e3ceb12d
server_side: added getRoomJoined method
Goffi <goffi@goffi.org>
parents:
24
diff
changeset
|
344 |
24 | 345 def jsonrpc_launchTarotGame(self, other_players): |
346 """Create a room, invite the other players and start a Tarot game""" | |
44
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
347 profile = ISATSession(self.session).profile |
24 | 348 self.sat_host.bridge.tarotGameLaunch(other_players, profile) |
11
331c093e4eb3
magicBox is now able to send global microblog
Goffi <goffi@goffi.org>
parents:
10
diff
changeset
|
349 |
36 | 350 def jsonrpc_getTarotCardsPaths(self): |
351 """Give the path of all the tarot cards""" | |
77 | 352 _join = os.path.join |
353 _media_dir = _join(self.sat_host.media_dir,'') | |
354 return map(lambda x: _join(MEDIA_DIR, x[len(_media_dir):]),glob.glob(_join(_media_dir,CARDS_DIR,'*_*.png'))); | |
36 | 355 |
37
b306aa090438
Tarot game: game launching (first hand showed), and contract selection
Goffi <goffi@goffi.org>
parents:
36
diff
changeset
|
356 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
|
357 """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
|
358 profile = ISATSession(self.session).profile |
153
ada146bac8fe
server side: fixed tarotGameReady call
Goffi <goffi@goffi.org>
parents:
151
diff
changeset
|
359 self.sat_host.bridge.tarotGameReady(player, referee, profile) |
36 | 360 |
37
b306aa090438
Tarot game: game launching (first hand showed), and contract selection
Goffi <goffi@goffi.org>
parents:
36
diff
changeset
|
361 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
|
362 """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
|
363 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
|
364 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
|
365 |
39
305e81c7a32c
Tarot game: a game can now be finished
Goffi <goffi@goffi.org>
parents:
38
diff
changeset
|
366 def jsonrpc_tarotGamePlayCards(self, player_nick, referee, cards): |
128 | 367 """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
|
368 profile = ISATSession(self.session).profile |
39
305e81c7a32c
Tarot game: a game can now be finished
Goffi <goffi@goffi.org>
parents:
38
diff
changeset
|
369 self.sat_host.bridge.tarotGamePlayCards(player_nick, referee, cards, profile) |
36 | 370 |
125
f9d63624699f
radio collective integration, first draft
Goffi <goffi@goffi.org>
parents:
124
diff
changeset
|
371 def jsonrpc_launchRadioCollective(self, invited): |
f9d63624699f
radio collective integration, first draft
Goffi <goffi@goffi.org>
parents:
124
diff
changeset
|
372 """Create a room, invite people, and start a radio collective""" |
f9d63624699f
radio collective integration, first draft
Goffi <goffi@goffi.org>
parents:
124
diff
changeset
|
373 profile = ISATSession(self.session).profile |
f9d63624699f
radio collective integration, first draft
Goffi <goffi@goffi.org>
parents:
124
diff
changeset
|
374 self.sat_host.bridge.radiocolLaunch(invited, profile) |
f9d63624699f
radio collective integration, first draft
Goffi <goffi@goffi.org>
parents:
124
diff
changeset
|
375 |
137 | 376 def jsonrpc_getEntityData(self, jid, keys): |
377 """Get cached data for an entit | |
378 @param jid: jid of contact from who we want data | |
379 @param keys: name of data we want (list) | |
380 @return: requested data""" | |
124
6d1f4a3da29b
server: fixed buggy vcard cache retrieving, fixes avatar issue
Goffi <goffi@goffi.org>
parents:
123
diff
changeset
|
381 profile = ISATSession(self.session).profile |
137 | 382 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
|
383 |
204
890776a6fdb7
browser + server: vcard is requested when no avatar data is found in cache
Goffi <goffi@goffi.org>
parents:
202
diff
changeset
|
384 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
|
385 """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
|
386 @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
|
387 @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
|
388 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
|
389 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
|
390 |
214
7b26be266ab1
plugin XEP-0085: Chat State Notifications
souliane <souliane@mailoo.org>
parents:
204
diff
changeset
|
391 def jsonrpc_getParamsUI(self): |
215
e830a0c60d32
server side: added the security_limit to setParam
souliane <souliane@mailoo.org>
parents:
214
diff
changeset
|
392 """Return the parameters XML for profile""" |
214
7b26be266ab1
plugin XEP-0085: Chat State Notifications
souliane <souliane@mailoo.org>
parents:
204
diff
changeset
|
393 profile = ISATSession(self.session).profile |
219
36673d19c87e
server side: better async bridge calls handling
Goffi <goffi@goffi.org>
parents:
218
diff
changeset
|
394 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
|
395 |
e830a0c60d32
server side: added the security_limit to setParam
souliane <souliane@mailoo.org>
parents:
214
diff
changeset
|
396 def setAuthorizedParams(d): |
e830a0c60d32
server side: added the security_limit to setParam
souliane <souliane@mailoo.org>
parents:
214
diff
changeset
|
397 if self.authorized_params is None: |
e830a0c60d32
server side: added the security_limit to setParam
souliane <souliane@mailoo.org>
parents:
214
diff
changeset
|
398 self.authorized_params = {} |
e830a0c60d32
server side: added the security_limit to setParam
souliane <souliane@mailoo.org>
parents:
214
diff
changeset
|
399 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
|
400 params = cat.getElementsByTagName("param") |
e830a0c60d32
server side: added the security_limit to setParam
souliane <souliane@mailoo.org>
parents:
214
diff
changeset
|
401 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
|
402 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
|
403 if self.authorized_params: |
4e6467efd6bf
browser_side: small improvements for parameters panel
souliane <souliane@mailoo.org>
parents:
215
diff
changeset
|
404 return d |
4e6467efd6bf
browser_side: small improvements for parameters panel
souliane <souliane@mailoo.org>
parents:
215
diff
changeset
|
405 else: |
4e6467efd6bf
browser_side: small improvements for parameters panel
souliane <souliane@mailoo.org>
parents:
215
diff
changeset
|
406 return None |
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
407 |
215
e830a0c60d32
server side: added the security_limit to setParam
souliane <souliane@mailoo.org>
parents:
214
diff
changeset
|
408 d.addCallback(setAuthorizedParams) |
e830a0c60d32
server side: added the security_limit to setParam
souliane <souliane@mailoo.org>
parents:
214
diff
changeset
|
409 |
e830a0c60d32
server side: added the security_limit to setParam
souliane <souliane@mailoo.org>
parents:
214
diff
changeset
|
410 from sat.tools.xml_tools import paramsXml2xmlUI |
218
4e6467efd6bf
browser_side: small improvements for parameters panel
souliane <souliane@mailoo.org>
parents:
215
diff
changeset
|
411 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
|
412 |
214
7b26be266ab1
plugin XEP-0085: Chat State Notifications
souliane <souliane@mailoo.org>
parents:
204
diff
changeset
|
413 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
|
414 |
229
e632f77c4219
bridge: asyncGetParamA takes a security_limit argument
souliane <souliane@mailoo.org>
parents:
219
diff
changeset
|
415 def jsonrpc_asyncGetParamA(self, param, category, attribute="value"): |
e632f77c4219
bridge: asyncGetParamA takes a security_limit argument
souliane <souliane@mailoo.org>
parents:
219
diff
changeset
|
416 """Return the parameter value for profile""" |
e632f77c4219
bridge: asyncGetParamA takes a security_limit argument
souliane <souliane@mailoo.org>
parents:
219
diff
changeset
|
417 profile = ISATSession(self.session).profile |
e632f77c4219
bridge: asyncGetParamA takes a security_limit argument
souliane <souliane@mailoo.org>
parents:
219
diff
changeset
|
418 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
|
419 return d |
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
420 |
214
7b26be266ab1
plugin XEP-0085: Chat State Notifications
souliane <souliane@mailoo.org>
parents:
204
diff
changeset
|
421 def jsonrpc_setParam(self, name, value, category): |
7b26be266ab1
plugin XEP-0085: Chat State Notifications
souliane <souliane@mailoo.org>
parents:
204
diff
changeset
|
422 profile = ISATSession(self.session).profile |
215
e830a0c60d32
server side: added the security_limit to setParam
souliane <souliane@mailoo.org>
parents:
214
diff
changeset
|
423 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
|
424 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
|
425 else: |
e830a0c60d32
server side: added the security_limit to setParam
souliane <souliane@mailoo.org>
parents:
214
diff
changeset
|
426 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
|
427 % (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
|
428 |
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
|
429 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
|
430 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
|
431 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
|
432 |
214
7b26be266ab1
plugin XEP-0085: Chat State Notifications
souliane <souliane@mailoo.org>
parents:
204
diff
changeset
|
433 def jsonrpc_chatStateComposing(self, to_jid_s): |
242
a25aa882e09a
browser_side: add context menu for contact:
souliane <souliane@mailoo.org>
parents:
235
diff
changeset
|
434 """Call the method to process a "composing" state. |
214
7b26be266ab1
plugin XEP-0085: Chat State Notifications
souliane <souliane@mailoo.org>
parents:
204
diff
changeset
|
435 @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
|
436 """ |
7b26be266ab1
plugin XEP-0085: Chat State Notifications
souliane <souliane@mailoo.org>
parents:
204
diff
changeset
|
437 profile = ISATSession(self.session).profile |
7b26be266ab1
plugin XEP-0085: Chat State Notifications
souliane <souliane@mailoo.org>
parents:
204
diff
changeset
|
438 self.sat_host.bridge.chatStateComposing(to_jid_s, profile) |
7b26be266ab1
plugin XEP-0085: Chat State Notifications
souliane <souliane@mailoo.org>
parents:
204
diff
changeset
|
439 |
242
a25aa882e09a
browser_side: add context menu for contact:
souliane <souliane@mailoo.org>
parents:
235
diff
changeset
|
440 def jsonrpc_getNewAccountDomain(self): |
a25aa882e09a
browser_side: add context menu for contact:
souliane <souliane@mailoo.org>
parents:
235
diff
changeset
|
441 """@return: the domain for new account creation""" |
a25aa882e09a
browser_side: add context menu for contact:
souliane <souliane@mailoo.org>
parents:
235
diff
changeset
|
442 d = self.asyncBridgeCall("getNewAccountDomain") |
a25aa882e09a
browser_side: add context menu for contact:
souliane <souliane@mailoo.org>
parents:
235
diff
changeset
|
443 return d |
214
7b26be266ab1
plugin XEP-0085: Chat State Notifications
souliane <souliane@mailoo.org>
parents:
204
diff
changeset
|
444 |
251
24335e82fef0
plugin XEP-249: added parameter Misc / Auto-join MUC on invitation:
souliane <souliane@mailoo.org>
parents:
242
diff
changeset
|
445 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
|
446 """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
|
447 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
|
448 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
|
449 |
24335e82fef0
plugin XEP-249: added parameter Misc / Auto-join MUC on invitation:
souliane <souliane@mailoo.org>
parents:
242
diff
changeset
|
450 |
219
36673d19c87e
server side: better async bridge calls handling
Goffi <goffi@goffi.org>
parents:
218
diff
changeset
|
451 class Register(JSONRPCMethodManager): |
0 | 452 """This class manage the registration procedure with SàT |
453 It provide an api for the browser, check password and setup the web server""" | |
454 | |
455 def __init__(self, sat_host): | |
219
36673d19c87e
server side: better async bridge calls handling
Goffi <goffi@goffi.org>
parents:
218
diff
changeset
|
456 JSONRPCMethodManager.__init__(self, sat_host) |
0 | 457 self.profiles_waiting={} |
458 self.request=None | |
459 | |
460 def getWaitingRequest(self, profile): | |
461 """Tell if a profile is trying to log in""" | |
462 if self.profiles_waiting.has_key(profile): | |
463 return self.profiles_waiting[profile] | |
464 else: | |
465 return None | |
466 | |
467 def render(self, request): | |
468 """ | |
469 Render method with some hacks: | |
470 - if login is requested, try to login with form data | |
471 - except login, every method is jsonrpc | |
472 - user doesn't need to be authentified for isRegistered, but must be for all other methods | |
473 """ | |
474 if request.postpath==['login']: | |
475 return self.login(request) | |
476 _session = request.getSession() | |
477 parsed = jsonrpclib.loads(request.content.read()) | |
478 if parsed.get("method")!="isRegistered": | |
479 #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
|
480 profile = ISATSession(_session).profile |
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
481 if not profile: |
0 | 482 #user is not identified, we return a jsonrpc fault |
483 fault = jsonrpclib.Fault(0, "Not allowed") #FIXME: define some standard error codes for libervia | |
484 return jsonrpc.JSONRPC._cbRender(self, fault, request, parsed.get('id'), parsed.get('jsonrpc')) | |
485 self.request = request | |
486 return jsonrpc.JSONRPC.render(self, request) | |
487 | |
488 def login(self, request): | |
489 """ | |
490 this method is called with the POST information from the registering form | |
491 it test if the password is ok, and log in if it's the case, | |
492 else it return an error | |
493 @param request: request of the register formulaire, must have "login" and "password" as arguments | |
494 @return: A constant indicating the state: | |
495 - BAD REQUEST: something is wrong in the request (bad arguments, profile_key for login) | |
496 - AUTH ERROR: either the profile or the password is wrong | |
497 - ALREADY WAITING: a request has already be made for this profile | |
498 - 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
|
499 """ |
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
500 |
0 | 501 try: |
66
9d8e79ac4c9c
Login/Register box: integration of Adrien Vigneron's design
Goffi <goffi@goffi.org>
parents:
61
diff
changeset
|
502 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
|
503 _login = request.args['login'][0] |
9d8e79ac4c9c
Login/Register box: integration of Adrien Vigneron's design
Goffi <goffi@goffi.org>
parents:
61
diff
changeset
|
504 if _login.startswith('@'): |
9d8e79ac4c9c
Login/Register box: integration of Adrien Vigneron's design
Goffi <goffi@goffi.org>
parents:
61
diff
changeset
|
505 raise Exception('No profile_key allowed') |
9d8e79ac4c9c
Login/Register box: integration of Adrien Vigneron's design
Goffi <goffi@goffi.org>
parents:
61
diff
changeset
|
506 _pass = request.args['login_password'][0] |
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
507 |
66
9d8e79ac4c9c
Login/Register box: integration of Adrien Vigneron's design
Goffi <goffi@goffi.org>
parents:
61
diff
changeset
|
508 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
|
509 return self._registerNewAccount(request) |
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
510 |
66
9d8e79ac4c9c
Login/Register box: integration of Adrien Vigneron's design
Goffi <goffi@goffi.org>
parents:
61
diff
changeset
|
511 else: |
9d8e79ac4c9c
Login/Register box: integration of Adrien Vigneron's design
Goffi <goffi@goffi.org>
parents:
61
diff
changeset
|
512 raise Exception('Unknown submit type') |
0 | 513 except KeyError: |
514 return "BAD REQUEST" | |
515 | |
516 _profile_check = self.sat_host.bridge.getProfileName(_login) | |
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
517 |
121 | 518 def profile_pass_cb(_profile_pass): |
519 if not _profile_check or _profile_check != _login or _profile_pass != _pass: | |
520 request.write("AUTH ERROR") | |
521 request.finish() | |
522 return | |
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
523 |
121 | 524 if self.profiles_waiting.has_key(_login): |
525 request.write("ALREADY WAITING") | |
526 request.finish() | |
527 return | |
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
528 |
121 | 529 if self.sat_host.bridge.isConnected(_login): |
530 request.write(self._logged(_login, request, finish=False)) | |
531 request.finish() | |
532 return | |
533 | |
534 self.profiles_waiting[_login] = request | |
219
36673d19c87e
server side: better async bridge calls handling
Goffi <goffi@goffi.org>
parents:
218
diff
changeset
|
535 d = self.asyncBridgeCall("asyncConnect", _login) |
155 | 536 return d |
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
537 |
121 | 538 def profile_pass_errback(ignore): |
539 error("INTERNAL ERROR: can't check profile password") | |
540 request.write("AUTH ERROR") | |
541 request.finish() | |
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
542 |
219
36673d19c87e
server side: better async bridge calls handling
Goffi <goffi@goffi.org>
parents:
218
diff
changeset
|
543 d = self.asyncBridgeCall("asyncGetParamA", "Password", "Connection", profile_key=_login) |
121 | 544 d.addCallbacks(profile_pass_cb, profile_pass_errback) |
0 | 545 |
546 return server.NOT_DONE_YET | |
547 | |
46 | 548 def _postAccountCreation(self, answer_type, id, data, profile): |
549 """Called when a account has just been created, | |
550 setup stuff has microblog access""" | |
551 def _connected(ignore): | |
219
36673d19c87e
server side: better async bridge calls handling
Goffi <goffi@goffi.org>
parents:
218
diff
changeset
|
552 mblog_d = self.asyncBridgeCall("setMicroblogAccess", "open", profile) |
46 | 553 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
|
554 |
219
36673d19c87e
server side: better async bridge calls handling
Goffi <goffi@goffi.org>
parents:
218
diff
changeset
|
555 d = self.asyncBridgeCall("asyncConnect", profile) |
46 | 556 d.addCallback(_connected) |
557 | |
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
|
558 def _registerNewAccount(self, request): |
46 | 559 """Create a new account, or return error |
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
560 @param request: initial login request |
46 | 561 @return: "REGISTRATION" in case of success""" |
54
f25c4077f6b9
addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents:
50
diff
changeset
|
562 #TODO: must be moved in SàT core |
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
563 |
46 | 564 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
|
565 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
|
566 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
|
567 email = request.args['email'][0] |
46 | 568 except KeyError: |
569 return "BAD REQUEST" | |
570 if not re.match(r'^[a-z0-9_-]+$', login, re.IGNORECASE) or \ | |
571 not re.match(r'^.+@.+\..+', email, re.IGNORECASE): | |
572 return "BAD REQUEST" | |
573 | |
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
|
574 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
|
575 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
|
576 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
|
577 #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
|
578 #pudb.set_trace() |
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
579 |
160
6f913f5adca8
server side: registration refactoring first draft; main registration code is moved to SàT backend
Goffi <goffi@goffi.org>
parents:
156
diff
changeset
|
580 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
|
581 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
|
582 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
|
583 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
|
584 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
|
585 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
|
586 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
|
587 #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
|
588 #pdb.set_trace() |
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
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 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
|
591 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
|
592 request.finish() |
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
593 |
219
36673d19c87e
server side: better async bridge calls handling
Goffi <goffi@goffi.org>
parents:
218
diff
changeset
|
594 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
|
595 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
|
596 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
|
597 return server.NOT_DONE_YET |
46 | 598 |
0 | 599 def __cleanWaiting(self, login): |
600 """Remove login from waiting queue""" | |
601 try: | |
602 del self.profiles_waiting[login] | |
603 except KeyError: | |
604 pass | |
605 | |
14
9bf8ed012adc
- Group microblog management, first draft
Goffi <goffi@goffi.org>
parents:
11
diff
changeset
|
606 def _logged(self, profile, request, finish=True): |
0 | 607 """Set everything when a user just logged |
608 and return "LOGGED" to the requester""" | |
61 | 609 def result(answer): |
610 if finish: | |
611 request.write(answer) | |
612 request.finish() | |
613 else: | |
614 return answer | |
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
615 |
14
9bf8ed012adc
- Group microblog management, first draft
Goffi <goffi@goffi.org>
parents:
11
diff
changeset
|
616 self.__cleanWaiting(profile) |
0 | 617 _session = request.getSession() |
44
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
618 sat_session = ISATSession(_session) |
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
619 if sat_session.profile: |
61 | 620 error (('/!\\ Session has already a profile, this should NEVER happen !')) |
621 return result('SESSION_ACTIVE') | |
44
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
622 sat_session.profile = profile |
24 | 623 self.sat_host.prof_connected.add(profile) |
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
624 |
45
7f106052326f
server side: user is now disconnected on session end, and queue is purged
Goffi <goffi@goffi.org>
parents:
44
diff
changeset
|
625 def onExpire(): |
156 | 626 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
|
627 try: |
7f106052326f
server side: user is now disconnected on session end, and queue is purged
Goffi <goffi@goffi.org>
parents:
44
diff
changeset
|
628 #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
|
629 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
|
630 except KeyError: |
7f106052326f
server side: user is now disconnected on session end, and queue is purged
Goffi <goffi@goffi.org>
parents:
44
diff
changeset
|
631 pass |
130 | 632 #and now we disconnect the profile |
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
633 self.sat_host.bridge.disconnect(profile) |
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
634 |
45
7f106052326f
server side: user is now disconnected on session end, and queue is purged
Goffi <goffi@goffi.org>
parents:
44
diff
changeset
|
635 _session.notifyOnExpire(onExpire) |
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
636 |
14
9bf8ed012adc
- Group microblog management, first draft
Goffi <goffi@goffi.org>
parents:
11
diff
changeset
|
637 d = defer.Deferred() |
61 | 638 return result('LOGGED') |
0 | 639 |
640 def _logginError(self, login, request, error_type): | |
641 """Something went wrong during loggin, return an error""" | |
642 self.__cleanWaiting(login) | |
643 return error_type | |
644 | |
645 def jsonrpc_isConnected(self): | |
646 _session = self.request.getSession() | |
44
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
647 profile = ISATSession(_session).profile |
0 | 648 return self.sat_host.bridge.isConnected(profile) |
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
649 |
0 | 650 def jsonrpc_connect(self): |
651 _session = self.request.getSession() | |
44
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
652 profile = ISATSession(_session).profile |
0 | 653 if self.profiles_waiting.has_key(profile): |
654 raise jsonrpclib.Fault('1','Already waiting') #FIXME: define some standard error codes for libervia | |
655 self.profiles_waiting[profile] = self.request | |
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
656 self.sat_host.bridge.connect(profile) |
0 | 657 return server.NOT_DONE_YET |
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
658 |
0 | 659 def jsonrpc_isRegistered(self): |
660 """Tell if the user is already registered""" | |
661 _session = self.request.getSession() | |
44
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
662 profile = ISATSession(_session).profile |
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
663 return bool(profile) |
251
24335e82fef0
plugin XEP-249: added parameter Misc / Auto-join MUC on invitation:
souliane <souliane@mailoo.org>
parents:
242
diff
changeset
|
664 |
24335e82fef0
plugin XEP-249: added parameter Misc / Auto-join MUC on invitation:
souliane <souliane@mailoo.org>
parents:
242
diff
changeset
|
665 |
0 | 666 class SignalHandler(jsonrpc.JSONRPC): |
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
667 |
0 | 668 def __init__(self, sat_host): |
669 Resource.__init__(self) | |
670 self.register=None | |
671 self.sat_host=sat_host | |
3
154d4caa57f4
server side: proper profile management in signals generic callback
Goffi <goffi@goffi.org>
parents:
2
diff
changeset
|
672 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
|
673 self.queue = {} |
2
669c531a857e
signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
674 |
0 | 675 def plugRegister(self, register): |
676 self.register = register | |
2
669c531a857e
signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
677 |
669c531a857e
signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
678 def jsonrpc_getSignals(self): |
669c531a857e
signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
679 """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
|
680 @return: (signal, *signal_args)""" |
3
154d4caa57f4
server side: proper profile management in signals generic callback
Goffi <goffi@goffi.org>
parents:
2
diff
changeset
|
681 _session = self.request.getSession() |
44
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
682 profile = ISATSession(_session).profile |
24 | 683 if profile in self.queue: #if we have signals to send in queue |
684 if self.queue[profile]: | |
685 return self.queue[profile].pop(0) | |
686 else: | |
687 #the queue is empty, we delete the profile from queue | |
688 del self.queue[profile] | |
44
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
689 _session.lock() #we don't want the session to expire as long as this connection is active |
156 | 690 def unlock(signal, profile): |
44
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
691 _session.unlock() |
156 | 692 try: |
693 source_defer = self.signalDeferred[profile] | |
694 if source_defer.called and source_defer.result[0] == "disconnected": | |
695 info(u"[%s] disconnected" % (profile,)) | |
696 _session.expire() | |
697 except IndexError: | |
698 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
|
699 |
3
154d4caa57f4
server side: proper profile management in signals generic callback
Goffi <goffi@goffi.org>
parents:
2
diff
changeset
|
700 self.signalDeferred[profile] = defer.Deferred() |
156 | 701 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
|
702 return self.signalDeferred[profile] |
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
703 |
2
669c531a857e
signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
704 def getGenericCb(self, function_name): |
3
154d4caa57f4
server side: proper profile management in signals generic callback
Goffi <goffi@goffi.org>
parents:
2
diff
changeset
|
705 """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
|
706 function must have profile as last argument""" |
2
669c531a857e
signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
707 def genericCb(*args): |
3
154d4caa57f4
server side: proper profile management in signals generic callback
Goffi <goffi@goffi.org>
parents:
2
diff
changeset
|
708 profile = args[-1] |
24 | 709 if not profile in self.sat_host.prof_connected: |
710 return | |
3
154d4caa57f4
server side: proper profile management in signals generic callback
Goffi <goffi@goffi.org>
parents:
2
diff
changeset
|
711 if profile in self.signalDeferred: |
154d4caa57f4
server side: proper profile management in signals generic callback
Goffi <goffi@goffi.org>
parents:
2
diff
changeset
|
712 self.signalDeferred[profile].callback((function_name,args[:-1])) |
24 | 713 del self.signalDeferred[profile] |
2
669c531a857e
signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
714 else: |
24 | 715 if not self.queue.has_key(profile): |
716 self.queue[profile] = [] | |
717 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
|
718 return genericCb |
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
719 |
0 | 720 def connected(self, profile): |
721 assert(self.register) #register must be plugged | |
722 request = self.register.getWaitingRequest(profile) | |
723 if request: | |
724 self.register._logged(profile, request) | |
725 | |
156 | 726 def disconnected(self, profile): |
727 if not profile in self.sat_host.prof_connected: | |
728 error("'disconnected' signal received for a not connected profile") | |
729 return | |
730 self.sat_host.prof_connected.remove(profile) | |
731 if profile in self.signalDeferred: | |
732 self.signalDeferred[profile].callback(("disconnected",)) | |
733 del self.signalDeferred[profile] | |
734 else: | |
735 if not self.queue.has_key(profile): | |
736 self.queue[profile] = [] | |
737 self.queue[profile].append(("disconnected",)) | |
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
738 |
156 | 739 |
0 | 740 def connectionError(self, error_type, profile): |
741 assert(self.register) #register must be plugged | |
742 request = self.register.getWaitingRequest(profile) | |
743 if request: #The user is trying to log in | |
744 if error_type == "AUTH_ERROR": | |
745 _error_t = "AUTH ERROR" | |
746 else: | |
747 _error_t = "UNKNOWN" | |
748 self.register._logginError(profile, request, _error_t) | |
749 | |
2
669c531a857e
signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
750 def render(self, request): |
669c531a857e
signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
751 """ |
669c531a857e
signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
752 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
|
753 """ |
669c531a857e
signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
754 _session = request.getSession() |
669c531a857e
signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
755 parsed = jsonrpclib.loads(request.content.read()) |
44
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
756 profile = ISATSession(_session).profile |
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
757 if not profile: |
2
669c531a857e
signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
758 #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
|
759 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
|
760 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
|
761 self.request = request |
669c531a857e
signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
762 return jsonrpc.JSONRPC.render(self, request) |
0 | 763 |
127 | 764 class UploadManager(Resource): |
765 """This class manage the upload of a file | |
766 It redirect the stream to SàT core backend""" | |
767 isLeaf = True | |
151
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
768 NAME = 'path' #name use by the FileUpload |
127 | 769 |
770 def __init__(self, sat_host): | |
771 self.sat_host=sat_host | |
772 self.upload_dir = tempfile.mkdtemp() | |
773 self.sat_host.addCleanup(shutil.rmtree, self.upload_dir) | |
774 | |
128 | 775 def getTmpDir(self): |
776 return self.upload_dir | |
777 | |
151
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
778 def _getFileName(self, request): |
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
779 """Generate unique filename for a file""" |
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
780 raise NotImplementedError |
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
781 |
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
782 def _fileWritten(self, request, filepath): |
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
783 """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
|
784 raise NotImplementedError |
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
785 |
127 | 786 def render(self, request): |
787 """ | |
788 Render method with some hacks: | |
789 - if login is requested, try to login with form data | |
790 - except login, every method is jsonrpc | |
791 - user doesn't need to be authentified for isRegistered, but must be for all other methods | |
792 """ | |
151
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
793 #start = time.time() |
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
794 filename = self._getFileName(request) |
128 | 795 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
|
796 #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
|
797 # (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
|
798 # 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
|
799 # (see http://twistedmatrix.com/trac/ticket/288) |
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
800 |
128 | 801 with open(filepath,'w') as f: |
151
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
802 f.write(request.args[self.NAME][0]) |
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
803 self._fileWritten(request, filepath) |
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
804 #end = time.time() |
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
805 #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
|
806 return "OK" |
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
807 |
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
808 class UploadManagerRadioCol(UploadManager): |
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
809 NAME = 'song' |
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
810 |
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
811 def _getFileName(self, request): |
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
812 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
|
813 |
151
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""" |
128 | 816 profile = ISATSession(request.getSession()).profile |
817 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
|
818 |
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
819 class UploadManagerAvatar(UploadManager): |
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
820 NAME = 'avatar_path' |
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
821 |
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
822 def _getFileName(self, request): |
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
823 return str(uuid.uuid4()) |
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
824 |
151
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
825 def _fileWritten(self, request, filepath): |
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
826 """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
|
827 profile = ISATSession(request.getSession()).profile |
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
828 print u"fichier écrit:", filepath |
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
829 self.sat_host.bridge.setAvatar(filepath, profile) |
10 | 830 |
0 | 831 class Libervia(service.Service): |
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
832 |
0 | 833 def __init__(self): |
127 | 834 self._cleanup = [] |
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
835 root = ProtectedFile(LIBERVIA_DIR) |
0 | 836 self.signal_handler = SignalHandler(self) |
837 _register = Register(self) | |
151
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
838 _upload_radiocol = UploadManagerRadioCol(self) |
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
839 _upload_avatar = UploadManagerAvatar(self) |
0 | 840 self.signal_handler.plugRegister(_register) |
841 self.sessions = {} #key = session value = user | |
24 | 842 self.prof_connected = set() #Profiles connected |
46 | 843 self.action_handler = SATActionIDHandler() |
0 | 844 ## bridge ## |
845 try: | |
846 self.bridge=DBusBridgeFrontend() | |
847 except BridgeExceptionNoService: | |
848 print(u"Can't connect to SàT backend, are you sure it's launched ?") | |
849 sys.exit(1) | |
850 self.bridge.register("connected", self.signal_handler.connected) | |
156 | 851 self.bridge.register("disconnected", self.signal_handler.disconnected) |
0 | 852 self.bridge.register("connectionError", self.signal_handler.connectionError) |
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
853 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
|
854 #core |
251
24335e82fef0
plugin XEP-249: added parameter Misc / Auto-join MUC on invitation:
souliane <souliane@mailoo.org>
parents:
242
diff
changeset
|
855 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
|
856 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
|
857 #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
|
858 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
|
859 'tarotGameShowCards', 'tarotGameInvalidCards', 'tarotGameCardsPlayed', 'tarotGameYourTurn', 'tarotGameScore', |
214
7b26be266ab1
plugin XEP-0085: Chat State Notifications
souliane <souliane@mailoo.org>
parents:
204
diff
changeset
|
860 'radiocolStarted', 'radiocolPreload', 'radiocolPlay', 'radiocolNoUpload', 'radiocolUploadOk', 'radiocolSongRejected', |
7b26be266ab1
plugin XEP-0085: Chat State Notifications
souliane <souliane@mailoo.org>
parents:
204
diff
changeset
|
861 '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
|
862 self.bridge.register(signal_name, self.signal_handler.getGenericCb(signal_name), "plugin") |
77 | 863 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
|
864 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
|
865 root.putChild('', Redirect('libervia.html')) |
10 | 866 root.putChild('json_signal_api', self.signal_handler) |
867 root.putChild('json_api', MethodHandler(self)) | |
868 root.putChild('register_api', _register) | |
151
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
869 root.putChild('upload_radiocol', _upload_radiocol) |
a159cc29b556
server side: file upload is now more generic:
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
870 root.putChild('upload_avatar', _upload_avatar) |
10 | 871 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
|
872 root.putChild('css', ProtectedFile("server_css/")) |
77 | 873 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
|
874 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
|
875 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 | 876 self.site = server.Site(root) |
44
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
877 self.site.sessionFactory = LiberviaSession |
0 | 878 |
127 | 879 def addCleanup(self, callback, *args, **kwargs): |
880 """Add cleaning method to call when service is stopped | |
881 cleaning method will be called in reverse order of they insertion | |
882 @param callback: callable to call on service stop | |
883 @param *args: list of arguments of the callback | |
884 @param **kwargs: list of keyword arguments of the callback""" | |
885 self._cleanup.insert(0, (callback, args, kwargs)) | |
886 | |
0 | 887 def startService(self): |
888 reactor.listenTCP(8080, self.site) | |
127 | 889 |
890 def stopService(self): | |
891 print "launching cleaning methods" | |
892 for callback, args, kwargs in self._cleanup: | |
893 callback(*args, **kwargs) | |
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
894 |
0 | 895 def run(self): |
896 reactor.run() | |
258
53c7f0237f1e
removed trailing spaces in libervia.tac
Goffi <goffi@goffi.org>
parents:
251
diff
changeset
|
897 |
0 | 898 def stop(self): |
899 reactor.stop() | |
900 | |
901 | |
44
2744dd31e8a5
server side: Session management refactoring
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
902 registerAdapter(SATSession, server.Session, ISATSession) |
0 | 903 application = service.Application('Libervia') |
904 service = Libervia() | |
905 service.setServiceParent(application) |