libervia-backend: src/plugins/plugin_xep

annotate src/plugins/plugin_xep_0065.py @ 585:9902ec2d8d9b

Remove useless trailing semicolons.

author	Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
date	Fri, 18 Jan 2013 17:53:08 +0100
parents	ca13633d3b6b
children	952322b1d490

rev	line source
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	1 #!/usr/bin/python
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	2 #-- coding: utf-8 --
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	3 """
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	4 SAT plugin for managing xep-0065
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	5
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	6 Copyright (C)
251 dbe1803eca7c minor copyright update, date format harmonisation Goffi <goffi@goffi.org> parents: 228 diff changeset	7 2002, 2003, 2004 Dave Smith (dizzyd@jabber.org)
dbe1803eca7c minor copyright update, date format harmonisation Goffi <goffi@goffi.org> parents: 228 diff changeset	8 2007, 2008 Fabio Forno (xmpp:ff@jabber.bluendo.com)
572 ca13633d3b6b dates update Goffi <goffi@goffi.org> parents: 538 diff changeset	9 2009, 2010, 2011, 2012, 2013 Jérôme Poisson (goffi@goffi.org)
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	10
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	11 This program is free software: you can redistribute it and/or modify
480 2a072735e459 Licence modification: the full project is now under AGPL v3+ instead of GPL v3+ Goffi <goffi@goffi.org> parents: 459 diff changeset	12 it under the terms of the GNU Affero General Public License as published by
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	13 the Free Software Foundation, either version 3 of the License, or
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	14 (at your option) any later version.
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	15
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	16 This program is distributed in the hope that it will be useful,
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	17 but WITHOUT ANY WARRANTY; without even the implied warranty of
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	18 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
480 2a072735e459 Licence modification: the full project is now under AGPL v3+ instead of GPL v3+ Goffi <goffi@goffi.org> parents: 459 diff changeset	19 GNU Affero General Public License for more details.
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	20
480 2a072735e459 Licence modification: the full project is now under AGPL v3+ instead of GPL v3+ Goffi <goffi@goffi.org> parents: 459 diff changeset	21 You should have received a copy of the GNU Affero General Public License
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	22 along with this program. If not, see <http://www.gnu.org/licenses/>.
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	23
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	24 --
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	25
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	26 This program is based on proxy65 (http://code.google.com/p/proxy65),
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	27 originaly written by David Smith and modified by Fabio Forno.
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	28 It is sublicensed under GPL v3 (or any later version) as allowed by the original
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	29 license.
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	30
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	31 --
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	32
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	33 Here is a copy of the original license:
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	34
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	35 Copyright (C)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	36 2002-2004 Dave Smith (dizzyd@jabber.org)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	37 2007-2008 Fabio Forno (xmpp:ff@jabber.bluendo.com)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	38
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	39 Permission is hereby granted, free of charge, to any person obtaining a copy
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	40 of this software and associated documentation files (the "Software"), to deal
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	41 in the Software without restriction, including without limitation the rights
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	42 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	43 copies of the Software, and to permit persons to whom the Software is
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	44 furnished to do so, subject to the following conditions:
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	45
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	46 The above copyright notice and this permission notice shall be included in
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	47 all copies or substantial portions of the Software.
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	48
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	49 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	50 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	51 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	52 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	53 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	54 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	55 THE SOFTWARE.
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	56 """
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	57
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	58 from logging import debug, info, warning, error
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	59 from twisted.internet import protocol, reactor
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	60 from twisted.internet import error as jab_error
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	61 from twisted.words.protocols.jabber import jid, client as jabber_client
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	62 from twisted.protocols.basic import FileSender
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	63 from twisted.words.xish import domish
20 fc8c202cda87 refactoring: using xml params part IV (default values) Goffi <goffi@goffi.org> parents: 19 diff changeset	64 from twisted.web.client import getPage
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	65 from sat.core.exceptions import ProfileNotInCacheError
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	66 import struct
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	67 import hashlib
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	68
15 218ec9984fa5 wokkel integration part III + memory saved again Goffi <goffi@goffi.org> parents: 9 diff changeset	69 from zope.interface import implements
218ec9984fa5 wokkel integration part III + memory saved again Goffi <goffi@goffi.org> parents: 9 diff changeset	70
218ec9984fa5 wokkel integration part III + memory saved again Goffi <goffi@goffi.org> parents: 9 diff changeset	71 try:
218ec9984fa5 wokkel integration part III + memory saved again Goffi <goffi@goffi.org> parents: 9 diff changeset	72 from twisted.words.protocols.xmlstream import XMPPHandler
218ec9984fa5 wokkel integration part III + memory saved again Goffi <goffi@goffi.org> parents: 9 diff changeset	73 except ImportError:
218ec9984fa5 wokkel integration part III + memory saved again Goffi <goffi@goffi.org> parents: 9 diff changeset	74 from wokkel.subprotocols import XMPPHandler
218ec9984fa5 wokkel integration part III + memory saved again Goffi <goffi@goffi.org> parents: 9 diff changeset	75
218ec9984fa5 wokkel integration part III + memory saved again Goffi <goffi@goffi.org> parents: 9 diff changeset	76 from wokkel import disco, iwokkel
218ec9984fa5 wokkel integration part III + memory saved again Goffi <goffi@goffi.org> parents: 9 diff changeset	77
218ec9984fa5 wokkel integration part III + memory saved again Goffi <goffi@goffi.org> parents: 9 diff changeset	78 IQ_SET = '/iq[@type="set"]'
218ec9984fa5 wokkel integration part III + memory saved again Goffi <goffi@goffi.org> parents: 9 diff changeset	79 NS_BS = 'http://jabber.org/protocol/bytestreams'
218ec9984fa5 wokkel integration part III + memory saved again Goffi <goffi@goffi.org> parents: 9 diff changeset	80 BS_REQUEST = IQ_SET + '/query[@xmlns="' + NS_BS + '"]'
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	81 TIMEOUT = 60 #timeout for workflow
15 218ec9984fa5 wokkel integration part III + memory saved again Goffi <goffi@goffi.org> parents: 9 diff changeset	82
218ec9984fa5 wokkel integration part III + memory saved again Goffi <goffi@goffi.org> parents: 9 diff changeset	83
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	84
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	85 PLUGIN_INFO = {
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	86 "name": "XEP 0065 Plugin",
291 7c79d4a8c9e6 plugins: fixed bad import names Goffi <goffi@goffi.org> parents: 251 diff changeset	87 "import_name": "XEP-0065",
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	88 "type": "XEP",
48 4392f1fdb064 plugins improvement Goffi <goffi@goffi.org> parents: 38 diff changeset	89 "protocols": ["XEP-0065"],
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	90 "main": "XEP_0065",
64 d46f849664aa SàT: multi-profile, plugins updated Goffi <goffi@goffi.org> parents: 60 diff changeset	91 "handler": "yes",
69 86f1f7f6d332 i18n first draft Goffi <goffi@goffi.org> parents: 64 diff changeset	92 "description": _("""Implementation of SOCKS5 Bytestreams""")
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	93 }
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	94
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	95 STATE_INITIAL = 0
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	96 STATE_AUTH = 1
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	97 STATE_REQUEST = 2
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	98 STATE_READY = 3
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	99 STATE_AUTH_USERPASS = 4
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	100 STATE_TARGET_INITIAL = 5
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	101 STATE_TARGET_AUTH = 6
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	102 STATE_TARGET_REQUEST = 7
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	103 STATE_TARGET_READY = 8
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	104 STATE_LAST = 9
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	105
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	106 STATE_CONNECT_PENDING = STATE_LAST + 1
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	107
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	108 SOCKS5_VER = 0x05
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	109
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	110 ADDR_IPV4 = 0x01
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	111 ADDR_DOMAINNAME = 0x03
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	112 ADDR_IPV6 = 0x04
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	113
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	114 CMD_CONNECT = 0x01
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	115 CMD_BIND = 0x02
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	116 CMD_UDPASSOC = 0x03
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	117
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	118 AUTHMECH_ANON = 0x00
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	119 AUTHMECH_USERPASS = 0x02
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	120 AUTHMECH_INVALID = 0xFF
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	121
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	122 REPLY_SUCCESS = 0x00
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	123 REPLY_GENERAL_FAILUR = 0x01
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	124 REPLY_CONN_NOT_ALLOWED = 0x02
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	125 REPLY_NETWORK_UNREACHABLE = 0x03
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	126 REPLY_HOST_UNREACHABLE = 0x04
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	127 REPLY_CONN_REFUSED = 0x05
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	128 REPLY_TTL_EXPIRED = 0x06
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	129 REPLY_CMD_NOT_SUPPORTED = 0x07
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	130 REPLY_ADDR_NOT_SUPPORTED = 0x08
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	131
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	132
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	133 def calculateHash(from_jid, to_jid, sid):
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	134 """Calculate SHA1 Hash according to XEP-0065
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	135 @param from_jid: jid of the requester
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	136 @param to_jid: jid of the target
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	137 @param sid: session id
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	138 @return: hash (string)"""
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	139 return hashlib.sha1((sid + from_jid.full() + to_jid.full()).encode('utf-8')).hexdigest()
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	140
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	141
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	142
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	143 class SOCKSv5(protocol.Protocol, FileSender):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	144 def __init__(self):
69 86f1f7f6d332 i18n first draft Goffi <goffi@goffi.org> parents: 64 diff changeset	145 debug(_("Protocol init"))
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	146 self.state = STATE_INITIAL
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	147 self.buf = ""
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	148 self.supportedAuthMechs = [ AUTHMECH_ANON ]
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	149 self.supportedAddrs = [ ADDR_DOMAINNAME ]
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	150 self.enabledCommands = [ CMD_CONNECT ]
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	151 self.peersock = None
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	152 self.addressType = 0
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	153 self.requestType = 0
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	154
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	155 def _startNegotiation(self):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	156 debug("_startNegotiation")
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	157 self.state = STATE_TARGET_AUTH
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	158 self.transport.write(struct.pack('!3B', SOCKS5_VER, 1, AUTHMECH_ANON))
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	159
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	160 def _parseNegotiation(self):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	161 debug("_parseNegotiation")
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	162 try:
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	163 # Parse out data
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	164 ver, nmethod = struct.unpack('!BB', self.buf[:2])
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	165 methods = struct.unpack('%dB' % nmethod, self.buf[2:nmethod+2])
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	166
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	167 # Ensure version is correct
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	168 if ver != 5:
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	169 self.transport.write(struct.pack('!BB', SOCKS5_VER, AUTHMECH_INVALID))
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	170 self.transport.loseConnection()
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	171 return
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	172
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	173 # Trim off front of the buffer
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	174 self.buf = self.buf[nmethod+2:]
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	175
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	176 # Check for supported auth mechs
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	177 for m in self.supportedAuthMechs:
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	178 if m in methods:
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	179 # Update internal state, according to selected method
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	180 if m == AUTHMECH_ANON:
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	181 self.state = STATE_REQUEST
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	182 elif m == AUTHMECH_USERPASS:
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	183 self.state = STATE_AUTH_USERPASS
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	184 # Complete negotiation w/ this method
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	185 self.transport.write(struct.pack('!BB', SOCKS5_VER, m))
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	186 return
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	187
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	188 # No supported mechs found, notify client and close the connection
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	189 self.transport.write(struct.pack('!BB', SOCKS5_VER, AUTHMECH_INVALID))
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	190 self.transport.loseConnection()
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	191 except struct.error:
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	192 pass
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	193
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	194 def _parseUserPass(self):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	195 debug("_parseUserPass")
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	196 try:
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	197 # Parse out data
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	198 ver, ulen = struct.unpack('BB', self.buf[:2])
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	199 uname, = struct.unpack('%ds' % ulen, self.buf[2:ulen + 2])
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	200 plen, = struct.unpack('B', self.buf[ulen + 2])
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	201 password, = struct.unpack('%ds' % plen, self.buf[ulen + 3:ulen + 3 + plen])
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	202 # Trim off fron of the buffer
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	203 self.buf = self.buf[3 + ulen + plen:]
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	204 # Fire event to authenticate user
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	205 if self.authenticateUserPass(uname, password):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	206 # Signal success
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	207 self.state = STATE_REQUEST
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	208 self.transport.write(struct.pack('!BB', SOCKS5_VER, 0x00))
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	209 else:
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	210 # Signal failure
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	211 self.transport.write(struct.pack('!BB', SOCKS5_VER, 0x01))
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	212 self.transport.loseConnection()
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	213 except struct.error:
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	214 pass
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	215
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	216 def sendErrorReply(self, errorcode):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	217 debug("sendErrorReply")
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	218 # Any other address types are not supported
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	219 result = struct.pack('!BBBBIH', SOCKS5_VER, errorcode, 0, 1, 0, 0)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	220 self.transport.write(result)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	221 self.transport.loseConnection()
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	222
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	223 def _parseRequest(self):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	224 debug("_parseRequest")
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	225 try:
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	226 # Parse out data and trim buffer accordingly
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	227 ver, cmd, rsvd, self.addressType = struct.unpack('!BBBB', self.buf[:4])
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	228
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	229 # Ensure we actually support the requested address type
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	230 if self.addressType not in self.supportedAddrs:
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	231 self.sendErrorReply(REPLY_ADDR_NOT_SUPPORTED)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	232 return
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	233
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	234 # Deal with addresses
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	235 if self.addressType == ADDR_IPV4:
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	236 addr, port = struct.unpack('!IH', self.buf[4:10])
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	237 self.buf = self.buf[10:]
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	238 elif self.addressType == ADDR_DOMAINNAME:
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	239 nlen = ord(self.buf[4])
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	240 addr, port = struct.unpack('!%dsH' % nlen, self.buf[5:])
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	241 self.buf = self.buf[7 + len(addr):]
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	242 else:
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	243 # Any other address types are not supported
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	244 self.sendErrorReply(REPLY_ADDR_NOT_SUPPORTED)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	245 return
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	246
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	247 # Ensure command is supported
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	248 if cmd not in self.enabledCommands:
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	249 # Send a not supported error
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	250 self.sendErrorReply(REPLY_CMD_NOT_SUPPORTED)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	251 return
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	252
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	253 # Process the command
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	254 if cmd == CMD_CONNECT:
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	255 self.connectRequested(addr, port)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	256 elif cmd == CMD_BIND:
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	257 self.bindRequested(addr, port)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	258 else:
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	259 # Any other command is not supported
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	260 self.sendErrorReply(REPLY_CMD_NOT_SUPPORTED)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	261
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	262 except struct.error, why:
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	263 return None
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	264
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	265 def _makeRequest(self):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	266 debug("_makeRequest")
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	267 self.state = STATE_TARGET_REQUEST
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	268 sha1 = calculateHash(self.data["from"], self.data["to"], self.sid)
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	269 request = struct.pack('!5B%dsH' % len(sha1), SOCKS5_VER, CMD_CONNECT, 0, ADDR_DOMAINNAME, len(sha1), sha1, 0)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	270 self.transport.write(request)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	271
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	272 def _parseRequestReply(self):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	273 debug("_parseRequestReply")
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	274 try:
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	275 ver, rep, rsvd, self.addressType = struct.unpack('!BBBB', self.buf[:4])
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	276 # Ensure we actually support the requested address type
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	277 if self.addressType not in self.supportedAddrs:
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	278 self.sendErrorReply(REPLY_ADDR_NOT_SUPPORTED)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	279 return
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	280
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	281 # Deal with addresses
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	282 if self.addressType == ADDR_IPV4:
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	283 addr, port = struct.unpack('!IH', self.buf[4:10])
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	284 self.buf = self.buf[10:]
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	285 elif self.addressType == ADDR_DOMAINNAME:
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	286 nlen = ord(self.buf[4])
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	287 addr, port = struct.unpack('!%dsH' % nlen, self.buf[5:])
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	288 self.buf = self.buf[7 + len(addr):]
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	289 else:
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	290 # Any other address types are not supported
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	291 self.sendErrorReply(REPLY_ADDR_NOT_SUPPORTED)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	292 return
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	293
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	294 # Ensure reply is OK
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	295 if rep != REPLY_SUCCESS:
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	296 self.loseConnection()
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	297 return
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	298
398 cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	299 if self.factory.proxy:
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	300 self.state = STATE_READY
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	301 self.factory.activateCb(self.sid, self.factory.iq_id, self.startTransfer, self.profile)
398 cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	302 else:
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	303 self.state = STATE_TARGET_READY
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	304 self.factory.activateCb(self.sid, self.factory.iq_id, self.profile)
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	305
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	306 except struct.error, why:
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	307 return None
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	308
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	309 def connectionMade(self):
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	310 debug("connectionMade (mode = %s)" % "requester" if isinstance(self.factory, Socks5ServerFactory) else "target")
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	311
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	312 if isinstance(self.factory, Socks5ClientFactory):
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	313 self.sid = self.factory.sid
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	314 self.profile = self.factory.profile
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	315 self.data = self.factory.data
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	316 self.state = STATE_TARGET_INITIAL
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	317 self._startNegotiation()
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	318
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	319 def connectRequested(self, addr, port):
69 86f1f7f6d332 i18n first draft Goffi <goffi@goffi.org> parents: 64 diff changeset	320 debug("connectRequested")
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	321
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	322 # Check that this session is expected
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	323 if not self.factory.hash_sid_map.has_key(addr):
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	324 #no: we refuse it
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	325 self.sendErrorReply(REPLY_CONN_REFUSED)
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	326 return
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	327 self.sid, self.profile = self.factory.hash_sid_map[addr]
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	328 client = self.factory.host.getClient(self.profile)
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	329 if not client:
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	330 raise ProfileNotInCacheError
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	331 client.xep_0065_current_stream[self.sid]["start_transfer_cb"] = self.startTransfer
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	332 self.connectCompleted(addr, 0)
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	333 self.transport.stopReading()
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	334
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	335 def startTransfer(self, file_obj):
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	336 """Callback called when the result iq is received"""
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	337 d = self.beginFileTransfer(file_obj, self.transport)
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	338 d.addCallback(self.fileTransfered)
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	339
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	340 def fileTransfered(self, d):
69 86f1f7f6d332 i18n first draft Goffi <goffi@goffi.org> parents: 64 diff changeset	341 info(_("File transfer completed, closing connection"))
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	342 self.transport.loseConnection()
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	343 self.factory.finishedCb(self.sid, True, self.profile)
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	344
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	345 def connectCompleted(self, remotehost, remoteport):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	346 debug("connectCompleted")
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	347 if self.addressType == ADDR_IPV4:
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	348 result = struct.pack('!BBBBIH', SOCKS5_VER, REPLY_SUCCESS, 0, 1, remotehost, remoteport)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	349 elif self.addressType == ADDR_DOMAINNAME:
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	350 result = struct.pack('!BBBBB%dsH' % len(remotehost), SOCKS5_VER, REPLY_SUCCESS, 0,
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	351 ADDR_DOMAINNAME, len(remotehost), remotehost, remoteport)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	352 self.transport.write(result)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	353 self.state = STATE_READY
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	354
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	355 def bindRequested(self, addr, port):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	356 pass
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	357
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	358 def authenticateUserPass(self, user, passwd):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	359 debug("User/pass: %s/%s", user, passwd)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	360 return True
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	361
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	362 def dataReceived(self, buf):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	363 if self.state == STATE_TARGET_READY:
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	364 self.data["file_obj"].write(buf)
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	365 return
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	366
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	367 self.buf = self.buf + buf
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	368 if self.state == STATE_INITIAL:
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	369 self._parseNegotiation()
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	370 if self.state == STATE_AUTH_USERPASS:
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	371 self._parseUserPass()
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	372 if self.state == STATE_REQUEST:
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	373 self._parseRequest()
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	374 if self.state == STATE_TARGET_AUTH:
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	375 ver, method = struct.unpack('!BB', buf)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	376 self.buf = self.buf[2:]
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	377 if ver!=SOCKS5_VER or method!=AUTHMECH_ANON:
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	378 self.transport.loseConnection()
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	379 else:
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	380 self._makeRequest()
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	381 if self.state == STATE_TARGET_REQUEST:
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	382 self._parseRequestReply()
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	383
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	384
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	385 def clientConnectionLost(self, reason):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	386 debug("clientConnectionLost")
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	387 self.transport.loseConnection()
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	388
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	389 def connectionLost(self, reason):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	390 debug("connectionLost")
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	391 if self.state != STATE_CONNECT_PENDING:
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	392 self.transport.unregisterProducer()
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	393 if self.peersock != None:
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	394 self.peersock.peersock = None
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	395 self.peersock.transport.unregisterProducer()
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	396 self.peersock = None
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	397
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	398
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	399 class Socks5ServerFactory(protocol.ServerFactory):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	400 protocol = SOCKSv5
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	401
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	402 def __init__(self, host, hash_sid_map, finishedCb):
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	403 self.host = host
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	404 self.hash_sid_map = hash_sid_map
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	405 self.finishedCb = finishedCb
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	406
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	407 def startedConnecting(self, connector):
69 86f1f7f6d332 i18n first draft Goffi <goffi@goffi.org> parents: 64 diff changeset	408 debug (_("Socks 5 server connection started"))
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	409
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	410 def clientConnectionLost(self, connector, reason):
69 86f1f7f6d332 i18n first draft Goffi <goffi@goffi.org> parents: 64 diff changeset	411 debug (_("Socks 5 server connection lost (reason: %s)"), reason)
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	412
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	413 class Socks5ClientFactory(protocol.ClientFactory):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	414 protocol = SOCKSv5
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	415
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	416 def __init__(self, current_stream, sid, iq_id, activateCb, finishedCb, proxy=False, profile=None):
398 cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	417 """Init the Client Factory
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	418 @param current_stream: current streams data
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	419 @param sid: Session ID
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	420 @param iq_id: iq id used to initiate the stream
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	421 @param activateCb: method to call to activate the stream
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	422 @param finishedCb: method to call when the stream session is finished
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	423 @param proxy: True if we are connecting throught a proxy (and we are a requester)
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	424 @param profile: %(doc_profile)s"""
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	425 assert(profile)
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	426 self.data = current_stream[sid]
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	427 self.sid = sid
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	428 self.iq_id = iq_id
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	429 self.activateCb = activateCb
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	430 self.finishedCb = finishedCb
398 cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	431 self.proxy = proxy
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	432 self.profile = profile
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	433
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	434 def startedConnecting(self, connector):
69 86f1f7f6d332 i18n first draft Goffi <goffi@goffi.org> parents: 64 diff changeset	435 debug (_("Socks 5 client connection started"))
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	436
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	437 def clientConnectionLost(self, connector, reason):
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	438 debug (_("Socks 5 client connection lost (reason: %s)"), reason)
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	439 self.finishedCb(self.sid, reason.type == jab_error.ConnectionDone, self.profile) #TODO: really check if the state is actually successful
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	440
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	441
64 d46f849664aa SàT: multi-profile, plugins updated Goffi <goffi@goffi.org> parents: 60 diff changeset	442 class XEP_0065():
15 218ec9984fa5 wokkel integration part III + memory saved again Goffi <goffi@goffi.org> parents: 9 diff changeset	443
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	444 NAMESPACE = NS_BS
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	445
19 f2a745ca0fbc refactoring: using xml params part III (parameters import) Goffi <goffi@goffi.org> parents: 15 diff changeset	446 params = """
f2a745ca0fbc refactoring: using xml params part III (parameters import) Goffi <goffi@goffi.org> parents: 15 diff changeset	447 <params>
60 9764e027ecc0 SàT: multi-profile parameters, first draft Goffi <goffi@goffi.org> parents: 57 diff changeset	448 <general>
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	449 <category name="File Transfer">
20 fc8c202cda87 refactoring: using xml params part IV (default values) Goffi <goffi@goffi.org> parents: 19 diff changeset	450 <param name="IP" value='0.0.0.0' default_cb='yes' type="string" />
19 f2a745ca0fbc refactoring: using xml params part III (parameters import) Goffi <goffi@goffi.org> parents: 15 diff changeset	451 <param name="Port" value="28915" type="string" />
f2a745ca0fbc refactoring: using xml params part III (parameters import) Goffi <goffi@goffi.org> parents: 15 diff changeset	452 </category>
60 9764e027ecc0 SàT: multi-profile parameters, first draft Goffi <goffi@goffi.org> parents: 57 diff changeset	453 </general>
398 cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	454 <individual>
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	455 <category name="File Transfer">
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	456 <param name="Proxy" value="" type="string" />
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	457 <param name="Proxy host" value="" type="string" />
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	458 <param name="Proxy port" value="" type="string" />
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	459 </category>
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	460 </individual>
19 f2a745ca0fbc refactoring: using xml params part III (parameters import) Goffi <goffi@goffi.org> parents: 15 diff changeset	461 </params>
f2a745ca0fbc refactoring: using xml params part III (parameters import) Goffi <goffi@goffi.org> parents: 15 diff changeset	462 """
20 fc8c202cda87 refactoring: using xml params part IV (default values) Goffi <goffi@goffi.org> parents: 19 diff changeset	463
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	464 def __init__(self, host):
69 86f1f7f6d332 i18n first draft Goffi <goffi@goffi.org> parents: 64 diff changeset	465 info(_("Plugin XEP_0065 initialization"))
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	466
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	467 #session data
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	468 self.hash_sid_map = {} #key: hash of the transfer session, value: (session id, profile)
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	469
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	470 self.host = host
69 86f1f7f6d332 i18n first draft Goffi <goffi@goffi.org> parents: 64 diff changeset	471 debug(_("registering"))
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	472 self.server_factory = Socks5ServerFactory(host, self.hash_sid_map, lambda sid, success, profile: self._killId(sid, success, profile=profile))
21 633c5ed65701 parameters: new button type (not finished) Goffi <goffi@goffi.org> parents: 20 diff changeset	473
633c5ed65701 parameters: new button type (not finished) Goffi <goffi@goffi.org> parents: 20 diff changeset	474 #parameters
38 3e24753b9e0b Fixed parameters loading/saving Goffi <goffi@goffi.org> parents: 22 diff changeset	475 host.memory.importParams(XEP_0065.params)
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	476 host.memory.setDefault("IP", "File Transfer", self.getExternalIP)
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	477 port = int(self.host.memory.getParamA("Port", "File Transfer"))
21 633c5ed65701 parameters: new button type (not finished) Goffi <goffi@goffi.org> parents: 20 diff changeset	478
69 86f1f7f6d332 i18n first draft Goffi <goffi@goffi.org> parents: 64 diff changeset	479 info(_("Launching Socks5 Stream server on port %d"), port)
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	480 reactor.listenTCP(port, self.server_factory)
15 218ec9984fa5 wokkel integration part III + memory saved again Goffi <goffi@goffi.org> parents: 9 diff changeset	481
72 f271fff3a713 MUC implementation: first draft Goffi <goffi@goffi.org> parents: 69 diff changeset	482 def getHandler(self, profile):
64 d46f849664aa SàT: multi-profile, plugins updated Goffi <goffi@goffi.org> parents: 60 diff changeset	483 return XEP_0065_handler(self)
d46f849664aa SàT: multi-profile, plugins updated Goffi <goffi@goffi.org> parents: 60 diff changeset	484
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	485 def profileConnected(self, profile):
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	486 client = self.host.getClient(profile)
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	487 if not client:
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	488 raise ProfileNotInCacheError
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	489 client.xep_0065_current_stream = {} #key: stream_id, value: data(dict)
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	490
20 fc8c202cda87 refactoring: using xml params part IV (default values) Goffi <goffi@goffi.org> parents: 19 diff changeset	491 def getExternalIP(self):
fc8c202cda87 refactoring: using xml params part IV (default values) Goffi <goffi@goffi.org> parents: 19 diff changeset	492 """Return IP visible from outside, by asking to a website"""
fc8c202cda87 refactoring: using xml params part IV (default values) Goffi <goffi@goffi.org> parents: 19 diff changeset	493 return getPage("http://www.goffi.org/sat_tools/get_ip.php")
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	494
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	495 def getProgress(self, sid, data, profile):
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	496 """Fill data with position of current transfer"""
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	497 client = self.host.getClient(profile)
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	498 if not client:
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	499 raise ProfileNotInCacheError
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	500 try:
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	501 file_obj = client.xep_0065_current_stream[sid]["file_obj"]
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	502 data["position"] = str(file_obj.tell())
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	503 data["size"] = str(client.xep_0065_current_stream[sid]["size"])
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	504 except:
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	505 pass
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	506
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	507 def _timeOut(self, sid, profile):
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	508 """Delecte current_stream id, called after timeout
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	509 @param id: id of client.xep_0065_current_stream"""
585 9902ec2d8d9b Remove useless trailing semicolons. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 572 diff changeset	510 info(_("Socks5 Bytestream: TimeOut reached for id %s [%s]") % (sid, profile))
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	511 self._killId(sid, False, "TIMEOUT", profile)
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	512
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	513 def _killId(self, sid, success=False, failure_reason="UNKNOWN", profile=None):
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	514 """Delete an current_stream id, clean up associated observers
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	515 @param sid: id of client.xep_0065_current_stream"""
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	516 assert(profile)
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	517 client = self.host.getClient(profile)
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	518 if not client:
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	519 warning(_("Client no more in cache"))
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	520 return
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	521 if not client.xep_0065_current_stream.has_key(sid):
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	522 warning(_("kill id called on a non existant id"))
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	523 return
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	524 if client.xep_0065_current_stream[sid].has_key("observer_cb"):
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	525 xmlstream = client.xep_0065_current_stream[sid]["xmlstream"]
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	526 xmlstream.removeObserver(client.xep_0065_current_stream[sid]["event_data"], client.xep_0065_current_stream[sid]["observer_cb"])
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	527 if client.xep_0065_current_stream[sid]['timer'].active():
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	528 client.xep_0065_current_stream[sid]['timer'].cancel()
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	529 if client.xep_0065_current_stream[sid].has_key("size"):
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	530 self.host.removeProgressCB(sid, profile)
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	531
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	532 file_obj = client.xep_0065_current_stream[sid]['file_obj']
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	533 success_cb = client.xep_0065_current_stream[sid]['success_cb']
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	534 failure_cb = client.xep_0065_current_stream[sid]['failure_cb']
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	535
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	536 session_hash = client.xep_0065_current_stream[sid].get('hash')
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	537 del client.xep_0065_current_stream[sid]
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	538 if session_hash in self.hash_sid_map:
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	539 #FIXME: check that self.hash_sid_map is correctly cleaned in all cases (timeout, normal flow, etc).
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	540 del self.hash_sid_map[session_hash]
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	541
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	542 if success:
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	543 success_cb(sid, file_obj, NS_BS, profile)
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	544 else:
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	545 failure_cb(sid, file_obj, NS_BS, failure_reason, profile)
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	546
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	547 def startStream(self, file_obj, to_jid, sid, length, successCb, failureCb, size = None, profile=None):
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	548 """Launch the stream workflow
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	549 @param file_obj: file_obj to send
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	550 @param to_jid: JID of the recipient
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	551 @param sid: Stream session id
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	552 @param length: number of byte to send, or None to send until the end
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	553 @param successCb: method to call when stream successfuly finished
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	554 @param failureCb: method to call when something goes wrong
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	555 @param profile: %(doc_profile)s"""
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	556 assert(profile)
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	557 client = self.host.getClient(profile)
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	558 if not client:
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	559 error(_("Unknown profile, this should not happen"))
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	560 raise ProfileNotInCacheError
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	561
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	562 if length != None:
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	563 error(_('stream length not managed yet'))
585 9902ec2d8d9b Remove useless trailing semicolons. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 572 diff changeset	564 return
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	565
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	566 profile_jid = client.jid
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	567 xmlstream = client.xmlstream
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	568
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	569 data = client.xep_0065_current_stream[sid] = {}
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	570 data["timer"] = reactor.callLater(TIMEOUT, self._timeOut, sid, profile)
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	571 data["file_obj"] = file_obj
398 cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	572 data["from"] = profile_jid
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	573 data["to"] = to_jid
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	574 data["success_cb"] = successCb
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	575 data["failure_cb"] = failureCb
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	576 data["xmlstream"] = xmlstream
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	577 data["hash"] = calculateHash(profile_jid, to_jid, sid)
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	578 self.hash_sid_map[data["hash"]] = (sid, profile)
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	579 if size:
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	580 data["size"] = size
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	581 self.host.registerProgressCB(sid, self.getProgress, profile)
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	582 iq_elt = jabber_client.IQ(xmlstream,'set')
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	583 iq_elt["from"] = profile_jid.full()
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	584 iq_elt["to"] = to_jid.full()
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	585 query_elt = iq_elt.addElement('query', NS_BS)
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	586 query_elt['mode'] = 'tcp'
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	587 query_elt['sid'] = sid
398 cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	588 #first streamhost: direct connection
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	589 streamhost = query_elt.addElement('streamhost')
398 cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	590 streamhost['host'] = self.host.memory.getParamA("IP", "File Transfer")
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	591 streamhost['port'] = self.host.memory.getParamA("Port", "File Transfer")
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	592 streamhost['jid'] = profile_jid.full()
398 cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	593
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	594 #second streamhost: mediated connection, using proxy
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	595 streamhost = query_elt.addElement('streamhost')
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	596 streamhost['host'] = self.host.memory.getParamA("Proxy host", "File Transfer", profile_key=profile)
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	597 streamhost['port'] = self.host.memory.getParamA("Proxy port", "File Transfer", profile_key=profile)
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	598 streamhost['jid'] = self.host.memory.getParamA("Proxy", "File Transfer", profile_key=profile)
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	599
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	600 iq_elt.addCallback(self.iqResult, sid, profile)
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	601 iq_elt.send()
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	602
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	603 def iqResult(self, sid, profile, iq_elt):
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	604 """Called when the result of open iq is received"""
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	605 if iq_elt["type"] == "error":
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	606 warning(_("Transfer failed"))
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	607 return
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	608 client = self.host.getClient(profile)
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	609 if not client:
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	610 raise ProfileNotInCacheError
398 cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	611 try:
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	612 data = client.xep_0065_current_stream[sid]
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	613 file_obj = data["file_obj"]
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	614 timer = data["timer"]
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	615 except KeyError:
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	616 error(_("Internal error, can't do transfer"))
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	617 return
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	618
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	619 if timer.active():
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	620 timer.cancel()
398 cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	621
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	622 profile_jid, xmlstream = self.host.getJidNStream(profile)
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	623 query_elt = iq_elt.firstChildElement()
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	624 streamhost_elts = filter(lambda elt: elt.name == 'streamhost-used', query_elt.elements())
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	625 if not streamhost_elts:
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	626 warning(_("No streamhost found in stream query"))
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	627 return
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	628
398 cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	629 streamhost_jid = streamhost_elts[0]['jid']
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	630 if streamhost_jid != profile_jid.full():
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	631 debug(_("A proxy server is used"))
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	632 proxy_host = self.host.memory.getParamA("Proxy host", "File Transfer", profile_key=profile)
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	633 proxy_port = self.host.memory.getParamA("Proxy port", "File Transfer", profile_key=profile)
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	634 proxy_jid = self.host.memory.getParamA("Proxy", "File Transfer", profile_key=profile)
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	635 if proxy_jid != streamhost_jid:
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	636 warning(_("Proxy jid is not the same as in parameters, this should not happen"))
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	637 return
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	638 factory = Socks5ClientFactory(client.xep_0065_current_stream, sid, None, self.activateProxyStream, lambda sid, success, profile: self._killId(sid, success, profile=profile), True, profile)
398 cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	639 reactor.connectTCP(proxy_host, int(proxy_port), factory)
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	640 else:
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	641 data["start_transfer_cb"](file_obj) #We now activate the stream
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	642
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	643 def activateProxyStream(self, sid, iq_id, start_transfer_cb, profile):
398 cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	644 debug(_("activating stream"))
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	645 client = self.host.getClient(profile)
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	646 if not client:
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	647 raise ProfileNotInCacheError
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	648 data = client.xep_0065_current_stream[sid]
398 cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	649 profile_jid, xmlstream = self.host.getJidNStream(profile)
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	650
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	651 iq_elt = client.IQ(xmlstream,'set')
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	652 iq_elt["from"] = profile_jid.full()
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	653 iq_elt["to"] = self.host.memory.getParamA("Proxy", "File Transfer", profile_key=profile)
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	654 query_elt = iq_elt.addElement('query', NS_BS)
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	655 query_elt['sid'] = sid
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	656 query_elt.addElement('activate', content=data['to'].full())
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	657 iq_elt.addCallback(self.proxyResult, sid, start_transfer_cb, data['file_obj'])
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	658 iq_elt.send()
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	659
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	660 def proxyResult(self, sid, start_transfer_cb, file_obj, iq_elt):
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	661 if iq_elt['type'] == 'error':
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	662 warning(_("Can't activate the proxy stream"))
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	663 return
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	664 else:
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	665 start_transfer_cb(file_obj)
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	666
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	667 def prepareToReceive(self, from_jid, sid, file_obj, size, success_cb, failure_cb, profile):
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	668 """Called when a bytestream is imminent
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	669 @param from_jid: jid of the sender
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	670 @param sid: Stream id
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	671 @param file_obj: File object where data will be written
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	672 @param size: full size of the data, or None if unknown
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	673 @param success_cb: method to call when successfuly finished
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	674 @param failure_cb: method to call when something goes wrong
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	675 @param profile: %(doc_profile)s"""
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	676 client = self.host.getClient(profile)
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	677 if not client:
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	678 raise ProfileNotInCacheError
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	679 data = client.xep_0065_current_stream[sid] = {}
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	680 data["from"] = from_jid
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	681 data["file_obj"] = file_obj
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	682 data["seq"] = -1
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	683 if size:
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	684 data["size"] = size
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	685 self.host.registerProgressCB(sid, self.getProgress, profile)
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	686 data["timer"] = reactor.callLater(TIMEOUT, self._timeOut, sid, profile)
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	687 data["success_cb"] = success_cb
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	688 data["failure_cb"] = failure_cb
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	689
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	690
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	691 def streamQuery(self, iq_elt, profile):
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	692 """Get file using byte stream"""
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	693 debug(_("BS stream query"))
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	694 client = self.host.getClient(profile)
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	695
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	696 if not client:
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	697 raise ProfileNotInCacheError
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	698
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	699 xmlstream = client.xmlstream
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	700
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	701 iq_elt.handled = True
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	702 query_elt = iq_elt.firstChildElement()
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	703 sid = query_elt.getAttribute("sid")
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	704 streamhost_elts = filter(lambda elt: elt.name == 'streamhost', query_elt.elements())
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	705
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	706 if not sid in client.xep_0065_current_stream:
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	707 warning(_("Ignoring unexpected BS transfer: %s" % sid))
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	708 self.sendNotAcceptableError(iq_elt['id'], iq_elt['from'], xmlstream)
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	709 return
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	710
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	711 client.xep_0065_current_stream[sid]['timer'].cancel()
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	712 client.xep_0065_current_stream[sid]["to"] = jid.JID(iq_elt["to"])
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	713 client.xep_0065_current_stream[sid]["xmlstream"] = xmlstream
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	714
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	715 if not streamhost_elts:
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	716 warning(_("No streamhost found in stream query %s" % sid))
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	717 self.sendBadRequestError(iq_elt['id'], iq_elt['from'], xmlstream)
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	718 return
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	719
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	720 streamhost_elt = streamhost_elts[0] #TODO: manage several streamhost elements case
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	721 sh_host = streamhost_elt.getAttribute("host")
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	722 sh_port = streamhost_elt.getAttribute("port")
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	723 sh_jid = streamhost_elt.getAttribute("jid")
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	724 if not sh_host or not sh_port or not sh_jid:
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	725 warning(_("incomplete streamhost element"))
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	726 self.sendBadRequestError(iq_elt['id'], iq_elt['from'], xmlstream)
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	727 return
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	728
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	729 client.xep_0065_current_stream[sid]["streamhost"] = (sh_host, sh_port, sh_jid)
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	730
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	731 info (_("Stream proposed: host=[%(host)s] port=[%(port)s]") % {'host':sh_host, 'port':sh_port})
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	732 factory = Socks5ClientFactory(client.xep_0065_current_stream, sid, iq_elt["id"], self.activateStream, lambda sid, success, profile: self._killId(sid, success, profile=profile), profile=profile)
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	733 reactor.connectTCP(sh_host, int(sh_port), factory)
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	734
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	735 def activateStream(self, sid, iq_id, profile):
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	736 client = self.host.getClient(profile)
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	737 if not client:
2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	738 raise ProfileNotInCacheError
69 86f1f7f6d332 i18n first draft Goffi <goffi@goffi.org> parents: 64 diff changeset	739 debug(_("activating stream"))
536 a31abb97310d core, plugins: fixed bad namespace in stanza creation Goffi <goffi@goffi.org> parents: 480 diff changeset	740 result = domish.Element((None, 'iq'))
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	741 data = client.xep_0065_current_stream[sid]
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	742 result['type'] = 'result'
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	743 result['id'] = iq_id
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	744 result['from'] = data["to"].full()
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	745 result['to'] = data["from"].full()
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	746 query = result.addElement('query', NS_BS)
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	747 query['sid'] = sid
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	748 streamhost = query.addElement('streamhost-used')
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	749 streamhost['jid'] = data["streamhost"][2]
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	750 data["xmlstream"].send(result)
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	751
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	752 def sendNotAcceptableError(self, iq_id, to_jid, xmlstream):
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	753 """Not acceptable error used when the stream is not expected or something is going wrong
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	754 @param iq_id: IQ id
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	755 @param to_jid: addressee
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	756 @param xmlstream: XML stream to use to send the error"""
536 a31abb97310d core, plugins: fixed bad namespace in stanza creation Goffi <goffi@goffi.org> parents: 480 diff changeset	757 result = domish.Element((None, 'iq'))
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	758 result['type'] = 'result'
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	759 result['id'] = iq_id
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	760 result['to'] = to_jid
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	761 error_el = result.addElement('error')
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	762 error_el['type'] = 'modify'
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	763 error_el.addElement(('urn:ietf:params:xml:ns:xmpp-stanzas','not-acceptable'))
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	764 xmlstream.send(result)
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	765
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	766 def sendBadRequestError(self, iq_id, to_jid, xmlstream):
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	767 """Not acceptable error used when the stream is not expected or something is going wrong
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	768 @param iq_id: IQ id
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	769 @param to_jid: addressee
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	770 @param xmlstream: XML stream to use to send the error"""
536 a31abb97310d core, plugins: fixed bad namespace in stanza creation Goffi <goffi@goffi.org> parents: 480 diff changeset	771 result = domish.Element((None, 'iq'))
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	772 result['type'] = 'result'
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	773 result['id'] = iq_id
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	774 result['to'] = to_jid
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	775 error_el = result.addElement('error')
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	776 error_el['type'] = 'cancel'
8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	777 error_el.addElement(('urn:ietf:params:xml:ns:xmpp-stanzas','bad-request'))
64 d46f849664aa SàT: multi-profile, plugins updated Goffi <goffi@goffi.org> parents: 60 diff changeset	778 xmlstream.send(result)
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	779
64 d46f849664aa SàT: multi-profile, plugins updated Goffi <goffi@goffi.org> parents: 60 diff changeset	780 class XEP_0065_handler(XMPPHandler):
d46f849664aa SàT: multi-profile, plugins updated Goffi <goffi@goffi.org> parents: 60 diff changeset	781 implements(iwokkel.IDisco)
d46f849664aa SàT: multi-profile, plugins updated Goffi <goffi@goffi.org> parents: 60 diff changeset	782
d46f849664aa SàT: multi-profile, plugins updated Goffi <goffi@goffi.org> parents: 60 diff changeset	783 def __init__(self, plugin_parent):
d46f849664aa SàT: multi-profile, plugins updated Goffi <goffi@goffi.org> parents: 60 diff changeset	784 self.plugin_parent = plugin_parent
d46f849664aa SàT: multi-profile, plugins updated Goffi <goffi@goffi.org> parents: 60 diff changeset	785 self.host = plugin_parent.host
398 cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	786
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	787 def _proxyDataResult(self, iq_elt):
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	788 """Called with the informations about proxy according to XEP-0065 #4
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	789 Params should be filled with these infos"""
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	790 if iq_elt["type"] == "error":
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	791 warning(_("Can't determine proxy informations"))
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	792 return
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	793 query_elt = iq_elt.firstChildElement()
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	794 if query_elt.name != "query":
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	795 warning(_("Bad answer received from proxy"))
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	796 return
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	797 streamhost_elts = filter(lambda elt: elt.name == 'streamhost', query_elt.elements())
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	798 if not streamhost_elts:
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	799 warning(_("No streamhost found in stream query"))
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	800 return
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	801 if len(streamhost_elts) != 1:
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	802 warning(_("Multiple streamhost elements in proxy not managed, keeping only the first one"))
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	803 streamhost_elt = streamhost_elts[0]
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	804 proxy = self.host.memory.setParam("Proxy", streamhost_elt.getAttribute("jid",""), "File Transfer", self.parent.profile)
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	805 proxy = self.host.memory.setParam("Proxy host", streamhost_elt.getAttribute("host",""), "File Transfer", self.parent.profile)
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	806 proxy = self.host.memory.setParam("Proxy port", streamhost_elt.getAttribute("port",""), "File Transfer", self.parent.profile)
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	807
64 d46f849664aa SàT: multi-profile, plugins updated Goffi <goffi@goffi.org> parents: 60 diff changeset	808
d46f849664aa SàT: multi-profile, plugins updated Goffi <goffi@goffi.org> parents: 60 diff changeset	809 def connectionInitialized(self):
398 cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	810 def after_init(ignore):
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	811 proxy_ent = self.host.memory.getServerServiceEntity("proxy", "bytestreams", self.parent.profile)
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	812 if not proxy_ent:
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	813 debug(_("No proxy found on this server"))
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	814 return
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 536 diff changeset	815 iq_elt = jabber_client.IQ(self.parent.xmlstream,'get')
398 cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	816 iq_elt["to"] = proxy_ent.full()
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	817 query_elt = iq_elt.addElement('query', NS_BS)
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	818 iq_elt.addCallback(self._proxyDataResult)
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	819 iq_elt.send()
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	820
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	821
394 8f3551ceee17 plugin XEP-0065: refactored and misc stuff fixed. Still not finished Goffi <goffi@goffi.org> parents: 291 diff changeset	822 self.xmlstream.addObserver(BS_REQUEST, self.plugin_parent.streamQuery, profile = self.parent.profile)
398 cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	823 proxy = self.host.memory.getParamA("Proxy", "File Transfer", profile_key = self.parent.profile)
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	824 if not proxy:
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	825 self.parent.client_initialized.addCallback(after_init)
cb0285372818 File transfer: Goffi <goffi@goffi.org> parents: 394 diff changeset	826
64 d46f849664aa SàT: multi-profile, plugins updated Goffi <goffi@goffi.org> parents: 60 diff changeset	827
d46f849664aa SàT: multi-profile, plugins updated Goffi <goffi@goffi.org> parents: 60 diff changeset	828
d46f849664aa SàT: multi-profile, plugins updated Goffi <goffi@goffi.org> parents: 60 diff changeset	829 def getDiscoInfo(self, requestor, target, nodeIdentifier=''):
d46f849664aa SàT: multi-profile, plugins updated Goffi <goffi@goffi.org> parents: 60 diff changeset	830 return [disco.DiscoFeature(NS_BS)]
d46f849664aa SàT: multi-profile, plugins updated Goffi <goffi@goffi.org> parents: 60 diff changeset	831
d46f849664aa SàT: multi-profile, plugins updated Goffi <goffi@goffi.org> parents: 60 diff changeset	832 def getDiscoItems(self, requestor, target, nodeIdentifier=''):
d46f849664aa SàT: multi-profile, plugins updated Goffi <goffi@goffi.org> parents: 60 diff changeset	833 return []

Mercurial > libervia-backend

annotate src/plugins/plugin_xep_0065.py @ 585:9902ec2d8d9b