[Git][gajim/gajim][master] Port from getAnID() to generate_id()

Philipp Hörist pushed to branch master at gajim / gajim

Commits: 54929665 by Philipp Hörist at 2020-01-23T19:39:58+01:00 Port from getAnID() to generate_id()

- - - - -

7 changed files:

- gajim/common/connection.py - gajim/common/jingle_session.py - gajim/common/jingle_transport.py - gajim/common/jingle_xtls.py - gajim/common/modules/adhoc_commands.py - gajim/common/modules/mam.py - gajim/common/zeroconf/client_zeroconf.py

Changes:

===================================== gajim/common/connection.py ===================================== @@ -48,6 +48,7 @@ import OpenSSL.crypto import nbxmpp from nbxmpp.const import Realm from nbxmpp.const import Event +from nbxmpp.util import generate_id

from gajim import common from gajim.common import helpers @@ -232,7 +233,7 @@ class CommonConnection: namespace=nbxmpp.NS_CORRECT)

# XEP-0359 - obj.stanza_id = self.connection.getAnID() + obj.stanza_id = generate_id() msg_iq.setID(obj.stanza_id) if obj.message: msg_iq.setOriginID(obj.stanza_id) @@ -1625,7 +1626,7 @@ class Connection(CommonConnection, ConnectionHandlers): typ='groupchat', xhtml=xhtml)

- obj.stanza_id = self.connection.getAnID() + obj.stanza_id = generate_id() msg_iq.setID(obj.stanza_id) if obj.message: msg_iq.setOriginID(obj.stanza_id)

===================================== gajim/common/jingle_session.py ===================================== @@ -31,6 +31,7 @@ import logging from enum import Enum, unique

import nbxmpp +from nbxmpp.util import generate_id

from gajim.common import app from gajim.common.jingle_transport import get_jingle_transport @@ -103,7 +104,7 @@ class JingleSession: # what state is session in? (one from JingleStates) self.state = JingleStates.ENDED if not sid: - sid = con.connection.getAnID() + sid = generate_id() self.sid = sid # sessionid # iq stanza id, used to determine which sessions to summon callback # later on when iq-result stanza arrives

===================================== gajim/common/jingle_transport.py ===================================== @@ -24,6 +24,7 @@ import socket from enum import IntEnum, unique

import nbxmpp +from nbxmpp.util import generate_id

from gajim.common import app

@@ -96,7 +97,7 @@ class JingleTransport: def set_connection(self, conn): self.connection = conn if not self.sid: - self.sid = self.connection.connection.getAnID() + self.sid = generate_id()

def set_file_props(self, file_props): self.file_props = file_props @@ -198,7 +199,7 @@ class JingleTransportSocks5(JingleTransport):

