changeset 0236f8351a82 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=0236f8351a82 description: if peer does not include a security element in content node, set use_security to false

diffstat:

src/common/jingle_ft.py | 11 +++++++++++ src/common/protocol/bytestream.py | 2 -- 2 files changed, 11 insertions(+), 2 deletions(-)

diffs (40 lines):

diff -r b2905309c9de -r 0236f8351a82 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Thu Jul 22 15:05:06 2010 +0800 +++ b/src/common/jingle_ft.py Thu Jul 22 16:20:14 2010 +0800 @@ -92,6 +92,12 @@

file_props['session-type'] = 'jingle'

+ security = content.getTag('security') + if not security: + self.use_security = False + else: + self.use_security = True + file_tag = content.getTag('description').getTag('offer').getTag('file') for attribute in file_tag.getAttrs(): if attribute in ('name', 'size', 'hash', 'date'): @@ -130,6 +136,11 @@

def __on_session_accept(self, stanza, content, error, action): log.info("__on_session_accept") + + security = content.getTag('security') + if not security: # responder can not verify our fingerprint + self.use_security = False +

def __on_session_terminate(self, stanza, content, error, action): log.info("__on_session_terminate") diff -r b2905309c9de -r 0236f8351a82 src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Thu Jul 22 15:05:06 2010 +0800 +++ b/src/common/protocol/bytestream.py Thu Jul 22 16:20:14 2010 +0800 @@ -135,8 +135,6 @@ session = self.get_jingle_session(file_props['sender'], file_props['sid']) if not session: return - jid = gajim.get_jid_without_resource(file_props['sender']) - resource = gajim.get_resource_from_jid(file_props['sender']) sid = file_props['sid'] gajim.socks5queue.add_file_props(self.name, file_props)