refactor normal and zeroconf Connection objects with a CommonConnection class
This commit is contained in:
Yann Leboulanger
parent
960e402cf0
commit
88f3104c4e
File diff suppressed because it is too large
Load Diff
|
|
@ -92,6 +92,7 @@ RECV_BUFSIZE = 32768 # 2x maximum size of ssl packet, should be plenty
|
|||
|
||||
DATA_RECEIVED = 'DATA RECEIVED'
|
||||
DATA_SENT = 'DATA SENT'
|
||||
DATA_ERROR = 'DATA ERROR'
|
||||
|
||||
DISCONNECTED = 'DISCONNECTED'
|
||||
DISCONNECTING = 'DISCONNECTING'
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ from common.xmpp.idlequeue import IdleObject
|
|||
from common.xmpp import dispatcher_nb, simplexml
|
||||
from common.xmpp.plugin import *
|
||||
from common.xmpp.simplexml import ustr
|
||||
from common.xmpp.transports_nb import DATA_RECEIVED, DATA_SENT
|
||||
from common.xmpp.transports_nb import DATA_RECEIVED, DATA_SENT, DATA_ERROR
|
||||
from common.zeroconf import zeroconf
|
||||
|
||||
from common.xmpp.protocol import *
|
||||
|
|
@ -395,6 +395,7 @@ class P2PConnection(IdleObject, PlugIn):
|
|||
False, else send it instantly.
|
||||
If supplied data is unicode string, encode it to utf-8.
|
||||
'''
|
||||
print 'ici'
|
||||
if self.state <= 0:
|
||||
return
|
||||
|
||||
|
|
@ -416,8 +417,11 @@ class P2PConnection(IdleObject, PlugIn):
|
|||
ids = self.client.conn_holder.ids_of_awaiting_messages
|
||||
if self.fd in ids and len(ids[self.fd]) > 0:
|
||||
for (id_, thread_id) in ids[self.fd]:
|
||||
if hasattr(self._owner, 'Dispatcher'):
|
||||
self._owner.Dispatcher.Event('', DATA_ERROR, (self.client.to,
|
||||
thread_id))
|
||||
else:
|
||||
self._owner.on_not_ok('conenction timeout')
|
||||
ids[self.fd] = []
|
||||
self.pollend()
|
||||
|
||||
|
|
@ -578,6 +582,8 @@ class ClientZeroconf:
|
|||
self.hash_to_port = {}
|
||||
self.listener = None
|
||||
self.ids_of_awaiting_messages = {}
|
||||
self.disconnect_handlers = []
|
||||
self.disconnecting = False
|
||||
|
||||
def connect(self, show, msg):
|
||||
self.port = self.start_listener(self.caller.port)
|
||||
|
|
@ -632,6 +638,9 @@ class ClientZeroconf:
|
|||
self.last_msg = msg
|
||||
|
||||
def disconnect(self):
|
||||
# to avoid recursive calls
|
||||
if self.disconnecting:
|
||||
return
|
||||
if self.listener:
|
||||
self.listener.disconnect()
|
||||
self.listener = None
|
||||
|
|
@ -642,6 +651,14 @@ class ClientZeroconf:
|
|||
self.roster.zeroconf = None
|
||||
self.roster._data = None
|
||||
self.roster = None
|
||||
self.disconnecting = True
|
||||
for i in reversed(self.disconnect_handlers):
|
||||
log.debug('Calling disconnect handler %s' % i)
|
||||
i()
|
||||
self.disconnecting = False
|
||||
|
||||
def start_disconnect(self):
|
||||
self.disconnect()
|
||||
|
||||
def kill_all_connections(self):
|
||||
for connection in self.connections.values():
|
||||
|
|
@ -720,6 +737,14 @@ class ClientZeroconf:
|
|||
P2PClient(None, item['address'], item['port'], self,
|
||||
[(stanza, is_message)], to, on_ok=on_ok, on_not_ok=on_not_ok)
|
||||
|
||||
def RegisterDisconnectHandler(self, handler):
|
||||
''' Register handler that will be called on disconnect.'''
|
||||
self.disconnect_handlers.append(handler)
|
||||
|
||||
def UnregisterDisconnectHandler(self, handler):
|
||||
''' Unregister handler that is called on disconnect.'''
|
||||
self.disconnect_handlers.remove(handler)
|
||||
|
||||
def SendAndWaitForResponse(self, stanza, timeout=None, func=None, args=None):
|
||||
'''
|
||||
Send stanza and wait for recipient's response to it. Will call transports
|
||||
|
|
|
|||
|
|
@ -57,10 +57,10 @@ from session import ChatControlSession
|
|||
|
||||
class ConnectionVcard(connection_handlers.ConnectionVcard):
|
||||
def add_sha(self, p, send_caps = True):
|
||||
pass
|
||||
return p
|
||||
|
||||
def add_caps(self, p):
|
||||
pass
|
||||
return p
|
||||
|
||||
def request_vcard(self, jid = None, is_fake_jid = False):
|
||||
pass
|
||||
|
|
|
|||
|
|
@ -43,64 +43,29 @@ if os.name != 'nt':
|
|||
import getpass
|
||||
import gobject
|
||||
|
||||
from common.connection import CommonConnection
|
||||
from common import gajim
|
||||
from common import GnuPG
|
||||
from common.zeroconf import client_zeroconf
|
||||
from common.zeroconf import zeroconf
|
||||
from connection_handlers_zeroconf import *
|
||||
|
||||
class ConnectionZeroconf(ConnectionHandlersZeroconf):
|
||||
class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf):
|
||||
'''Connection class'''
|
||||
def __init__(self, name):
|
||||
CommonConnection.__init__(self, name)
|
||||
ConnectionHandlersZeroconf.__init__(self)
|
||||
# system username
|
||||
self.username = None
|
||||
self.name = name
|
||||
self.server_resource = '' # zeroconf has no resource, fake an empty one
|
||||
self.connected = 0 # offline
|
||||
self.connection = None
|
||||
self.gpg = None
|
||||
self.USE_GPG = False
|
||||
if gajim.HAVE_GPG:
|
||||
self.USE_GPG = True
|
||||
self.gpg = GnuPG.GnuPG(gajim.config.get('use_gpg_agent'))
|
||||
self.is_zeroconf = True
|
||||
self.privacy_rules_supported = False
|
||||
self.blocked_list = []
|
||||
self.blocked_contacts = []
|
||||
self.blocked_groups = []
|
||||
self.blocked_all = False
|
||||
self.status = ''
|
||||
self.old_show = ''
|
||||
self.priority = 0
|
||||
|
||||
self.call_resolve_timeout = False
|
||||
|
||||
self.time_to_reconnect = None
|
||||
#self.new_account_info = None
|
||||
self.bookmarks = []
|
||||
|
||||
# we don't need a password, but must be non-empty
|
||||
self.password = 'zeroconf'
|
||||
|
||||
self.autoconnect = False
|
||||
self.sync_with_global_status = True
|
||||
self.no_log_for = False
|
||||
|
||||
self.pep_supported = False
|
||||
self.pep = {}
|
||||
# Do we continue connection when we get roster (send presence,get vcard...)
|
||||
self.continue_connect_info = None
|
||||
if gajim.HAVE_GPG:
|
||||
self.USE_GPG = True
|
||||
self.gpg = GnuPG.GnuPG(gajim.config.get('use_gpg_agent'))
|
||||
|
||||
self.get_config_values_or_default()
|
||||
|
||||
self.muc_jid = {} # jid of muc server for each transport type
|
||||
self.vcard_supported = False
|
||||
self.private_storage_supported = False
|
||||
|
||||
def get_config_values_or_default(self):
|
||||
''' get name, host, port from config, or
|
||||
create zeroconf account with default values'''
|
||||
|
|
@ -108,79 +73,61 @@ class ConnectionZeroconf(ConnectionHandlersZeroconf):
|
|||
if not gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, 'name'):
|
||||
gajim.log.debug('Creating zeroconf account')
|
||||
gajim.config.add_per('accounts', gajim.ZEROCONF_ACC_NAME)
|
||||
gajim.config.set_per('accounts', gajim.ZEROCONF_ACC_NAME, 'autoconnect', True)
|
||||
gajim.config.set_per('accounts', gajim.ZEROCONF_ACC_NAME, 'no_log_for', '')
|
||||
gajim.config.set_per('accounts', gajim.ZEROCONF_ACC_NAME, 'password', 'zeroconf')
|
||||
gajim.config.set_per('accounts', gajim.ZEROCONF_ACC_NAME, 'sync_with_global_status', True)
|
||||
gajim.config.set_per('accounts', gajim.ZEROCONF_ACC_NAME,
|
||||
'autoconnect', True)
|
||||
gajim.config.set_per('accounts', gajim.ZEROCONF_ACC_NAME, 'no_log_for',
|
||||
'')
|
||||
gajim.config.set_per('accounts', gajim.ZEROCONF_ACC_NAME, 'password',
|
||||
'zeroconf')
|
||||
gajim.config.set_per('accounts', gajim.ZEROCONF_ACC_NAME,
|
||||
'sync_with_global_status', True)
|
||||
|
||||
gajim.config.set_per('accounts', gajim.ZEROCONF_ACC_NAME, 'custom_port', 5298)
|
||||
gajim.config.set_per('accounts', gajim.ZEROCONF_ACC_NAME, 'is_zeroconf', True)
|
||||
gajim.config.set_per('accounts', gajim.ZEROCONF_ACC_NAME,
|
||||
'custom_port', 5298)
|
||||
gajim.config.set_per('accounts', gajim.ZEROCONF_ACC_NAME,
|
||||
'is_zeroconf', True)
|
||||
#XXX make sure host is US-ASCII
|
||||
self.host = unicode(socket.gethostname())
|
||||
gajim.config.set_per('accounts', gajim.ZEROCONF_ACC_NAME, 'hostname', self.host)
|
||||
self.port = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, 'custom_port')
|
||||
self.autoconnect = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, 'autoconnect')
|
||||
self.sync_with_global_status = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, 'sync_with_global_status')
|
||||
self.no_log_for = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, 'no_log_for')
|
||||
self.first = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, 'zeroconf_first_name')
|
||||
self.last = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, 'zeroconf_last_name')
|
||||
self.jabber_id = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, 'zeroconf_jabber_id')
|
||||
self.email = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, 'zeroconf_email')
|
||||
gajim.config.set_per('accounts', gajim.ZEROCONF_ACC_NAME, 'hostname',
|
||||
self.host)
|
||||
self.port = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME,
|
||||
'custom_port')
|
||||
self.autoconnect = gajim.config.get_per('accounts',
|
||||
gajim.ZEROCONF_ACC_NAME, 'autoconnect')
|
||||
self.sync_with_global_status = gajim.config.get_per('accounts',
|
||||
gajim.ZEROCONF_ACC_NAME, 'sync_with_global_status')
|
||||
self.first = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME,
|
||||
'zeroconf_first_name')
|
||||
self.last = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME,
|
||||
'zeroconf_last_name')
|
||||
self.jabber_id = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME,
|
||||
'zeroconf_jabber_id')
|
||||
self.email = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME,
|
||||
'zeroconf_email')
|
||||
|
||||
if not self.username:
|
||||
self.username = unicode(getpass.getuser())
|
||||
gajim.config.set_per('accounts', gajim.ZEROCONF_ACC_NAME, 'name', self.username)
|
||||
gajim.config.set_per('accounts', gajim.ZEROCONF_ACC_NAME, 'name',
|
||||
self.username)
|
||||
else:
|
||||
self.username = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, 'name')
|
||||
self.username = gajim.config.get_per('accounts',
|
||||
gajim.ZEROCONF_ACC_NAME, 'name')
|
||||
# END __init__
|
||||
|
||||
def dispatch(self, event, data):
|
||||
gajim.interface.dispatch(event, self.name, data)
|
||||
def check_jid(self, jid):
|
||||
return jid
|
||||
|
||||
def _reconnect(self):
|
||||
# Do not try to reco while we are already trying
|
||||
self.time_to_reconnect = None
|
||||
gajim.log.debug('reconnect')
|
||||
|
||||
# signed = self.get_signed_msg(self.status)
|
||||
self.disconnect()
|
||||
self.change_status(self.old_show, self.status)
|
||||
|
||||
def quit(self, kill_core):
|
||||
if kill_core and self.connected > 1:
|
||||
self.disconnect()
|
||||
|
||||
def disable_account(self):
|
||||
self.disconnect()
|
||||
|
||||
def test_gpg_passphrase(self, password):
|
||||
self.gpg.passphrase = password
|
||||
keyID = gajim.config.get_per('accounts', self.name, 'keyid')
|
||||
signed = self.gpg.sign('test', keyID)
|
||||
self.gpg.password = None
|
||||
return signed != 'BAD_PASSPHRASE'
|
||||
|
||||
def get_signed_msg(self, msg):
|
||||
signed = ''
|
||||
keyID = gajim.config.get_per('accounts', self.name, 'keyid')
|
||||
if keyID and self.USE_GPG:
|
||||
use_gpg_agent = gajim.config.get('use_gpg_agent')
|
||||
if self.connected < 2 and self.gpg.passphrase is None and \
|
||||
not use_gpg_agent:
|
||||
# We didn't set a passphrase
|
||||
self.dispatch('ERROR', (_('OpenPGP passphrase was not given'),
|
||||
#%s is the account name here
|
||||
_('You will be connected to %s without OpenPGP.') % self.name))
|
||||
self.USE_GPG = False
|
||||
elif self.gpg.passphrase is not None or use_gpg_agent:
|
||||
signed = self.gpg.sign(msg, keyID)
|
||||
if signed == 'BAD_PASSPHRASE':
|
||||
self.USE_GPG = False
|
||||
signed = ''
|
||||
if self.connected < 2:
|
||||
self.dispatch('BAD_PASSPHRASE', ())
|
||||
return signed
|
||||
|
||||
def _on_resolve_timeout(self):
|
||||
if self.connected:
|
||||
self.connection.resolve_all()
|
||||
|
|
@ -197,8 +144,10 @@ class ConnectionZeroconf(ConnectionHandlersZeroconf):
|
|||
# callbacks called from zeroconf
|
||||
def _on_new_service(self, jid):
|
||||
self.roster.setItem(jid)
|
||||
self.dispatch('ROSTER_INFO', (jid, self.roster.getName(jid), 'both', 'no', self.roster.getGroups(jid)))
|
||||
self.dispatch('NOTIFY', (jid, self.roster.getStatus(jid), self.roster.getMessage(jid), 'local', 0, None, 0, None))
|
||||
self.dispatch('ROSTER_INFO', (jid, self.roster.getName(jid), 'both', 'no',
|
||||
self.roster.getGroups(jid)))
|
||||
self.dispatch('NOTIFY', (jid, self.roster.getStatus(jid),
|
||||
self.roster.getMessage(jid), 'local', 0, None, 0, None))
|
||||
|
||||
def _on_remove_service(self, jid):
|
||||
self.roster.delItem(jid)
|
||||
|
|
@ -206,15 +155,6 @@ class ConnectionZeroconf(ConnectionHandlersZeroconf):
|
|||
# keyID, timestamp, contact_nickname))
|
||||
self.dispatch('NOTIFY', (jid, 'offline', '', 'local', 0, None, 0, None))
|
||||
|
||||
def _on_disconnected(self):
|
||||
self.disconnect()
|
||||
self.dispatch('STATUS', 'offline')
|
||||
self.dispatch('CONNECTION_LOST',
|
||||
(_('Connection with account "%s" has been lost') % self.name,
|
||||
_('To continue sending and receiving messages, you will need to reconnect.')))
|
||||
self.status = 'offline'
|
||||
self.disconnect()
|
||||
|
||||
def _disconnectedReconnCB(self):
|
||||
'''Called when we are disconnected. Comes from network manager for example
|
||||
we don't try to reconnect, network manager will tell us when we can'''
|
||||
|
|
@ -234,7 +174,8 @@ class ConnectionZeroconf(ConnectionHandlersZeroconf):
|
|||
self.dispatch('ZC_NAME_CONFLICT', alt_name)
|
||||
|
||||
def _on_error(self, message):
|
||||
self.dispatch('ERROR', (_('Avahi error'), _("%s\nLink-local messaging might not work properly.") % message))
|
||||
self.dispatch('ERROR', (_('Avahi error'),
|
||||
_('%s\nLink-local messaging might not work properly.') % message))
|
||||
|
||||
def connect(self, show='online', msg=''):
|
||||
self.get_config_values_or_default()
|
||||
|
|
@ -269,8 +210,10 @@ class ConnectionZeroconf(ConnectionHandlersZeroconf):
|
|||
|
||||
# display contacts already detected and resolved
|
||||
for jid in self.roster.keys():
|
||||
self.dispatch('ROSTER_INFO', (jid, self.roster.getName(jid), 'both', 'no', self.roster.getGroups(jid)))
|
||||
self.dispatch('NOTIFY', (jid, self.roster.getStatus(jid), self.roster.getMessage(jid), 'local', 0, None, 0, None))
|
||||
self.dispatch('ROSTER_INFO', (jid, self.roster.getName(jid), 'both',
|
||||
'no', self.roster.getGroups(jid)))
|
||||
self.dispatch('NOTIFY', (jid, self.roster.getStatus(jid),
|
||||
self.roster.getMessage(jid), 'local', 0, None, 0, None))
|
||||
|
||||
self.connected = STATUS_LIST.index(show)
|
||||
|
||||
|
|
@ -291,15 +234,20 @@ class ConnectionZeroconf(ConnectionHandlersZeroconf):
|
|||
def reannounce(self):
|
||||
if self.connected:
|
||||
txt = {}
|
||||
txt['1st'] = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, 'zeroconf_first_name')
|
||||
txt['last'] = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, 'zeroconf_last_name')
|
||||
txt['jid'] = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, 'zeroconf_jabber_id')
|
||||
txt['email'] = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, 'zeroconf_email')
|
||||
txt['1st'] = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME,
|
||||
'zeroconf_first_name')
|
||||
txt['last'] = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME,
|
||||
'zeroconf_last_name')
|
||||
txt['jid'] = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME,
|
||||
'zeroconf_jabber_id')
|
||||
txt['email'] = gajim.config.get_per('accounts',
|
||||
gajim.ZEROCONF_ACC_NAME, 'zeroconf_email')
|
||||
self.connection.reannounce(txt)
|
||||
|
||||
def update_details(self):
|
||||
if self.connection:
|
||||
port = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, 'custom_port')
|
||||
port = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME,
|
||||
'custom_port')
|
||||
if port != self.port:
|
||||
self.port = port
|
||||
last_msg = self.connection.last_msg
|
||||
|
|
@ -311,14 +259,9 @@ class ConnectionZeroconf(ConnectionHandlersZeroconf):
|
|||
else:
|
||||
self.reannounce()
|
||||
|
||||
def change_status(self, show, msg, sync = False, auto = False):
|
||||
if not show in STATUS_LIST:
|
||||
return -1
|
||||
self.status = show
|
||||
|
||||
check = True #to check for errors from zeroconf
|
||||
# 'connect'
|
||||
if show != 'offline' and not self.connected:
|
||||
def connect_and_init(self, show, msg, sign_msg):
|
||||
# to check for errors from zeroconf
|
||||
check = True
|
||||
if not self.connect(show, msg):
|
||||
return
|
||||
if show != 'invisible':
|
||||
|
|
@ -327,24 +270,6 @@ class ConnectionZeroconf(ConnectionHandlersZeroconf):
|
|||
self.connected = STATUS_LIST.index(show)
|
||||
self.dispatch('SIGNED_IN', ())
|
||||
|
||||
# 'disconnect'
|
||||
elif show == 'offline' and self.connected:
|
||||
self.disconnect()
|
||||
self.time_to_reconnect = None
|
||||
|
||||
# update status
|
||||
elif show != 'offline' and self.connected:
|
||||
was_invisible = self.connected == STATUS_LIST.index('invisible')
|
||||
self.connected = STATUS_LIST.index(show)
|
||||
if show == 'invisible':
|
||||
check = check and self.connection.remove_announce()
|
||||
elif was_invisible:
|
||||
if not self.connected:
|
||||
check = check and self.connect(show, msg)
|
||||
check = check and self.connection.announce()
|
||||
if self.connection and not show == 'invisible':
|
||||
check = check and self.connection.set_show_msg(show, msg)
|
||||
|
||||
# stay offline when zeroconf does something wrong
|
||||
if check:
|
||||
self.dispatch('STATUS', show)
|
||||
|
|
@ -356,136 +281,63 @@ class ConnectionZeroconf(ConnectionHandlersZeroconf):
|
|||
(_('Could not change status of account "%s"') % self.name,
|
||||
_('Please check if avahi-daemon is running.')))
|
||||
|
||||
def get_status(self):
|
||||
return STATUS_LIST[self.connected]
|
||||
def _change_to_invisible(self, msg):
|
||||
if self.connection.remove_announce():
|
||||
self.dispatch('STATUS', 'invisible')
|
||||
else:
|
||||
# show notification that avahi or system bus is down
|
||||
self.dispatch('STATUS', 'offline')
|
||||
self.status = 'offline'
|
||||
self.dispatch('CONNECTION_LOST',
|
||||
(_('Could not change status of account "%s"') % self.name,
|
||||
_('Please check if avahi-daemon is running.')))
|
||||
|
||||
def _change_from_invisible(self):
|
||||
self.connection.announce()
|
||||
|
||||
def _update_status(self, show, msg):
|
||||
if self.connection.set_show_msg(show, msg):
|
||||
self.dispatch('STATUS', show)
|
||||
else:
|
||||
# show notification that avahi or system bus is down
|
||||
self.dispatch('STATUS', 'offline')
|
||||
self.status = 'offline'
|
||||
self.dispatch('CONNECTION_LOST',
|
||||
(_('Could not change status of account "%s"') % self.name,
|
||||
_('Please check if avahi-daemon is running.')))
|
||||
|
||||
def send_message(self, jid, msg, keyID, type_='chat', subject='',
|
||||
chatstate=None, msg_id=None, composing_xep=None, resource=None,
|
||||
user_nick=None, xhtml=None, session=None, forward_from=None, form_node=None,
|
||||
original_message=None, delayed=None, callback=None, callback_args=[]):
|
||||
fjid = jid
|
||||
|
||||
if msg and not xhtml and gajim.config.get(
|
||||
'rst_formatting_outgoing_messages'):
|
||||
from common.rst_xhtml_generator import create_xhtml
|
||||
xhtml = create_xhtml(msg)
|
||||
if not self.connection:
|
||||
return
|
||||
if not msg and chatstate is None:
|
||||
return
|
||||
|
||||
if self.status in ('invisible', 'offline'):
|
||||
self.dispatch('MSGERROR', [unicode(jid), -1,
|
||||
_('You are not connected or not visible to others. Your message '
|
||||
'could not be sent.'), None, None, session])
|
||||
return
|
||||
|
||||
msgtxt = msg
|
||||
msgenc = ''
|
||||
if keyID and self.USE_GPG:
|
||||
if keyID == 'UNKNOWN':
|
||||
error = _('Neither the remote presence is signed, nor a key was assigned.')
|
||||
elif keyID.endswith('MISMATCH'):
|
||||
error = _('The contact\'s key (%s) does not match the key assigned in Gajim.' % keyID[:8])
|
||||
else:
|
||||
# encrypt
|
||||
msgenc, error = self.gpg.encrypt(msg, [keyID])
|
||||
if msgenc and not error:
|
||||
msgtxt = '[This message is encrypted]'
|
||||
lang = os.getenv('LANG')
|
||||
if lang is not None or lang != 'en': # we're not english
|
||||
msgtxt = _('[This message is encrypted]') +\
|
||||
' ([This message is encrypted])' # one in locale and one en
|
||||
else:
|
||||
# Encryption failed, do not send message
|
||||
tim = time.localtime()
|
||||
self.dispatch('MSGNOTSENT', (jid, error, msgtxt, tim, session))
|
||||
return
|
||||
|
||||
if type_ == 'chat':
|
||||
msg_iq = common.xmpp.Message(to=fjid, body=msgtxt, typ=type_,
|
||||
xhtml=xhtml)
|
||||
|
||||
else:
|
||||
if subject:
|
||||
msg_iq = common.xmpp.Message(to=fjid, body=msgtxt, typ='normal',
|
||||
subject=subject, xhtml=xhtml)
|
||||
else:
|
||||
msg_iq = common.xmpp.Message(to=fjid, body=msgtxt, typ='normal',
|
||||
xhtml=xhtml)
|
||||
|
||||
if msgenc:
|
||||
msg_iq.setTag(common.xmpp.NS_ENCRYPTED + ' x').setData(msgenc)
|
||||
|
||||
# chatstates - if peer supports jep85 or jep22, send chatstates
|
||||
# please note that the only valid tag inside a message containing a <body>
|
||||
# tag is the active event
|
||||
if chatstate is not None:
|
||||
if composing_xep == 'XEP-0085' or not composing_xep:
|
||||
# JEP-0085
|
||||
msg_iq.setTag(chatstate, namespace = common.xmpp.NS_CHATSTATES)
|
||||
if composing_xep == 'XEP-0022' or not composing_xep:
|
||||
# JEP-0022
|
||||
chatstate_node = msg_iq.setTag('x', namespace = common.xmpp.NS_EVENT)
|
||||
if not msgtxt: # when no <body>, add <id>
|
||||
if not msg_id: # avoid putting 'None' in <id> tag
|
||||
msg_id = ''
|
||||
chatstate_node.setTagData('id', msg_id)
|
||||
# when msgtxt, requests JEP-0022 composing notification
|
||||
if chatstate is 'composing' or msgtxt:
|
||||
chatstate_node.addChild(name = 'composing')
|
||||
|
||||
if forward_from:
|
||||
addresses = msg_iq.addChild('addresses',
|
||||
namespace=common.xmpp.NS_ADDRESS)
|
||||
addresses.addChild('address', attrs = {'type': 'ofrom',
|
||||
'jid': forward_from})
|
||||
|
||||
# XEP-0203
|
||||
if delayed:
|
||||
our_jid = gajim.get_jid_from_account(self.name) + '/' + \
|
||||
self.server_resource
|
||||
timestamp = time.strftime('%Y-%m-%dT%TZ', time.gmtime(delayed))
|
||||
msg_iq.addChild('delay', namespace=common.xmpp.NS_DELAY2,
|
||||
attrs={'from': our_jid, 'stamp': timestamp})
|
||||
|
||||
if session:
|
||||
session.last_send = time.time()
|
||||
msg_iq.setThread(session.thread_id)
|
||||
|
||||
if session.enable_encryption:
|
||||
msg_iq = session.encrypt_stanza(msg_iq)
|
||||
|
||||
def on_send_ok(id):
|
||||
no_log_for = gajim.config.get_per('accounts', self.name, 'no_log_for')
|
||||
ji = gajim.get_jid_without_resource(jid)
|
||||
if session.is_loggable() and self.name not in no_log_for and\
|
||||
ji not in no_log_for:
|
||||
log_msg = msg
|
||||
if subject:
|
||||
log_msg = _('Subject: %(subject)s\n%(message)s') % \
|
||||
{'subject': subject, 'message': msg}
|
||||
if log_msg:
|
||||
if type_ == 'chat':
|
||||
kind = 'chat_msg_sent'
|
||||
else:
|
||||
kind = 'single_msg_sent'
|
||||
gajim.logger.write(kind, jid, log_msg)
|
||||
|
||||
def on_send_ok(msg_id):
|
||||
self.dispatch('MSGSENT', (jid, msg, keyID))
|
||||
|
||||
if callback:
|
||||
callback(id, *callback_args)
|
||||
callback(msg_id, *callback_args)
|
||||
|
||||
self.log_message(jid, msg, forward_from, session, original_message,
|
||||
subject, type_)
|
||||
|
||||
def on_send_not_ok(reason):
|
||||
reason += ' ' + _('Your message could not be sent.')
|
||||
self.dispatch('MSGERROR', [jid, -1, reason, None, None, session])
|
||||
|
||||
def cb(jid, msg, keyID, forward_from, session, original_message, subject,
|
||||
type_, msg_iq):
|
||||
ret = self.connection.send(msg_iq, msg is not None, on_ok=on_send_ok,
|
||||
on_not_ok=on_send_not_ok)
|
||||
|
||||
if ret == -1:
|
||||
# Contact Offline
|
||||
self.dispatch('MSGERROR', [jid, -1, _('Contact is offline. Your message could not be sent.'), None, None, session])
|
||||
self.dispatch('MSGERROR', [jid, -1, _('Contact is offline. Your '
|
||||
'message could not be sent.'), None, None, session])
|
||||
|
||||
self._prepare_message(jid, msg, keyID, type_=type_, subject=subject,
|
||||
chatstate=chatstate, msg_id=msg_id, composing_xep=composing_xep,
|
||||
resource=resource, user_nick=user_nick, xhtml=xhtml, session=session,
|
||||
forward_from=forward_from, form_node=form_node,
|
||||
original_message=original_message, delayed=delayed, callback=cb)
|
||||
|
||||
def send_stanza(self, stanza):
|
||||
# send a stanza untouched
|
||||
|
|
@ -495,95 +347,10 @@ class ConnectionZeroconf(ConnectionHandlersZeroconf):
|
|||
stanza = common.xmpp.Protocol(node=stanza)
|
||||
self.connection.send(stanza)
|
||||
|
||||
def ack_subscribed(self, jid):
|
||||
gajim.log.debug('This should not happen (ack_subscribed)')
|
||||
|
||||
def ack_unsubscribed(self, jid):
|
||||
gajim.log.debug('This should not happen (ack_unsubscribed)')
|
||||
|
||||
def request_subscription(self, jid, msg = '', name = '', groups = [],
|
||||
auto_auth = False):
|
||||
gajim.log.debug('This should not happen (request_subscription)')
|
||||
|
||||
def send_authorization(self, jid):
|
||||
gajim.log.debug('This should not happen (send_authorization)')
|
||||
|
||||
def refuse_authorization(self, jid):
|
||||
gajim.log.debug('This should not happen (refuse_authorization)')
|
||||
|
||||
def unsubscribe(self, jid, remove_auth = True):
|
||||
gajim.log.debug('This should not happen (unsubscribe)')
|
||||
|
||||
def unsubscribe_agent(self, agent):
|
||||
gajim.log.debug('This should not happen (unsubscribe_agent)')
|
||||
|
||||
def update_contact(self, jid, name, groups):
|
||||
if self.connection:
|
||||
self.connection.getRoster().setItem(jid = jid, name = name,
|
||||
groups = groups)
|
||||
|
||||
def update_contacts(self, contacts):
|
||||
'''update multiple roster items'''
|
||||
if self.connection:
|
||||
self.connection.getRoster().setItemMulti(contacts)
|
||||
|
||||
def new_account(self, name, config, sync = False):
|
||||
gajim.log.debug('This should not happen (new_account)')
|
||||
|
||||
def _on_new_account(self, con = None, con_type = None):
|
||||
gajim.log.debug('This should not happen (_on_new_account)')
|
||||
|
||||
def account_changed(self, new_name):
|
||||
self.name = new_name
|
||||
|
||||
def request_last_status_time(self, jid, resource):
|
||||
gajim.log.debug('This should not happen (request_last_status_time)')
|
||||
|
||||
def request_os_info(self, jid, resource):
|
||||
gajim.log.debug('This should not happen (request_os_info)')
|
||||
|
||||
def get_settings(self):
|
||||
gajim.log.debug('This should not happen (get_settings)')
|
||||
|
||||
def get_bookmarks(self):
|
||||
gajim.log.debug('This should not happen (get_bookmarks)')
|
||||
|
||||
def store_bookmarks(self):
|
||||
gajim.log.debug('This should not happen (store_bookmarks)')
|
||||
|
||||
def get_metacontacts(self):
|
||||
gajim.log.debug('This should not happen (get_metacontacts)')
|
||||
|
||||
def send_agent_status(self, agent, ptype):
|
||||
gajim.log.debug('This should not happen (send_agent_status)')
|
||||
|
||||
def gpg_passphrase(self, passphrase):
|
||||
if self.gpg:
|
||||
use_gpg_agent = gajim.config.get('use_gpg_agent')
|
||||
if use_gpg_agent:
|
||||
self.gpg.passphrase = None
|
||||
else:
|
||||
self.gpg.passphrase = passphrase
|
||||
|
||||
def ask_gpg_keys(self):
|
||||
if self.gpg:
|
||||
keys = self.gpg.get_keys()
|
||||
return keys
|
||||
return None
|
||||
|
||||
def ask_gpg_secrete_keys(self):
|
||||
if self.gpg:
|
||||
keys = self.gpg.get_secret_keys()
|
||||
return keys
|
||||
return None
|
||||
|
||||
def _event_dispatcher(self, realm, event, data):
|
||||
CommonConnection._event_dispatcher(self, realm, event, data)
|
||||
if realm == '':
|
||||
if event == common.xmpp.transports_nb.DATA_RECEIVED:
|
||||
self.dispatch('STANZA_ARRIVED', unicode(data, errors = 'ignore'))
|
||||
elif event == common.xmpp.transports_nb.DATA_SENT:
|
||||
self.dispatch('STANZA_SENT', unicode(data))
|
||||
elif event == common.xmpp.transports.DATA_ERROR:
|
||||
if event == common.xmpp.transports_nb.DATA_ERROR:
|
||||
thread_id = data[1]
|
||||
frm = unicode(data[0])
|
||||
session = self.get_or_create_session(frm, thread_id)
|
||||
|
|
@ -591,9 +358,6 @@ class ConnectionZeroconf(ConnectionHandlersZeroconf):
|
|||
_('Connection to host could not be established: Timeout while '
|
||||
'sending data.'), None, None, session])
|
||||
|
||||
def load_roster_from_db(self):
|
||||
return
|
||||
|
||||
# END ConnectionZeroconf
|
||||
|
||||
# vim: se ts=3:
|
||||
|
|
|
|||
Loading…
Reference in New Issue