candidate = { 'host': self.connection.peerhost[0], - 'candidate_id': self.connection.connection.getAnID(), + 'candidate_id': generate_id(), 'port': port, 'type': 'direct', 'jid': self.ourjid, @@ -214,7 +215,7 @@ class JingleTransportSocks5(JingleTransport): addr != '::1': candidate = { 'host': addr, - 'candidate_id': self.connection.connection.getAnID(), + 'candidate_id': generate_id(), 'port': port, 'type': 'direct', 'jid': self.ourjid, @@ -238,7 +239,7 @@ class JingleTransportSocks5(JingleTransport): continue candidate = { 'host': addr, - 'candidate_id': self.connection.connection.getAnID(), + 'candidate_id': generate_id(), 'port': port, 'type': 'direct', 'jid': self.ourjid, @@ -256,7 +257,7 @@ class JingleTransportSocks5(JingleTransport): continue candidate = { 'host': addr, - 'candidate_id': self.connection.connection.getAnID(), + 'candidate_id': generate_id(), 'port': port, 'type': 'direct', 'jid': self.ourjid, @@ -286,7 +287,7 @@ class JingleTransportSocks5(JingleTransport): for host in hosts: candidate = { 'host': host, - 'candidate_id': self.connection.connection.getAnID(), + 'candidate_id': generate_id(), 'port': port, 'type': 'direct', 'jid': self.ourjid, @@ -313,7 +314,7 @@ class JingleTransportSocks5(JingleTransport): for proxyhost in proxyhosts: candidate = { 'host': proxyhost['host'], - 'candidate_id': self.connection.connection.getAnID(), + 'candidate_id': generate_id(), 'port': int(proxyhost['port']), 'type': 'proxy', 'jid': proxyhost['jid'],

===================================== gajim/common/jingle_xtls.py ===================================== @@ -18,6 +18,7 @@ import os from OpenSSL import SSL, crypto

import nbxmpp +from nbxmpp.util import generate_id from gajim.common import app from gajim.common import configpaths

@@ -188,7 +189,7 @@ def check_cert(jid, fingerprint):

def send_cert_request(con, to_jid): iq = nbxmpp.Iq('get', to=to_jid) - id_ = con.connection.getAnID() + id_ = generate_id() iq.setAttr('id', id_) pubkey = iq.setTag('pubkeys') pubkey.setNamespace(nbxmpp.NS_PUBKEY_PUBKEY)

===================================== gajim/common/modules/adhoc_commands.py ===================================== @@ -22,6 +22,7 @@ import nbxmpp from nbxmpp.structs import StanzaHandler from nbxmpp.modules import dataforms +from nbxmpp.util import generate_id

from gajim.common import app from gajim.common import helpers @@ -314,7 +315,7 @@ class AdHocCommands(BaseModule): raise nbxmpp.NodeProcessed

# generate new sessionid - sessionid = self._con.connection.getAnID() + sessionid = generate_id()

# create new instance and run it obj = newcmd(conn=self, jid=jid, sessionid=sessionid)

===================================== gajim/common/modules/mam.py ===================================== @@ -18,6 +18,7 @@ import time from datetime import datetime, timedelta

import nbxmpp +from nbxmpp.util import generate_id from nbxmpp.structs import StanzaHandler

from gajim.common import app @@ -256,7 +257,7 @@ class MAM(BaseModule): return valid_id == properties.mam.query_id

def _get_query_id(self, jid): - query_id = self._con.connection.getAnID() + query_id = generate_id() self._mam_query_ids[jid] = query_id return query_id

===================================== gajim/common/zeroconf/client_zeroconf.py ===================================== @@ -34,6 +34,7 @@ from nbxmpp.idlequeue import IdleObject from nbxmpp.transports import DATA_RECEIVED from nbxmpp.transports import DATA_SENT from nbxmpp.transports import DATA_ERROR +from nbxmpp.util import generate_id

from gajim.common import app from gajim.common.zeroconf import zeroconf @@ -184,7 +185,7 @@ class P2PClient(IdleObject): thread_id = stanza.getThread() id_ = stanza.getID() if not id_: - id_ = self.Dispatcher.getAnID() + id_ = generate_id() if self.fd in self.conn_holder.ids_of_awaiting_messages: self.conn_holder.ids_of_awaiting_messages[self.fd].append(( id_, thread_id)) @@ -209,7 +210,7 @@ class P2PClient(IdleObject): thread_id = stanza.getThread() id_ = stanza.getID() if not id_: - id_ = self.Dispatcher.getAnID() + id_ = generate_id() if self.fd in self.conn_holder.ids_of_awaiting_messages: self.conn_holder.ids_of_awaiting_messages[self.fd].append((id_, thread_id)) @@ -800,12 +801,6 @@ class ClientZeroconf: P2PClient(None, addresses_, self, [(stanza, is_message)], to, on_ok=on_ok, on_not_ok=on_not_ok)

- def getAnID(self): - """ - Generate a random id - """ - return ''.join(Random().sample(string.ascii_letters + string.digits, 6)) - def RegisterDisconnectHandler(self, handler): """ Register handler that will be called on disconnect

View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/549296659dcb298b0cb28b3865b7cfbce45...