Commits November 2022

commits@gajim.org

1 participants
102 discussions

[Git][gajim/gajim] Pushed new branch cert-convert-cryptography
by Daniel Brötzmann (＠wurstsalat) 11 Nov '22

11 Nov '22

Daniel Brötzmann pushed new branch cert-convert-cryptography at gajim / gajim -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/tree/cert-convert-cryptography You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][remove-jingle-xtls] change: Jingle: Remove XTLS support
by Daniel Brötzmann (＠wurstsalat) 10 Nov '22

10 Nov '22

Daniel Brötzmann pushed to branch remove-jingle-xtls at gajim / gajim Commits: 1122f23b by wurstsalat at 2022-11-10T19:41:50+01:00 change: Jingle: Remove XTLS support XTLS has never been standardized, see https://datatracker.ietf.org/doc/html/draft-meyer-xmpp-e2e-encryption Gajim used this for file transfers, but there probably was no other client supporting this now obsolete feature. Today, using XEP-0396: Jingle Encrypted Transports - OMEMO would be the preferred solution. Part of #11160 - - - - - 10 changed files: - gajim/common/configpaths.py - gajim/common/const.py - gajim/common/jingle_content.py - gajim/common/jingle_ft.py - gajim/common/jingle_ftstates.py - − gajim/common/jingle_xtls.py - gajim/common/modules/bytestream.py - gajim/common/modules/jingle.py - gajim/common/socks5.py - − gajim/data/other/dh4096.pem Changes: ===================================== gajim/common/configpaths.py ===================================== @@ -189,7 +189,6 @@ def init(self): unique_profile_paths = [ # Data paths ('SECRETS_FILE', 'secrets', PathLocation.DATA, PathType.FILE), - ('MY_PEER_CERTS', 'certs', PathLocation.DATA, PathType.FOLDER), ('CERT_STORE', 'cert_store', PathLocation.DATA, PathType.FOLDER), ('DEBUG', 'debug', PathLocation.DATA, PathType.FOLDER), ('PLUGINS_DATA', 'plugins_data', @@ -200,7 +199,6 @@ def init(self): ('CONFIG_FILE', 'config', PathLocation.CONFIG, PathType.FILE), ('PLUGINS_CONFIG_DIR', 'pluginsconfig', PathLocation.CONFIG, PathType.FOLDER), - ('MY_CERT', 'localcerts', PathLocation.CONFIG, PathType.FOLDER), ('MY_SHORTCUTS', 'shortcuts.json', PathLocation.CONFIG, PathType.FILE), ] ===================================== gajim/common/const.py ===================================== @@ -903,7 +903,6 @@ def is_active(self): Namespace.HASHES_BLAKE2B_512, Namespace.JINGLE, Namespace.JINGLE_FILE_TRANSFER_5, - Namespace.JINGLE_XTLS, Namespace.JINGLE_BYTESTREAM, Namespace.JINGLE_IBB, Namespace.AVATAR_METADATA + '+notify', ===================================== gajim/common/jingle_content.py ===================================== @@ -26,10 +26,7 @@ from nbxmpp.namespaces import Namespace from gajim.common import app -from gajim.common import configpaths from gajim.common.file_props import FileProp -from gajim.common.jingle_xtls import SELF_SIGNED_CERTIFICATE -from gajim.common.jingle_xtls import load_cert_file if TYPE_CHECKING: from gajim.common.jingle_transport import JingleTransport @@ -84,7 +81,6 @@ def __init__(self, # These were found by the Politie self.file_props: Optional[FileProp] = None - self.use_security: Optional[bool] = None self.callbacks: dict[str, list[Callable[ [nbxmpp.Node, nbxmpp.Node, Optional[nbxmpp.Node], str], @@ -267,22 +263,6 @@ def _fill_content(self, content: nbxmpp.Node) -> None: desc = file_tag.setTag('desc') if self.file_props.desc: desc.setData(self.file_props.desc) - if self.use_security: - security = nbxmpp.simplexml.Node( - tag=Namespace.JINGLE_XTLS + ' security') - certpath = configpaths.get('MY_CERT') - certpath = certpath / f'{SELF_SIGNED_CERTIFICATE}.cert' - cert = load_cert_file(certpath) - if cert: - digest_algo = (cert.get_signature_algorithm() - .decode('utf-8').split('With')[0]) - security.addChild('fingerprint').addData(cert.digest( - digest_algo).decode('utf-8')) - for m in ('x509', ): # supported authentication methods - method = nbxmpp.simplexml.Node(tag='method') - method.setAttr('name', m) - security.addChild(node=method) - content.addChild(node=security) content.addChild(node=description_node) def destroy(self) -> None: ===================================== gajim/common/jingle_ft.py ===================================== @@ -33,8 +33,6 @@ from nbxmpp.namespaces import Namespace from gajim.common import app -from gajim.common import configpaths -from gajim.common import jingle_xtls from gajim.common import helpers from gajim.common.const import KindConstant from gajim.common.helpers import AdditionalDataDict @@ -80,7 +78,6 @@ def __init__(self, session: JingleSession, file_props: FileProp, transport: Optional[JingleTransport] = None, - use_security: bool = False, senders: Optional[str] = None ) -> None: @@ -102,8 +99,6 @@ def __init__(self, self.callbacks['transport-info'] += [self.__on_transport_info] self.callbacks['iq-result'] += [self.__on_iq_result] - self.use_security = use_security - self.x509_fingerprint: Optional[str] = None self.file_props = file_props self.weinitiate = self.session.weinitiate self.werequest = self.session.werequest @@ -139,12 +134,6 @@ def __init__(self, State.CAND_SENT_AND_RECEIVED: StateCandSentAndRecv(self) } - cert_name = (configpaths.get('MY_CERT') / - jingle_xtls.SELF_SIGNED_CERTIFICATE) - if not (cert_name.with_suffix('.cert').exists() and - cert_name.with_suffix('.pkey').exists()): - jingle_xtls.make_certs(cert_name, 'gajim') - def __state_changed(self, nextstate: State, args: Optional[dict[str, Any]] = None @@ -200,13 +189,6 @@ def _raise_event(self, if not content: return - secu = content.getTag('security') - self.use_security = bool(secu) - if secu: - fingerprint = secu.getTag('fingerprint') - if fingerprint: - self.x509_fingerprint = fingerprint.getData() - if not self.transport: self.transport = JingleTransportSocks5() self.transport.set_our_jid(self.session.ourjid) @@ -333,26 +315,6 @@ def __on_session_accept(self, action: str ) -> None: log.info('__on_session_accept') - con = self.session.connection - security = content.getTag('security') - if not security: # responder can not verify our fingerprint - self.use_security = False - else: - fingerprint = security.getTag('fingerprint') - if fingerprint: - fingerprint = fingerprint.getData() - self.x509_fingerprint = fingerprint - if not jingle_xtls.check_cert(app.get_jid_without_resource( - self.session.responder), fingerprint): - id_ = jingle_xtls.send_cert_request(con, - self.session.responder) - jingle_xtls.key_exchange_pend(id_, - self.continue_session_accept, - [stanza]) - raise nbxmpp.NodeProcessed - self.continue_session_accept(stanza) - - def continue_session_accept(self, stanza: nbxmpp.Node) -> None: if self.state == State.TRANSPORT_REPLACE: # If we are requesting we don't have the file if self.session.werequest: @@ -371,16 +333,12 @@ def continue_session_accept(self, stanza: nbxmpp.Node) -> None: host['initiator'] = self.session.initiator host['target'] = self.session.responder host['sid'] = self.file_props.sid - fingerprint = None - if self.use_security: - fingerprint = 'client' if self.transport.type_ == TransportType.SOCKS5: sid = self.file_props.transport_sid app.socks5queue.connect_to_hosts(self.session.connection.name, sid, self.on_connect, self._on_connect_error, - fingerprint=fingerprint, receiving=False) raise nbxmpp.NodeProcessed self.__state_changed(State.TRANSFERRING) @@ -550,15 +508,11 @@ def _listen_host(self) -> None: receiver) self.file_props.sha_str = sha_str port = app.settings.get('file_transfers_port') - fingerprint = None - if self.use_security: - fingerprint = 'server' listener = app.socks5queue.start_listener( port, sha_str, self._store_socks5_sid, self.file_props, - fingerprint=fingerprint, typ='sender' if self.weinitiate else 'receiver') if not listener: # send error message, notify the user ===================================== gajim/common/jingle_ftstates.py ===================================== @@ -61,14 +61,11 @@ def action(self, args: Optional[dict[str, Any]] = None) -> None: self.jft._listen_host() # Listen on configured port for file transfer else: - fingerprint = None - if self.jft.use_security: - fingerprint = 'client' # Connect to the candidate host, on success call on_connect method app.socks5queue.connect_to_hosts( self.jft.session.connection.name, self.jft.file_props.transport_sid, self.jft.on_connect, - self.jft._on_connect_error, fingerprint=fingerprint) + self.jft._on_connect_error) class StateCandSent(JingleFileTransferStates): @@ -211,13 +208,13 @@ def _start_sock5_transfer(self) -> None: app.socks5queue, _sock=None, host=str(streamhost_used['host']), port=int(streamhost_used['port']), - fingerprint=None, connected=False, + connected=False, file_props=self.jft.file_props) else: sockobj = Socks5ReceiverClient( app.idlequeue, streamhost_used, transport_sid=self.jft.file_props.transport_sid, - file_props=self.jft.file_props, fingerprint=None) + file_props=self.jft.file_props) sockobj.proxy = True sockobj.streamhost = streamhost_used app.socks5queue.add_sockobj(self.jft.session.connection.name, ===================================== gajim/common/jingle_xtls.py deleted ===================================== @@ -1,300 +0,0 @@ -# This file is part of Gajim. -# -# Gajim is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published -# by the Free Software Foundation; version 3 only. -# -# Gajim is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Gajim. If not, see <http://www.gnu.org/licenses/>. - -import logging -from pathlib import Path - -from OpenSSL import SSL, crypto - -import nbxmpp -from nbxmpp.namespaces import Namespace -from nbxmpp.util import generate_id -from gajim.common import app -from gajim.common import configpaths - -log = logging.getLogger('gajim.c.jingle_xtls') - -# key-exchange id -> [callback, args] -# accept that session once key-exchange completes -pending_contents = {} - - -def key_exchange_pend(id_, cb, args): - # args is a list - pending_contents[id_] = [cb, args] - - -def approve_pending_content(id_): - cb = pending_contents[id_][0] - args = pending_contents[id_][1] - cb(*args) - - -TYPE_RSA = crypto.TYPE_RSA -TYPE_DSA = crypto.TYPE_DSA - -SELF_SIGNED_CERTIFICATE = 'localcert' -DH_PARAMS = 'dh_params.pem' -DEFAULT_DH_PARAMS = 'dh4096.pem' - - -def default_callback(connection, certificate, error_num, depth, return_code): - log.info('certificate: %s', certificate) - return return_code - - -def load_cert_file(cert_path, cert_store=None): - ''' - This is almost identical to the one in nbxmpp.tls_nb - ''' - if not cert_path.is_file(): - return None - try: - f = open(cert_path, 'r', encoding='utf8') - except IOError as e: - log.warning('Unable to open certificate file %s: %s', cert_path, - str(e)) - return None - lines = f.readlines() - i = 0 - begin = -1 - for line in lines: - if 'BEGIN CERTIFICATE' in line: - begin = i - elif 'END CERTIFICATE' in line and begin > -1: - cert = ''.join(lines[begin:i + 2]) - try: - x509cert = crypto.load_certificate(crypto.FILETYPE_PEM, cert) - if cert_store: - cert_store.add_cert(x509cert) - f.close() - return x509cert - except crypto.Error as exception_obj: - log.warning('Unable to load a certificate from file %s: %s', - cert_path, exception_obj.args[0][0][2]) - except Exception: - log.warning('Unknown error while loading certificate from file ' - '%s', cert_path) - begin = -1 - i += 1 - f.close() - - -def get_context(fingerprint, verify_cb=None, remote_jid=None): - ''' - constructs and returns the context objects - ''' - ctx = SSL.Context(SSL.SSLv23_METHOD) - flags = (SSL.OP_NO_SSLv2 | SSL.OP_NO_SSLv3 | SSL.OP_SINGLE_DH_USE | - SSL.OP_NO_TICKET) - ctx.set_options(flags) - ctx.set_cipher_list(b'HIGH:!aNULL:!3DES') - - if fingerprint == 'server': # for testing purposes only - ctx.set_verify(SSL.VERIFY_NONE | SSL.VERIFY_FAIL_IF_NO_PEER_CERT, - verify_cb or default_callback) - elif fingerprint == 'client': - ctx.set_verify(SSL.VERIFY_PEER, verify_cb or default_callback) - - cert_name = configpaths.get('MY_CERT') / SELF_SIGNED_CERTIFICATE - ctx.use_privatekey_file(str(cert_name.with_suffix('.pkey')).encode('utf-8')) - ctx.use_certificate_file( - str(cert_name.with_suffix('.cert')).encode('utf-8')) - - # Try to load Diffie-Hellman parameters. - # First try user DH parameters, if this fails load the default DH parameters - dh_params_name = configpaths.get('MY_CERT') / DH_PARAMS - try: - with open(dh_params_name, 'r', encoding='utf8'): - ctx.load_tmp_dh(dh_params_name.encode('utf-8')) - except FileNotFoundError: - default_dh_params_name = (configpaths.get('DATA') / 'other' / - DEFAULT_DH_PARAMS) - try: - with open(default_dh_params_name, 'r', encoding='utf8'): - ctx.load_tmp_dh(str(default_dh_params_name).encode('utf-8')) - except FileNotFoundError as err: - log.error('Unable to load default DH parameter file: %s, %s', - default_dh_params_name, err) - raise - - if remote_jid: - store = ctx.get_cert_store() - path = configpaths.get('MY_PEER_CERTS').expanduser() - path = path / f'{remote_jid}.cert' - if path.exists(): - load_cert_file(path, cert_store=store) - log.debug('certificate file %s loaded fingerprint %s', - path, fingerprint) - return ctx - - -def read_cert(certpath): - certificate = '' - with open(certpath, 'r', encoding='utf8') as certfile: - for line in certfile.readlines(): - if not line.startswith('-'): - certificate += line - return certificate - - -def send_cert(con, jid_from, sid): - certpath = configpaths.get('MY_CERT') / f'{SELF_SIGNED_CERTIFICATE}.cert' - certificate = read_cert(certpath) - iq = nbxmpp.Iq('result', to=jid_from) - iq.setAttr('id', sid) - - pubkey = iq.setTag('pubkeys') - pubkey.setNamespace(Namespace.PUBKEY_PUBKEY) - - keyinfo = pubkey.setTag('keyinfo') - name = keyinfo.setTag('name') - name.setData('CertificateHash') - cert = keyinfo.setTag('x509cert') - cert.setData(certificate) - - con.send(iq) - - -def handle_new_cert(con, obj, jid_from): - jid = app.get_jid_without_resource(jid_from) - certpath = configpaths.get('MY_PEER_CERTS').expanduser() / (jid + '.cert') - - id_ = obj.getAttr('id') - - x509cert = obj.getTag('pubkeys').getTag('keyinfo').getTag('x509cert') - - cert = x509cert.getData() - - f = open(certpath, 'w', encoding='utf8') - f.write('-----BEGIN CERTIFICATE-----\n') - f.write(cert) - f.write('-----END CERTIFICATE-----\n') - f.close() - - approve_pending_content(id_) - - -def check_cert(jid, fingerprint): - certpath = configpaths.get('MY_PEER_CERTS').expanduser() / (jid + '.cert') - if certpath.exists(): - cert = load_cert_file(certpath) - if cert: - digest_algo = cert.get_signature_algorithm() - digest_algo = digest_algo.decode('utf-8').split('With')[0] - if cert.digest(digest_algo) == fingerprint: - return True - return False - - -def send_cert_request(con, to_jid): - iq = nbxmpp.Iq('get', to=to_jid) - id_ = generate_id() - iq.setAttr('id', id_) - pubkey = iq.setTag('pubkeys') - pubkey.setNamespace(Namespace.PUBKEY_PUBKEY) - con.connection.send(iq) - return str(id_) - -# the following code is partly due to pyopenssl examples - - -def createKeyPair(type_, bits): - ''' - Create a public/private key pair. - - Arguments: type_ - Key type, must be one of TYPE_RSA and TYPE_DSA - bits - Number of bits to use in the key - Returns: The public/private key pair in a PKey object - ''' - pkey = crypto.PKey() - pkey.generate_key(type_, bits) - return pkey - - -def createCertRequest(pkey, digest='sha256', **name): - ''' - Create a certificate request. - - Arguments: pkey - The key to associate with the request - digest - Digestion method to use for signing, default is sha256 - **name - The name of the subject of the request, possible - arguments are: - C - Country name - ST - State or province name - L - Locality name - O - Organization name - OU - Organizational unit name - CN - Common name - emailAddress - E-mail address - Returns: The certificate request in an X509Req object - ''' - req = crypto.X509Req() - subj = req.get_subject() - - for (key, value) in name.items(): - setattr(subj, key, value) - - req.set_pubkey(pkey) - req.sign(pkey, digest) - return req - - -def createCertificate(req, issuerCert, issuerKey, serial, notBefore, notAfter, - digest='sha256'): - ''' - Generate a certificate given a certificate request. - - Arguments: req - Certificate request to use - issuerCert - The certificate of the issuer - issuerKey - The private key of the issuer - serial - Serial number for the certificate - notBefore - Timestamp (relative to now) when the certificate - starts being valid - notAfter - Timestamp (relative to now) when the certificate - stops being valid - digest - Digest method to use for signing, default is sha256 - Returns: The signed certificate in an X509 object - ''' - cert = crypto.X509() - cert.set_serial_number(serial) - cert.gmtime_adj_notBefore(notBefore) - cert.gmtime_adj_notAfter(notAfter) - cert.set_issuer(issuerCert.get_subject()) - cert.set_subject(req.get_subject()) - cert.set_pubkey(req.get_pubkey()) - cert.sign(issuerKey, digest) - return cert - - -def make_certs(filepath, CN): - ''' - make self signed certificates - filepath : absolute path of certificate file, will be appended the '.pkey' - and '.cert' extensions - CN : common name - ''' - key = createKeyPair(TYPE_RSA, 4096) - req = createCertRequest(key, CN=CN) - # five years - cert = createCertificate(req, req, key, 0, 0, 60 * 60 * 24 * 365 * 5) - with open(filepath.with_suffix('.pkey'), 'wb') as f: - filepath.with_suffix('.pkey').chmod(0o600) - f.write(crypto.dump_privatekey(crypto.FILETYPE_PEM, key)) - with open(filepath.with_suffix('.cert'), 'wb') as f: - f.write(crypto.dump_certificate(crypto.FILETYPE_PEM, cert)) - - -if __name__ == '__main__': - make_certs(Path('selfcert'), 'gajim') ===================================== gajim/common/modules/bytestream.py ===================================== @@ -43,7 +43,6 @@ from gajim.common import app from gajim.common import helpers -from gajim.common import jingle_xtls from gajim.common import types from gajim.common.events import FileRequestError from gajim.common.file_props import FileProp @@ -165,16 +164,6 @@ def send_file_approval(self, file_props: FileProp) -> None: if not session.accepted: content = session.get_content('file', content.name) - if content.use_security: - fingerprint = content.x509_fingerprint - if not jingle_xtls.check_cert( - app.get_jid_without_resource(file_props.sender), - fingerprint): - id_ = jingle_xtls.send_cert_request( - self._con, file_props.sender) - jingle_xtls.key_exchange_pend(id_, - content.on_cert_received, []) - return session.approve_session() session.approve_content('file', content.name) @@ -747,7 +736,6 @@ def _on_bytestream_result(self, _sock=None, host=str(proxy['host']), port=int(proxy['port']), - fingerprint=None, connected=False, file_props=file_props) sender.streamhost = proxy ===================================== gajim/common/modules/jingle.py ===================================== @@ -42,7 +42,6 @@ from nbxmpp.structs import IqProperties from gajim.common import helpers -from gajim.common import jingle_xtls from gajim.common import types from gajim.common.file_props import FileProp from gajim.common.modules.base import BaseModule @@ -71,14 +70,6 @@ def __init__(self, con: types.Client) -> None: typ='set', ns=Namespace.JINGLE, callback=self._on_jingle_iq), - StanzaHandler(name='iq', - typ='get', - ns=Namespace.PUBKEY_PUBKEY, - callback=self._on_pubkey_request), - StanzaHandler(name='iq', - typ='result', - ns=Namespace.PUBKEY_PUBKEY, - callback=self._pubkey_result_received), ] # dictionary: sessionid => JingleSession object @@ -100,26 +91,6 @@ def delete_jingle_session(self, sid: str) -> None: self._sessions[sid].callbacks = [] del self._sessions[sid] - def _on_pubkey_request(self, - con: types.xmppClient, - stanza: Iq, - _properties: IqProperties - ) -> None: - jid_from = helpers.get_full_jid_from_iq(stanza) - self._log.info('Pubkey request from %s', jid_from) - sid = stanza.getAttr('id') - jingle_xtls.send_cert(con, jid_from, sid) - raise nbxmpp.NodeProcessed - - def _pubkey_result_received(self, - con: types.xmppClient, - stanza: Iq, - _properties: IqProperties - ) -> None: - jid_from = helpers.get_full_jid_from_iq(stanza) - self._log.info('Pubkey result from %s', jid_from) - jingle_xtls.handle_new_cert(con, stanza, jid_from) - def _on_jingle_iq(self, _con: types.xmppClient, stanza: Iq, @@ -236,7 +207,6 @@ def start_file_transfer(self, ) -> Optional[str]: logger.info('start file transfer with file: %s', file_props) contact = self._con.get_module('Contacts').get_contact(jid) - use_security = contact.supports(Namespace.JINGLE_XTLS) jingle = JingleSession(self._con, weinitiate=True, jid=jid, @@ -261,7 +231,6 @@ def start_file_transfer(self, transfer = JingleFileTransfer(jingle, transport=transport, file_props=file_props, - use_security=use_security, senders=senders) file_props.transport_sid = transport.sid file_props.algo = self.__hash_support(contact) ===================================== gajim/common/socks5.py ===================================== @@ -33,11 +33,9 @@ from errno import EAFNOSUPPORT from nbxmpp.idlequeue import IdleObject -import OpenSSL from gajim.common.file_props import FilesProp from gajim.common import app -from gajim.common import jingle_xtls log = logging.getLogger('gajim.c.socks5') MAX_BUFF_LEN = 65536 @@ -77,7 +75,7 @@ def __init__(self, idlequeue, complete_transfer_cb=None, self.on_failure = {} # {id: cb} def start_listener(self, port, sha_str, sha_handler, file_props, - fingerprint=None, typ='sender'): + typ='sender'): """ Start waiting for incoming connections on (host, port) and do a socks5 authentication using sid for generated SHA @@ -86,8 +84,7 @@ def start_listener(self, port, sha_str, sha_handler, file_props, sid = file_props.sid self.sha_handlers[sha_str] = (sha_handler, sid) if self.listener is None or not self.listener.connections: - self.listener = Socks5Listener(self.idlequeue, port, file_props, - fingerprint=fingerprint) + self.listener = Socks5Listener(self.idlequeue, port, file_props) self.listener.queue = self self.listener.bind() else: @@ -113,7 +110,7 @@ def send_success_reply(self, file_props, streamhost): return 1 def connect_to_hosts(self, account, transport_sid, on_success=None, - on_failure=None, fingerprint=None, receiving=True): + on_failure=None, receiving=True): self.on_success[transport_sid] = on_success self.on_failure[transport_sid] = on_failure file_props = FilesProp.getFilePropByTransportSid(account, transport_sid) @@ -128,10 +125,6 @@ def connect_to_hosts(self, account, transport_sid, on_success=None, on_failure(file_props.transport_sid) # add streamhosts to the queue for streamhost in streamhosts_to_test: - if 'type' in streamhost and streamhost['type'] == 'proxy': - fp = None - else: - fp = fingerprint if receiving: if 'candidate_id' in streamhost: log.debug('Trying to connect as receiver to cid %s', @@ -141,7 +134,7 @@ def connect_to_hosts(self, account, transport_sid, on_success=None, streamhost['jid']) file_props.type_ = 'r' socks5obj = Socks5ReceiverClient(self.idlequeue, streamhost, - transport_sid, file_props, fingerprint=fp) + transport_sid, file_props) self.add_sockobj(account, socks5obj) else: if 'candidate_id' in streamhost: @@ -162,7 +155,7 @@ def connect_to_hosts(self, account, transport_sid, on_success=None, file_props.proxy_receiver = streamhost['initiator'] socks5obj = Socks5SenderClient(self.idlequeue, idx, self, _sock=None, host=str(streamhost['host']), - port=int(streamhost['port']), fingerprint=fp, + port=int(streamhost['port']), connected=False, file_props=file_props, initiator=streamhost['initiator'], target=streamhost['target']) @@ -345,7 +338,7 @@ def on_connection_accepted(self, sock, listener): if listener.file_props.type_ == 's' and \ not self.isHashInSockObjs(self.senders, sock_hash): sockobj = Socks5SenderServer(self.idlequeue, sock_hash, self, - sock[0], sock[1][0], sock[1][1], fingerprint=None, + sock[0], sock[1][0], sock[1][1], file_props=listener.file_props) self._add(sockobj, self.senders, listener.file_props, sock_hash) # Start waiting for data @@ -360,7 +353,7 @@ def on_connection_accepted(self, sock, listener): sh['target'] = None sockobj = Socks5ReceiverServer(idlequeue=self.idlequeue, streamhost=sh, transport_sid=None, - file_props=listener.file_props, fingerprint=None) + file_props=listener.file_props) self._add(sockobj, self.readers, listener.file_props, sock_hash) sockobj.set_sock(sock[0]) @@ -477,20 +470,12 @@ def __init__(self, idlequeue, host, port, initiator, target, sid): self.file = None self.connected = False self.mode = '' - self.ssl_cert = None - self.ssl_errnum = 0 def _is_connected(self): if self.state < 5: return False return True - def ssl_verify_cb(self, ssl_conn, cert, error_num, depth, return_code): - if depth == 0: - self.ssl_cert = cert - self.ssl_errnum = error_num - return True - def connect(self): """ Create the socket and plug it to the idlequeue @@ -500,17 +485,6 @@ def connect(self): for ai in self.ais: try: self._sock = socket.socket(*ai[:3]) - if self.fingerprint is not None: - if self.file_props.type_ == 's': - remote_jid = app.get_jid_without_resource( - self.file_props.receiver) - else: - remote_jid = app.get_jid_without_resource( - self.file_props.sender) - self._sock = OpenSSL.SSL.Connection( - jingle_xtls.get_context('client', - verify_cb=self.ssl_verify_cb, remote_jid=remote_jid), - self._sock) # this will not block the GUI self._sock.setblocking(False) self._server = ai[4] @@ -532,8 +506,6 @@ def do_connect(self): self._sock.connect(self._server) self._send = self._sock.send self._recv = self._sock.recv - except (OpenSSL.SSL.WantReadError, OpenSSL.SSL.WantWriteError): - pass except Exception as ee: errnum = ee.errno self.connect_timeout += 1 @@ -642,10 +614,6 @@ def receive(self): received = b'' try: add = self._recv(64) - except (OpenSSL.SSL.WantReadError, OpenSSL.SSL.WantWriteError, - OpenSSL.SSL.WantX509LookupError) as e: - log.info('SSL rehandshake request: %s', repr(e)) - raise e except Exception: add = b'' received += add @@ -659,10 +627,6 @@ def send_raw(self, raw_data): """ try: self._send(raw_data) - except (OpenSSL.SSL.WantReadError, OpenSSL.SSL.WantWriteError, - OpenSSL.SSL.WantX509LookupError) as e: - log.info('SSL rehandshake request: %s', repr(e)) - raise e except Exception: self.disconnect() return len(raw_data) @@ -683,13 +647,6 @@ def write_next(self): lenn = 0 try: lenn = self._send(buff) - except (OpenSSL.SSL.WantReadError, - OpenSSL.SSL.WantWriteError, - OpenSSL.SSL.WantX509LookupError) as err: - log.info('SSL rehandshake request: %s', repr(err)) - raise err - except OpenSSL.SSL.SysCallError: - return self._on_send_exception() except socket.error as err: if err.errno not in (EINTR, ENOBUFS, EWOULDBLOCK): return self._on_send_exception() @@ -767,10 +724,6 @@ def get_file_contents(self, timeout): return 0 try: buff = self._recv(MAX_BUFF_LEN) - except (OpenSSL.SSL.WantReadError, OpenSSL.SSL.WantWriteError, - OpenSSL.SSL.WantX509LookupError) as e: - log.info('SSL rehandshake request: %s', repr(e)) - raise e except Exception: buff = b'' current_time = time.time() @@ -825,10 +778,7 @@ def disconnect(self, *args, **kwargs): if self.queue.listener.connections == []: self.queue.listener.disconnect() try: - if isinstance(self._sock, OpenSSL.SSL.Connection): - self._sock.shutdown() - else: - self._sock.shutdown(socket.SHUT_RDWR) + self._sock.shutdown(socket.SHUT_RDWR) self._sock.close() except Exception: # socket is already closed @@ -905,12 +855,7 @@ def read_connect(self): """ Connect response: version, auth method """ - try: - buff = self._recv().decode('utf-8') - except (OpenSSL.SSL.WantReadError, OpenSSL.SSL.WantWriteError, - OpenSSL.SSL.WantX509LookupError) as e: - log.info("SSL rehandshake request: %s", repr(e)) - raise e + buff = self._recv().decode('utf-8') try: version, method = struct.unpack('!BB', buff) except Exception: @@ -943,21 +888,15 @@ class Socks5Sender(IdleObject): Class for sending file to socket over socks5 """ def __init__(self, idlequeue, sock_hash, parent, _sock, host=None, - port=None, fingerprint=None, connected=True, file_props=None): + port=None, connected=True, file_props=None): IdleObject.__init__(self) - self.fingerprint = fingerprint self.queue_idx = sock_hash self.queue = parent self.file_props = file_props self.proxy = False self._sock = _sock if _sock is not None: - if self.fingerprint is not None and not isinstance(self._sock, - OpenSSL.SSL.Connection): - self._sock = OpenSSL.SSL.Connection( - jingle_xtls.get_context('server'), _sock) - else: - self._sock.setblocking(False) + self._sock.setblocking(False) self.fd = _sock.fileno() self._recv = _sock.recv self._send = _sock.send @@ -985,11 +924,7 @@ def start_transfer(self): def set_connection_sock(self, _sock): self._sock = _sock - if self.fingerprint is not None: - self._sock = OpenSSL.SSL.Connection( - jingle_xtls.get_context('client'), _sock) - else: - self._sock.setblocking(False) + self._sock.setblocking(False) self.fd = _sock.fileno() self._recv = _sock.recv self._send = _sock.send @@ -1023,17 +958,11 @@ def disconnect(self, cb=True): class Socks5Receiver(IdleObject): - def __init__(self, idlequeue, streamhost, sid, file_props=None, - fingerprint=None): - """ - fingerprint: fingerprint of certificates we shall use, set to None if - TLS connection not desired - """ + def __init__(self, idlequeue, streamhost, sid, file_props=None): IdleObject.__init__(self) self.queue_idx = -1 self.streamhost = streamhost self.queue = None - self.fingerprint = fingerprint self.connect_timeout = 0 self.connected = False self.pauses = 0 @@ -1129,36 +1058,31 @@ def main(self): def pollin(self): self.idlequeue.remove_timeout(self.fd) if self.connected: - try: - if self.state < 5: - result = self.main() - if self.state == 4: - self.queue.result_sha(self.sha_msg, self.queue_idx) - if result == -1: - self.disconnect() - elif self.state == 5: - self.state = 7 - if self.file_props.type_ == 's': - # We wait for the end of the negotiation to - # send the file - self.idlequeue.plug_idle(self, False, False) - else: - # We plug for reading - self.idlequeue.plug_idle(self, False, True) - return - elif self.state == 7: - if self.file_props.paused: - self.file_props.continue_cb = \ - self.continue_paused_transfer - self.idlequeue.plug_idle(self, False, False) - return - self.idlequeue.set_read_timeout(self.fd, STALLED_TIMEOUT) - result = self.start_transfer() # send - self.queue.process_result(result, self) - except (OpenSSL.SSL.WantReadError, - OpenSSL.SSL.WantWriteError, - OpenSSL.SSL.WantX509LookupError): - log.info('caught SSL exception, ignored') + if self.state < 5: + result = self.main() + if self.state == 4: + self.queue.result_sha(self.sha_msg, self.queue_idx) + if result == -1: + self.disconnect() + elif self.state == 5: + self.state = 7 + if self.file_props.type_ == 's': + # We wait for the end of the negotiation to + # send the file + self.idlequeue.plug_idle(self, False, False) + else: + # We plug for reading + self.idlequeue.plug_idle(self, False, True) + return + elif self.state == 7: + if self.file_props.paused: + self.file_props.continue_cb = \ + self.continue_paused_transfer + self.idlequeue.plug_idle(self, False, False) + return + self.idlequeue.set_read_timeout(self.fd, STALLED_TIMEOUT) + result = self.start_transfer() # send + self.queue.process_result(result, self) else: self.disconnect() @@ -1173,32 +1097,26 @@ def pollout(self): self.disconnect() return self.idlequeue.remove_timeout(self.fd) - try: - if self.state == 2: # send reply with desired auth type - self.send_raw(self._get_auth_response()) - elif self.state == 4: # send positive response to the 'connect' - self.send_raw(self._get_request_buff(self.sha_msg, 0x00)) - elif self.state == 7: - if self.file_props.paused: - self.file_props.continue_cb = self.continue_paused_transfer - self.idlequeue.plug_idle(self, False, False) - return - result = self.start_transfer() # send - self.queue.process_result(result, self) - if result is None or result <= 0: - self.disconnect() - return - self.idlequeue.set_read_timeout(self.fd, STALLED_TIMEOUT) - elif self.state == 8: - self.disconnect() + if self.state == 2: # send reply with desired auth type + self.send_raw(self._get_auth_response()) + elif self.state == 4: # send positive response to the 'connect' + self.send_raw(self._get_request_buff(self.sha_msg, 0x00)) + elif self.state == 7: + if self.file_props.paused: + self.file_props.continue_cb = self.continue_paused_transfer + self.idlequeue.plug_idle(self, False, False) return - else: + result = self.start_transfer() # send + self.queue.process_result(result, self) + if result is None or result <= 0: self.disconnect() - except (OpenSSL.SSL.WantReadError, - OpenSSL.SSL.WantWriteError, - OpenSSL.SSL.WantX509LookupError): - log.info('caught SSL exception, ignored') + return + self.idlequeue.set_read_timeout(self.fd, STALLED_TIMEOUT) + elif self.state == 8: + self.disconnect() return + else: + self.disconnect() if self.state < 5: self.state += 1 # unplug and plug this time for reading @@ -1287,60 +1205,43 @@ def main(self, timeout=0): return None def send_file(self): - if self.ssl_errnum > 0: - log.error('remote certificate does not match the announced one.' - '\nSSL Error: %d\nCancelling file transfer', - self.ssl_errnum) - self.file_props.error = -12 - return -1 return super(Socks5Client, self).send_file() def pollin(self): self.idlequeue.remove_timeout(self.fd) if self.connected: - try: - if self.file_props.paused: - self.idlequeue.plug_idle(self, False, False) - return - if self.state < 5: - self.idlequeue.set_read_timeout(self.fd, CONNECT_TIMEOUT) - self.main(0) - elif self.state == 5: # wait for proxy reply - pass - elif self.file_props.type_ == 'r': - self.idlequeue.set_read_timeout(self.fd, STALLED_TIMEOUT) - result = self.start_transfer() # receive - self.queue.process_result(result, self) - except (OpenSSL.SSL.WantReadError, - OpenSSL.SSL.WantWriteError, - OpenSSL.SSL.WantX509LookupError): - log.info('caught SSL exception, ignored') + if self.file_props.paused: + self.idlequeue.plug_idle(self, False, False) return + if self.state < 5: + self.idlequeue.set_read_timeout(self.fd, CONNECT_TIMEOUT) + self.main(0) + elif self.state == 5: # wait for proxy reply + pass + elif self.file_props.type_ == 'r': + self.idlequeue.set_read_timeout(self.fd, STALLED_TIMEOUT) + result = self.start_transfer() # receive + self.queue.process_result(result, self) else: self.disconnect() def pollout(self): self.idlequeue.remove_timeout(self.fd) - try: - if self.state == 0: - self.do_connect() - return - if self.state == 1: # send initially: version and auth types - self.send_raw(self._get_auth_buff()) - elif self.state == 3: # send 'connect' request - self.send_raw(self._get_request_buff(self._get_sha1_auth())) - elif self.file_props.type_ != 'r': - if self.file_props.paused: - self.idlequeue.plug_idle(self, False, False) - return - result = self.start_transfer() # send - self.queue.process_result(result, self) + if self.state == 0: + self.do_connect() + return + if self.state == 1: # send initially: version and auth types + self.send_raw(self._get_auth_buff()) + elif self.state == 3: # send 'connect' request + self.send_raw(self._get_request_buff(self._get_sha1_auth())) + elif self.file_props.type_ != 'r': + if self.file_props.paused: + self.idlequeue.plug_idle(self, False, False) return - except (OpenSSL.SSL.WantReadError, - OpenSSL.SSL.WantWriteError, - OpenSSL.SSL.WantX509LookupError): - log.info('caught SSL exception, ignored') + result = self.start_transfer() # send + self.queue.process_result(result, self) return + self.state += 1 # unplug and plug for reading self.idlequeue.plug_idle(self, False, True) @@ -1359,55 +1260,50 @@ def pollend(self): class Socks5SenderClient(Socks5Client, Socks5Sender): def __init__(self, idlequeue, sock_hash, parent, _sock, host=None, - port=None, fingerprint=None, connected=True, file_props=None, + port=None, connected=True, file_props=None, initiator=None, target=None): Socks5Client.__init__(self, idlequeue, host, port, initiator, target, file_props.transport_sid) Socks5Sender.__init__(self, idlequeue, sock_hash, parent, _sock, - host, port, fingerprint, connected, file_props) + host, port, connected, file_props) class Socks5SenderServer(Socks5Server, Socks5Sender): def __init__(self, idlequeue, sock_hash, parent, _sock, host=None, - port=None, fingerprint=None, connected=True, file_props=None): + port=None, connected=True, file_props=None): Socks5Server.__init__(self, idlequeue, host, port, None, None, file_props.transport_sid) Socks5Sender.__init__(self, idlequeue, sock_hash, parent, _sock, - host, port, fingerprint, connected, file_props) + host, port, connected, file_props) class Socks5ReceiverClient(Socks5Client, Socks5Receiver): - def __init__(self, idlequeue, streamhost, transport_sid, file_props=None, - fingerprint=None): + def __init__(self, idlequeue, streamhost, transport_sid, file_props=None): Socks5Client.__init__(self, idlequeue, streamhost['host'], int(streamhost['port']), streamhost['initiator'], streamhost['target'], transport_sid) Socks5Receiver.__init__(self, idlequeue, streamhost, transport_sid, - file_props, fingerprint) + file_props) class Socks5ReceiverServer(Socks5Server, Socks5Receiver): - def __init__(self, idlequeue, streamhost, transport_sid, file_props=None, - fingerprint=None): + def __init__(self, idlequeue, streamhost, transport_sid, file_props=None): Socks5Server.__init__(self, idlequeue, streamhost['host'], int(streamhost['port']), streamhost['initiator'], streamhost['target'], transport_sid) Socks5Receiver.__init__(self, idlequeue, streamhost, transport_sid, - file_props, fingerprint) + file_props) class Socks5Listener(IdleObject): - def __init__(self, idlequeue, port, fp, fingerprint=None): + def __init__(self, idlequeue, port, fp): """ Handle all incoming connections on (0.0.0.0, port) This class implements IdleObject, but we will expect only pollin events though - - fingerprint: fingerprint of certificates we shall use, set to None if - TLS connection not desired """ IdleObject.__init__(self) self.port = port @@ -1420,7 +1316,6 @@ def __init__(self, idlequeue, port, fp, fingerprint=None): self.started = False self._sock = None self.fd = -1 - self.fingerprint = fingerprint self.file_props = fp self.connections = [] @@ -1429,9 +1324,6 @@ def bind(self): # try the different possibilities (ipv6, ipv4, etc.) try: self._serv = socket.socket(*ai[:3]) - if self.fingerprint is not None: - self._serv = OpenSSL.SSL.Connection( - jingle_xtls.get_context('server'), self._serv) except socket.error as e: if e.errno == EAFNOSUPPORT: self.ai = None ===================================== gajim/data/other/dh4096.pem deleted ===================================== @@ -1,21 +0,0 @@ ------BEGIN DH PARAMETERS----- -MIICCAKCAgEA///////////JD9qiIWjCNMTGYouA3BzRKQJOCIpnzHQCC76mOxOb -IlFKCHmONATd75UZs806QxswKwpt8l8UN0/hNW1tUcJF5IW1dmJefsb0TELppjft -awv/XLb0Brft7jhr+1qJn6WunyQRfEsf5kkoZlHs5Fs9wgB8uKFjvwWY2kg2HFXT -mmkWP6j9JM9fg2VdI9yjrZYcYvNWIIVSu57VKQdwlpZtZww1Tkq8mATxdGwIyhgh -fDKQXkYuNs474553LBgOhgObJ4Oi7Aeij7XFXfBvTFLJ3ivL9pVYFxg5lUl86pVq -5RXSJhiY+gUQFXKOWoqqxC2tMxcNBFB6M6hVIavfHLpk7PuFBFjb7wqK6nFXXQYM -fbOXD4Wm4eTHq/WujNsJM9cejJTgSiVhnc7j0iYa0u5r8S/6BtmKCGTYdgJzPshq -ZFIfKxgXeyAMu+EXV3phXWx3CYjAutlG4gjiT6B05asxQ9tb/OD9EI5LgtEgqSEI -ARpyPBKnh+bXiHGaEL26WyaZwycYavTiPBqUaDS2FQvaJYPpyirUTOjbu8LbBN6O -+S6O/BQfvsqmKHxZR05rwF2ZspZPoJDDoiM7oYZRW+ftH2EpcM7i16+4G912IXBI -HNAGkSfVsFqpk7TqmI2P3cGG/7fckKbAj030Nck0BjGZ//////////8CAQI= ------END DH PARAMETERS----- - -"4096-bit MODP Group" from RFC3526, Section 5. - -The prime is: 2^4096 - 2^4032 - 1 + 2^64 * { [2^3966 pi] + 240904 } - -RFC3526 specifies a generator of 2. - -The generation of the group is described in RFC 2412. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1122f23b4665e5773f256024cb85daea… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1122f23b4665e5773f256024cb85daea… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new branch remove-jingle-xtls
by Daniel Brötzmann (＠wurstsalat) 09 Nov '22

09 Nov '22

Daniel Brötzmann pushed new branch remove-jingle-xtls at gajim / gajim -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/tree/remove-jingle-xtls You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Preview: Stop further processing if decompression bomb detected
by Daniel Brötzmann (＠wurstsalat) 09 Nov '22

09 Nov '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 8e5bb40c by wurstsalat at 2022-11-09T20:32:44+01:00 fix: Preview: Stop further processing if decompression bomb detected Fixes #11280 - - - - - 1 changed file: - gajim/common/preview_helpers.py Changes: ===================================== gajim/common/preview_helpers.py ===================================== @@ -154,7 +154,12 @@ def create_thumbnail(data: bytes, mime_type: str ) -> Optional[bytes]: - thumbnail = create_thumbnail_with_pil(data, size) + try: + thumbnail = create_thumbnail_with_pil(data, size) + except (Image.DecompressionBombError, Image.DecompressionBombWarning): + # Don't try to process image further + return None + if thumbnail is not None: return thumbnail return create_thumbnail_with_pixbuf(data, size, mime_type) @@ -210,6 +215,10 @@ def create_thumbnail_with_pil(data: bytes, size: int) -> Optional[bytes]: output_file = BytesIO() try: image = Image.open(input_file) + except (Image.DecompressionBombError, + Image.DecompressionBombWarning) as error: + log.warning('Decompression bomb detected: %s', error) + raise except Exception as error: log.warning('making pil thumbnail failed: %s', error) log.warning('fallback to pixbuf') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8e5bb40c50e956d1aa58d2fa30a07528… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8e5bb40c50e956d1aa58d2fa30a07528… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][fix-event-storage] cq: Don’t redefine var from outa scope
by Philipp Hörist (＠lovetox) 08 Nov '22

08 Nov '22

Philipp Hörist pushed to branch fix-event-storage at gajim / gajim Commits: e10973a7 by Philipp Hörist at 2022-11-08T23:47:47+01:00 cq: Don’t redefine var from outa scope - - - - - 1 changed file: - gajim/common/storage/events.py Changes: ===================================== gajim/common/storage/events.py ===================================== @@ -130,12 +130,12 @@ def load(self, FROM events WHERE account=? AND jid=? {time_order} LIMIT ?'''.format(time_order=time_order) - events: list[events.ApplicationEvent] = [] + event_list: list[events.ApplicationEvent] = [] for row in self._con.execute(insert_sql, (contact.account, contact.jid, timestamp, n_lines)).fetchall(): event_class = EVENT_CLASSES[row.event] - events.append(event_class(**row.data, + event_list.append(event_class(**row.data, timestamp=row.timestamp)) - return events + return event_list View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e10973a7be9d3f639768327f2e856861… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e10973a7be9d3f639768327f2e856861… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new branch fix-event-storage
by Philipp Hörist (＠lovetox) 08 Nov '22

08 Nov '22

Philipp Hörist pushed new branch fix-event-storage at gajim / gajim -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/tree/fix-event-storage You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cfix: Preferences: Revert preview file size units
by Daniel Brötzmann (＠wurstsalat) 08 Nov '22

08 Nov '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 35b754f6 by wurstsalat at 2022-11-08T16:02:10+01:00 cfix: Preferences: Revert preview file size units - - - - - 1 changed file: - gajim/gtk/preferences.py Changes: ===================================== gajim/gtk/preferences.py ===================================== @@ -409,11 +409,11 @@ def _reset_print_status(button: Gtk.Button) -> None: class FilePreview(PreferenceBox): def __init__(self, *args: Any) -> None: sizes = { - 262144: '256 KB', - 524288: '512 KB', - 1048576: '1 MB', - 5242880: '5 MB', - 10485760: '10 MB', + 262144: '256 KiB', + 524288: '512 KiB', + 1048576: '1 MiB', + 5242880: '5 MiB', + 10485760: '10 MiB', } settings = [ View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/35b754f6d1a9ef0f0dd4712797034770… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/35b754f6d1a9ef0f0dd4712797034770… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: Preferences: Improve preview settings
by Daniel Brötzmann (＠wurstsalat) 08 Nov '22

08 Nov '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 2d6e4b5a by wurstsalat at 2022-11-08T14:27:57+01:00 imprv: Preferences: Improve preview settings - - - - - 1 changed file: - gajim/gtk/preferences.py Changes: ===================================== gajim/gtk/preferences.py ===================================== @@ -409,11 +409,11 @@ def _reset_print_status(button: Gtk.Button) -> None: class FilePreview(PreferenceBox): def __init__(self, *args: Any) -> None: sizes = { - 262144: '256 KiB', - 524288: '512 KiB', - 1048576: '1 MiB', - 5242880: '5 MiB', - 10485760: '10 MiB', + 262144: '256 KB', + 524288: '512 KB', + 1048576: '1 MB', + 5242880: '5 MB', + 10485760: '10 MB', } settings = [ @@ -426,15 +426,15 @@ def __init__(self, *args: Any) -> None: _('Preview Size'), SettingType.CONFIG, 'preview_size', - desc=_('Size of preview image'), + desc=_('Size of preview images in pixels'), bind='enable_file_preview', props={'range_': (100, 1000)}), Setting(SettingKind.POPOVER, - _('Allowed File Size'), + _('File Size Limit'), SettingType.CONFIG, 'preview_max_file_size', - desc=_('Maximum file size for preview generation'), + desc=_('Maximum file size for preview downloads'), bind='enable_file_preview', props={'entries': sizes}), @@ -442,7 +442,7 @@ def __init__(self, *args: Any) -> None: _('Preview in Public Group Chats'), SettingType.CONFIG, 'preview_anonymous_muc', - desc=_('Generate preview automatically in public ' + desc=_('Show previews automatically in public ' 'group chats (may disclose your data)'), bind='enable_file_preview'), @@ -450,7 +450,7 @@ def __init__(self, *args: Any) -> None: _('Preview all Image URLs'), SettingType.CONFIG, 'preview_allow_all_images', - desc=_('Generate preview for any URLs containing images ' + desc=_('Show previews for any URLs containing images ' '(may be unsafe)'), bind='enable_file_preview'), @@ -458,7 +458,7 @@ def __init__(self, *args: Any) -> None: _('Left Click Action'), SettingType.CONFIG, 'preview_leftclick_action', - desc=_('Action when left-clicking a preview'), + desc=_('Action for left-clicking a preview'), bind='enable_file_preview', props={'entries': PREVIEW_CLICK_ACTIONS}), @@ -466,7 +466,8 @@ def __init__(self, *args: Any) -> None: _('HTTPS Verification'), SettingType.CONFIG, 'preview_verify_https', - desc=_('Whether to check for a valid certificate'), + desc=_('Whether to check for a valid certificate before ' + 'downloading (not safe to disable)'), bind='enable_file_preview'), ] View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2d6e4b5ab4ea59312cb8105a4b09d551… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2d6e4b5ab4ea59312cb8105a4b09d551… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][omemo_integration] 31 commits: imprv: Accounts window: Use equal widths for account switch label
by Daniel Brötzmann (＠wurstsalat) 07 Nov '22

07 Nov '22

Daniel Brötzmann pushed to branch omemo_integration at gajim / gajim Commits: d08913b5 by wurstsalat at 2022-11-06T14:02:25+01:00 imprv: Accounts window: Use equal widths for account switch label - - - - - e7736e63 by Nicoco at 2022-11-06T13:20:29+00:00 imprv: Chatstates: Add a timeout for the "composing" animation - - - - - b5398fd0 by Philipp Hörist at 2022-11-06T23:44:22+01:00 refactor: Control: Simplify request history callback - - - - - 0a5e2a79 by wurstsalat at 2022-11-07T16:38:59+01:00 cq: CSS: Simplify some rules - - - - - d317dac2 by lovetox at 2022-11-07T20:57:07+01:00 Omemo Start - - - - - 2bb233d0 by wurstsalat at 2022-11-07T20:57:07+01:00 cq: OMEMO: Add type annotations - - - - - f169944c by wurstsalat at 2022-11-07T20:57:07+01:00 cq: OMEMO: Fix linting errors - - - - - 0e6122aa by wurstsalat at 2022-11-07T20:57:07+01:00 cq: Add type stubs for python-qrcode - - - - - bf37c0fb by wurstsalat at 2022-11-07T20:57:07+01:00 chore: Adapt dependencies for OMEMO - - - - - 1ca95dde by wurstsalat at 2022-11-07T20:57:07+01:00 chore: OMEMO: Remove unused methods 'activate' has a replacement in the 'signled-in' event - - - - - a2958122 by wurstsalat at 2022-11-07T20:57:07+01:00 new: Add OMEMO_TEMP_DL to caps - - - - - 705ec9ae by wurstsalat at 2022-11-07T20:57:07+01:00 new: Add OMEMOTrustManager - - - - - 8885fc86 by wurstsalat at 2022-11-07T20:57:07+01:00 new: OMEMO: Add file encryption - - - - - 1d97f6d7 by Philipp Hörist at 2022-11-07T20:57:07+01:00 chore: Update dependencies - - - - - 93c45a84 by Philipp Hörist at 2022-11-07T20:57:07+01:00 new: Block omemo plugin - - - - - 2de85651 by wurstsalat at 2022-11-07T20:57:07+01:00 chore: OMEMO: Remove obsolete qrcode version check - - - - - 80d2627b by Philipp Hörist at 2022-11-07T20:57:07+01:00 refactor: Move omemo storage to storage module - - - - - 0de9f662 by Philipp Hörist at 2022-11-07T20:57:07+01:00 refactor: Move omemo code into common - - - - - 289521b0 by Philipp Hörist at 2022-11-07T20:57:07+01:00 cq: Fix linter errors - - - - - 94d39725 by wurstsalat at 2022-11-07T20:57:07+01:00 new: OMEMO: Add handling of MucAdded signal - - - - - ece71420 by wurstsalat at 2022-11-07T20:57:07+01:00 new: OMEMO: Add EncryptionAnnouncementRow - - - - - 3b730f57 by Philipp Hörist at 2022-11-07T20:57:07+01:00 fix: check preconditions - - - - - 299c6e04 by Philipp Hörist at 2022-11-07T20:57:07+01:00 refactor: Rename methods - - - - - ebab744e by Philipp Hörist at 2022-11-07T20:57:07+01:00 cq: Remove blank line - - - - - 48b2a65b by Philipp Hörist at 2022-11-07T20:57:07+01:00 refactor: Remove unused code - - - - - 105ffa80 by Philipp Hörist at 2022-11-07T20:57:07+01:00 refactor: Use send_stanza method - - - - - 49b56fb5 by Philipp Hörist at 2022-11-07T20:57:07+01:00 refactor: Remove devices module - - - - - 2568b470 by Philipp Hörist at 2022-11-07T20:57:07+01:00 cq: Remove unused imports - - - - - 885c7af5 by Philipp Hörist at 2022-11-07T20:57:07+01:00 refactor: Switch to new library - - - - - 7c823045 by Philipp Hörist at 2022-11-07T20:57:07+01:00 cq: Fix storage annotations - - - - - 47e16420 by Philipp Hörist at 2022-11-07T20:57:07+01:00 fix: Fix import - - - - - 30 changed files: - README.md - debian/control - flatpak/org.gajim.Gajim.Devel.yaml - flatpak/org.gajim.Gajim.yaml - gajim/common/client.py - gajim/common/const.py - gajim/common/events.py - gajim/common/modules/chatstates.py - gajim/common/modules/httpupload.py - + gajim/common/modules/omemo.py - gajim/common/modules/util.py - + gajim/common/omemo/__init__.py - + gajim/common/omemo/aes.py - + gajim/common/omemo/state.py - + gajim/common/omemo/util.py - gajim/common/setting_values.py - + gajim/common/storage/omemo.py - gajim/data/gui/contact_info.ui - gajim/data/gui/groupchat_details.ui - + gajim/data/gui/omemo_trust_manager.ui - gajim/data/gui/preview.ui - + gajim/data/icons/hicolor/scalable/categories/qr-code-scan-symbolic.svg - gajim/data/style/gajim.css - gajim/gtk/accounts.py - gajim/gtk/builder.pyi - gajim/gtk/chat_stack.py - gajim/gtk/contact_info.py - gajim/gtk/contact_settings.py - gajim/gtk/control.py - + gajim/gtk/conversation/rows/encryption_info.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/38c9a7e08dfad4c050216457f36de8d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/38c9a7e08dfad4c050216457f36de8d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][filetransfer-page] 6 commits: imprv: Accounts window: Use equal widths for account switch label
by Daniel Brötzmann (＠wurstsalat) 07 Nov '22

07 Nov '22

Daniel Brötzmann pushed to branch filetransfer-page at gajim / gajim Commits: d08913b5 by wurstsalat at 2022-11-06T14:02:25+01:00 imprv: Accounts window: Use equal widths for account switch label - - - - - e7736e63 by Nicoco at 2022-11-06T13:20:29+00:00 imprv: Chatstates: Add a timeout for the "composing" animation - - - - - b5398fd0 by Philipp Hörist at 2022-11-06T23:44:22+01:00 refactor: Control: Simplify request history callback - - - - - 0a5e2a79 by wurstsalat at 2022-11-07T16:38:59+01:00 cq: CSS: Simplify some rules - - - - - fef03e8c by wurstsalat at 2022-11-07T20:54:19+01:00 change: Add FileTransferSelector as a central page for sending files Fixes #9511 - - - - - 5f0240d9 by wurstsalat at 2022-11-07T20:54:24+01:00 other: Remove obsolete FileTransferSend dialog - - - - - 24 changed files: - gajim/common/events.py - gajim/common/modules/chatstates.py - gajim/common/modules/httpupload.py - gajim/data/gui/file_transfer_send.ui → gajim/data/gui/file_transfer_selector.ui - gajim/data/gui/message_actions_box.ui - gajim/data/gui/preview.ui - gajim/data/style/gajim.css - gajim/gtk/accounts.py - gajim/gtk/builder.pyi - gajim/gtk/chat_function_page.py - gajim/gtk/chat_stack.py - gajim/gtk/const.py - gajim/gtk/contact_settings.py - gajim/gtk/control.py - + gajim/gtk/file_transfer_selector.py - − gajim/gtk/file_transfer_send.py - gajim/gtk/filetransfer.py - gajim/gtk/groupchat_settings.py - gajim/gtk/main.py - gajim/gtk/menus.py - gajim/gtk/message_actions_box.py - gajim/gtk/preferences.py - gajim/gtk/preview_audio.py - gajim/gui_interface.py Changes: ===================================== gajim/common/events.py ===================================== @@ -44,9 +44,9 @@ if typing.TYPE_CHECKING: from gajim.common.client import Client + from gajim.common.modules.httpupload import HTTPFileTransfer from gajim.plugins.pluginmanager import PluginManifest - ChatListEventT = Union[ 'MessageReceived', 'MamMessageReceived', @@ -237,6 +237,22 @@ class FileSendError(ApplicationEvent): error_msg: str = '' +@dataclass +class HTTPUploadStarted(ApplicationEvent): + name: str = field(init=False, default='http-upload-started') + account: str + jid: JID + transfer: HTTPFileTransfer + + +@dataclass +class HTTPUploadError(ApplicationEvent): + name: str = field(init=False, default='http-upload-error') + account: str + jid: JID + error_msg: str + + @dataclass class AccountEnabled(ApplicationEvent): name: str = field(init=False, default='account-enabled') ===================================== gajim/common/modules/chatstates.py ===================================== @@ -20,6 +20,7 @@ from typing import Optional import time +from itertools import chain from functools import wraps from nbxmpp.namespaces import Namespace @@ -41,6 +42,7 @@ INACTIVE_AFTER = 60 PAUSED_AFTER = 10 +REMOTE_PAUSED_AFTER = 30 def ensure_enabled(func: Any) -> Any: @@ -78,6 +80,8 @@ def __init__(self, con: types.Client) -> None: # The current chatstate we received from a contact self._remote_chatstate: dict[JID, State] = {} + self._remote_chatstate_composing_timeouts: dict[JID, int] = {} + self._last_keyboard_activity: dict[JID, float] = {} self._last_mouse_activity: dict[JID, float] = {} self._timeout_id = None @@ -162,17 +166,42 @@ def _process_chatstate(self, properties.is_carbon_message and properties.carbon.is_sent): return - assert properties.jid is not None - self._remote_chatstate[properties.jid] = properties.chatstate + jid = properties.jid + assert jid is not None - self._log.info('Recv: %-10s - %s', properties.chatstate, properties.jid) + state = properties.chatstate + self._remote_chatstate[jid] = state - contact = self._get_contact(properties.jid) + self._log.info('Recv: %-10s - %s', state, jid) + + contact = self._get_contact(jid) if contact is None: return + self._remove_remote_composing_timeout(contact) + if state == State.COMPOSING: + # the spec does not cover any timeout for the composing action, + # but if a contact's client does not send another chat state, + # we don't want the GUI to show that they are "composing" forever + self._remote_chatstate_composing_timeouts[jid] = \ + GLib.timeout_add_seconds(REMOTE_PAUSED_AFTER, + self._on_remote_composing_timeout, + contact) + + contact.notify('chatstate-update') + + def _on_remote_composing_timeout(self, contact: types.ContactT): + self._log.info( + 'Automatically switching the chat state of %s to PAUSED', contact) + self._remote_chatstate[contact.jid] = State.PAUSED contact.notify('chatstate-update') + def _remove_remote_composing_timeout(self, contact: types.ContactT): + source_id = self._delay_timeout_ids.pop(contact.jid, None) + if source_id is not None: + self._log.debug('Removing remote composing timeout of %s', contact) + GLib.source_remove(source_id) + @ensure_enabled def _check_last_interaction(self) -> bool: now = time.time() @@ -361,13 +390,16 @@ def remove_delay_timeout(self, contact: types.ChatContactT) -> None: GLib.source_remove(timeout) del self._delay_timeout_ids[contact.jid] - def remove_all_delay_timeouts(self) -> None: - for timeout in self._delay_timeout_ids.values(): + def remove_all_timeouts(self) -> None: + for timeout in chain( + self._delay_timeout_ids.values(), + self._remote_chatstate_composing_timeouts.values()): GLib.source_remove(timeout) self._delay_timeout_ids.clear() + self._remote_chatstate_composing_timeouts.clear() def cleanup(self) -> None: - self.remove_all_delay_timeouts() + self.remove_all_timeouts() if self._timeout_id is not None: GLib.source_remove(self._timeout_id) self._timeout_id = None ===================================== gajim/common/modules/httpupload.py ===================================== @@ -25,6 +25,7 @@ from urllib.parse import urlparse import mimetypes from collections import defaultdict +from pathlib import Path from nbxmpp.errors import StanzaError from nbxmpp.errors import MalformedStanzaError @@ -42,6 +43,8 @@ from gajim.common import app from gajim.common import types +from gajim.common.events import HTTPUploadError +from gajim.common.events import HTTPUploadStarted from gajim.common.i18n import _ from gajim.common.helpers import get_tls_error_phrase from gajim.common.helpers import get_account_proxy @@ -49,6 +52,7 @@ from gajim.common.filetransfer import FileTransfer from gajim.common.modules.base import BaseModule from gajim.common.exceptions import FileError +from gajim.common.structs import OutgoingMessage class HTTPUpload(BaseModule): @@ -105,18 +109,44 @@ def get_running_transfers(self, return self._running_transfers.get((contact.account, contact.jid)) - def make_transfer(self, - path: str, - encryption: Optional[str], - contact: types.ContactT, - groupchat: bool = False - ) -> HTTPFileTransfer: - if not path or not os.path.exists(path): + def send_file(self, contact: types.ChatContactT, path: Path) -> None: + encryption = contact.settings.get('encryption') or None + + try: + transfer = self._make_transfer( + path, + encryption, + contact) + except FileError as error: + event = HTTPUploadError( + contact.account, + contact.jid, + _('Could not open file (%s)') % str(error)) + app.ged.raise_event(event) + return + + transfer.connect('cancel', self._on_cancel_upload) + transfer.connect('state-changed', self._on_http_upload_state_changed) + + event = HTTPUploadStarted( + contact.account, + contact.jid, + transfer) + app.ged.raise_event(event) + self._start_transfer(transfer) + + def _make_transfer(self, + path: Path, + encryption: Optional[str], + contact: types.ChatContactT, + ) -> HTTPFileTransfer: + + if not path or not path.exists(): raise FileError(_('Could not access file')) invalid_file = False msg = '' - stat = os.stat(path) + stat = path.stat() if os.path.isfile(path): if stat[6] == 0: @@ -143,18 +173,43 @@ def make_transfer(self, self._log.info('Detected MIME type of file: %s', mime) transfer = HTTPFileTransfer(self._account, - path, + str(path), contact, mime, encryption, - groupchat) + contact.is_groupchat) key = (contact.account, contact.jid) self._running_transfers[key].add(transfer) return transfer - def cancel_transfer(self, transfer: HTTPFileTransfer) -> None: + def _on_http_upload_state_changed(self, + transfer: HTTPFileTransfer, + _signal_name: str, + state: FTState + ) -> None: + + if state.is_finished: + uri = transfer.get_transformed_uri() + + type_ = 'chat' + if transfer.is_groupchat: + type_ = 'groupchat' + + message = OutgoingMessage(account=transfer.account, + contact=transfer.contact, + message=uri, + type_=type_, + oob_url=uri) + + self._client.send_message(message) + + def _on_cancel_upload(self, + transfer: HTTPFileTransfer, + _signal_name: str + ) -> None: + transfer.set_cancelled() key = (transfer.account, transfer.contact.jid) @@ -166,14 +221,14 @@ def cancel_transfer(self, transfer: HTTPFileTransfer) -> None: self._session.cancel_message(message, Soup.Status.CANCELLED) - def start_transfer(self, transfer: HTTPFileTransfer) -> None: + def _start_transfer(self, transfer: HTTPFileTransfer) -> None: if transfer.encryption is not None and not transfer.is_encrypted: transfer.set_encrypting() plugin = app.plugin_manager.encryption_plugins[transfer.encryption] if hasattr(plugin, 'encrypt_file'): plugin.encrypt_file(transfer, self._account, - self.start_transfer) + self._start_transfer) else: transfer.set_error('encryption-not-available') ===================================== gajim/data/gui/file_transfer_send.ui → gajim/data/gui/file_transfer_selector.ui ===================================== @@ -1,107 +1,85 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.24"/> - <object class="GtkStack" id="send_stack"> + <object class="GtkBox" id="file_box"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="transition-type">slide-left-right</property> + <property name="spacing">12</property> <child> - <object class="GtkBox"> + <object class="GtkBox" id="preview_image_box"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="border-width">18</property> + <property name="valign">center</property> <property name="orientation">vertical</property> - <property name="spacing">6</property> <child> - <object class="GtkLabel"> + <object class="GtkImage" id="preview_image"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="label" translatable="yes">Files to send</property> - <property name="xalign">0</property> + <property name="icon_size">6</property> <style> - <class name="dim-label"/> + <class name="preview-image"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">3</property> + <child> + <object class="GtkLabel" id="file_name_label"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="ellipsize">end</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkScrolledWindow"> + <object class="GtkLabel" id="file_size_label"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="hscrollbar-policy">never</property> - <property name="shadow-type">in</property> - <child> - <object class="GtkViewport"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <child> - <object class="GtkListBox" id="listbox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="vexpand">True</property> - <property name="selection-mode">multiple</property> - <property name="activate-on-single-click">False</property> - <signal name="add" handler="_on_files_changed" swapped="no"/> - <signal name="remove" handler="_on_files_changed" swapped="no"/> - </object> - </child> - </object> - </child> + <property name="can-focus">False</property> + <style> + <class name="dim-label"/> + </style> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkToolbar"> - <property name="visible">True</property> + <object class="GtkLabel" id="warning_label"> <property name="can-focus">False</property> - <property name="show-arrow">False</property> - <property name="icon_size">1</property> - <child> - <object class="GtkToolButton"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="tooltip-text" translatable="yes">Add Files</property> - <property name="use-underline">True</property> - <property name="icon-name">list-add-symbolic</property> - <signal name="clicked" handler="_select_files" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> - <object class="GtkToolButton"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="tooltip-text" translatable="yes">Remove Files</property> - <property name="use-underline">True</property> - <property name="icon-name">list-remove-symbolic</property> - <signal name="clicked" handler="_remove_files" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> + <property name="no-show-all">True</property> + <property name="ellipsize">end</property> + <property name="xalign">0</property> <style> - <class name="inline-toolbar"/> + <class name="warning-color"/> </style> </object> <packing> @@ -114,89 +92,143 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="remove_file_button"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Remove</property> + <property name="valign">center</property> <child> - <object class="GtkLabel"> + <object class="GtkImage"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="label" translatable="yes">Description</property> - <property name="xalign">0</property> - <style> - <class name="dim-label"/> - </style> + <property name="icon-name">list-remove-symbolic</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + <object class="GtkStack" id="stack"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="transition-type">slide-left-right</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">12</property> <child> <object class="GtkScrolledWindow"> - <property name="height-request">70</property> + <property name="width-request">500</property> + <property name="height-request">350</property> <property name="visible">True</property> <property name="can-focus">True</property> <property name="hscrollbar-policy">never</property> <property name="shadow-type">in</property> <child> - <object class="GtkTextView" id="description"> + <object class="GtkViewport"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="wrap-mode">word-char</property> - <property name="left-margin">6</property> - <property name="right-margin">6</property> - <property name="top-margin">6</property> - <property name="bottom-margin">6</property> + <property name="can-focus">False</property> + <child> + <object class="GtkListBox" id="listbox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="selection-mode">none</property> + <property name="activate-on-single-click">False</property> + <signal name="add" handler="_on_files_changed" swapped="no"/> + <signal name="remove" handler="_on_files_changed" swapped="no"/> + <child type="placeholder"> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="orientation">vertical</property> + <property name="spacing">18</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">Drop files here</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <style> + <class name="dnd-area"/> + </style> + </object> + </child> + <style> + <class name="gajim-listbox"/> + </style> + </object> + </child> </object> </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">1</property> </packing> </child> <child> - <object class="GtkButton" id="files_send"> - <property name="label" translatable="yes">_Send Files</property> + <object class="GtkButton"> + <property name="label" translatable="yes">Add Files…</property> <property name="visible">True</property> - <property name="sensitive">False</property> <property name="can-focus">True</property> <property name="receives-default">True</property> <property name="halign">center</property> - <property name="use-underline">True</property> - <signal name="clicked" handler="_on_send_clicked" swapped="no"/> - <style> - <class name="suggested-action"/> - </style> + <signal name="clicked" handler="_on_choose_files_clicked" swapped="no"/> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">2</property> </packing> </child> </object> <packing> - <property name="name">file_selection</property> + <property name="name">file-selection</property> </packing> </child> <child> <object class="GtkBox" id="resource_box"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="border-width">18</property> <property name="orientation">vertical</property> - <property name="spacing">6</property> + <property name="spacing">18</property> <child> <object class="GtkLabel"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="label" translatable="yes">Choose Device</property> <style> - <class name="large-header"/> + <class name="bold16"/> </style> </object> <packing> @@ -205,27 +237,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="GtkButton" id="resource_send"> - <property name="label" translatable="yes">_Send Files</property> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="halign">center</property> - <property name="use-underline">True</property> - <signal name="clicked" handler="_on_send_to_resource" swapped="no"/> - <style> - <class name="suggested-action"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack-type">end</property> - <property name="position">1</property> - </packing> - </child> <child> <object class="GtkLabel" id="resource_instructions"> <property name="visible">True</property> @@ -240,7 +251,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> <child> @@ -248,7 +259,7 @@ </child> </object> <packing> - <property name="name">resource_selection</property> + <property name="name">resource-selection</property> <property name="position">1</property> </packing> </child> ===================================== gajim/data/gui/message_actions_box.ui ===================================== @@ -117,6 +117,7 @@ <property name="focus-on-click">False</property> <property name="receives-default">True</property> <property name="action-name">win.send-file</property> + <property name="action-target">['']</property> <property name="relief">none</property> <child> <object class="GtkImage"> ===================================== gajim/data/gui/preview.ui ===================================== @@ -99,7 +99,7 @@ </object> </child> <style> - <class name="preview-button"/> + <class name="border"/> <class name="flat"/> </style> </object> @@ -203,7 +203,7 @@ </object> </child> <style> - <class name="preview-button"/> + <class name="border"/> <class name="flat"/> </style> </object> @@ -237,7 +237,7 @@ </object> </child> <style> - <class name="preview-button"/> + <class name="border"/> <class name="flat"/> </style> </object> @@ -271,7 +271,7 @@ </object> </child> <style> - <class name="preview-button"/> + <class name="border"/> <class name="flat"/> </style> </object> ===================================== gajim/data/style/gajim.css ===================================== @@ -637,9 +637,6 @@ .preview-image-button:hover { text-shadow: none; box-shadow: none; } -.preview-button { - border: 1px solid @borders; -} /* Conversation meta elements */ .conversation-meta { @@ -760,16 +757,22 @@ .emoji-modifier-chooser-flowbox { padding-left: 5px; } /* Settings widgets ======================================================== */ /* SettingsBox */ -.settings-box > row { border-bottom: 1px solid; border-color: @theme_unfocused_bg_color; } +.settings-box > row { + border-bottom: 1px solid @theme_unfocused_bg_color; +} .settings-box > row:last-child { border-bottom: 0px; } .settings-box > row.activatable:active { box-shadow: none; } .settings-box > row { padding: 10px 20px 10px 10px; } .settings-box > row:not(.activatable) label { color: @insensitive_fg_color; } +.settings-stack > box, +.settings-stack viewport > box { + margin: 30px 25px; +} + window.settings-dialog row { border-bottom: 0px; } - window.settings-dialog list { background: transparent; margin: 12px; @@ -788,10 +791,10 @@ .PopoverButtonListbox > list > row.activatable:active { box-shadow: none; backgr /* Settings ListBox */ list.settings { - border: @borders 1px solid; + border: 1px solid @borders; } list.settings > row:not(:last-child) { - border-bottom: @theme_unfocused_bg_color 1px solid; + border-bottom: 1px solid @theme_unfocused_bg_color; } list.settings row { min-height: 52px; } list.settings > row > box { @@ -829,17 +832,6 @@ popover.combo scrollbar.vertical { padding-bottom: 2px; } -.settings-stack viewport > box { - margin-left: 30px; - margin-right: 30px; - margin-bottom: 10px; - margin-top: 25px; -} -.settings-border { - border: 1px solid; - border-color: @borders; -} - /* Dialogs ================================================================= */ /* ProfileWindow */ @@ -922,13 +914,14 @@ #FeaturesInfoGrid > list > row { padding: 10px 20px 10px 10px; } #FeaturesInfoGrid > list > label { padding:10px; color: @insensitive_fg_color; font-weight: bold; } #FeaturesInfoGrid > list > row.activatable:active { box-shadow: none; } -/* SendFileDialog */ -#SendFileDialog grid list > row { padding: 10px 20px 10px 10px; } - /* AccountsWindow */ -.accounts-menu { border-right: 1px solid; border-color: @borders;} -.accounts-settings-border {border: 1px solid; border-color: @borders;} -.accounts-settings stack > box.settings-page { margin: 30px; } +.accounts-menu { + border-right: 1px solid @borders; +} +.accounts-menu-listbox > row { + border-bottom: 1px solid @theme_unfocused_bg_color; + padding: 10px 20px 10px 10px; +} .accounts-label-row { padding-top: 10px; padding-bottom: 10px; ===================================== gajim/gtk/accounts.py ===================================== @@ -186,8 +186,8 @@ def __init__(self): self.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC) self._stack = Gtk.Stack(vhomogeneous=False) self._stack.set_transition_type(Gtk.StackTransitionType.CROSSFADE) + self._stack.get_style_context().add_class('settings-stack') self._stack.add_named(AddNewAccountPage(), 'add-account') - self.get_style_context().add_class('accounts-settings') self.add(self._stack) self._page_signal_ids: dict[GenericSettingPage, int] = {} @@ -236,7 +236,8 @@ def __init__(self) -> None: self._accounts_listbox = Gtk.ListBox() self._accounts_listbox.set_sort_func(self._sort_func) - self._accounts_listbox.get_style_context().add_class('settings-box') + self._accounts_listbox.get_style_context().add_class( + 'accounts-menu-listbox') self._accounts_listbox.connect('row-activated', self._on_account_row_activated) @@ -316,7 +317,7 @@ def __init__(self, account: str) -> None: Gtk.ListBox.__init__(self) self.set_vexpand(True) self.set_hexpand(True) - self.get_style_context().add_class('settings-box') + self.get_style_context().add_class('accounts-menu-listbox') self._account = account @@ -519,8 +520,10 @@ def __init__(self, account: str) -> None: self._switch.set_vexpand(False) self._switch_state_label = Gtk.Label() - self._switch_state_label.set_xalign(1) + self._switch_state_label.set_xalign(0) self._switch_state_label.set_valign(Gtk.Align.CENTER) + label_width = max(len(Q_('?switch:On')), len(Q_('?switch:Off'))) + self._switch_state_label.set_width_chars(label_width) self._set_label(account_enabled) self._switch.connect( @@ -637,7 +640,7 @@ def __init__(self, account: str, settings: list[Setting]) -> None: self.account = account self.listbox = SettingsBox(account) - self.listbox.get_style_context().add_class('accounts-settings-border') + self.listbox.get_style_context().add_class('border') self.listbox.set_selection_mode(Gtk.SelectionMode.NONE) self.listbox.set_vexpand(False) self.listbox.set_valign(Gtk.Align.END) ===================================== gajim/gtk/builder.pyi ===================================== @@ -326,13 +326,17 @@ class FileTransferJingleBuilder(Builder): progress_bar: Gtk.ProgressBar -class FileTransferSendBuilder(Builder): - send_stack: Gtk.Stack +class FileTransferSelectorBuilder(Builder): + file_box: Gtk.Box + preview_image_box: Gtk.Box + preview_image: Gtk.Image + file_name_label: Gtk.Label + file_size_label: Gtk.Label + warning_label: Gtk.Label + remove_file_button: Gtk.Button + stack: Gtk.Stack listbox: Gtk.ListBox - description: Gtk.TextView - files_send: Gtk.Button resource_box: Gtk.Box - resource_send: Gtk.Button resource_instructions: Gtk.Label @@ -964,7 +968,7 @@ def get_builder(file_name: Literal['file_transfer.ui'], widgets: list[str] = ... @overload def get_builder(file_name: Literal['file_transfer_jingle.ui'], widgets: list[str] = ...) -> FileTransferJingleBuilder: ... @overload -def get_builder(file_name: Literal['file_transfer_send.ui'], widgets: list[str] = ...) -> FileTransferSendBuilder: ... +def get_builder(file_name: Literal['file_transfer_selector.ui'], widgets: list[str] = ...) -> FileTransferSelectorBuilder: ... @overload def get_builder(file_name: Literal['filetransfers.ui'], widgets: list[str] = ...) -> FiletransfersBuilder: ... @overload ===================================== gajim/gtk/chat_function_page.py ===================================== @@ -17,6 +17,7 @@ from typing import Optional from enum import Enum +from pathlib import Path from gi.repository import GObject from gi.repository import Gtk @@ -33,11 +34,13 @@ from gajim.common.modules.contacts import GroupchatContact from .dataform import DataFormWidget +from .file_transfer_selector import FileTransferSelector from .groupchat_inviter import GroupChatInviter class FunctionMode(Enum): INVITE = 'invite' + SEND_FILE = 'send-file' CHANGE_NICKNAME = 'change-nickname' KICK = 'kick' BAN = 'ban' @@ -135,7 +138,8 @@ def _reset(self) -> None: def set_mode(self, contact: types.ChatContactT, mode: FunctionMode, - data: Optional[str] = None + data: Optional[str] = None, + files: Optional[list[str]] = None ) -> None: self._reset() @@ -159,6 +163,15 @@ def set_mode(self, self._widget.connect('listbox-changed', self._on_ready) self._widget.load_contacts() + elif mode == FunctionMode.SEND_FILE: + self._confirm_button.set_label(_('Send Files')) + self._confirm_button.get_style_context().add_class( + 'suggested-action') + self._widget = FileTransferSelector(self._contact, data) + self._widget.connect('changed', self._on_ready) + if files is not None: + self._widget.add_files(files) + elif mode == FunctionMode.CHANGE_NICKNAME: self._confirm_button.set_label(_('Change')) self._confirm_button.get_style_context().add_class( @@ -264,6 +277,13 @@ def _on_confirm_clicked(self, _button: Gtk.Button) -> None: for jid in invitees: self._invite(JID.from_string(jid)) + elif self._mode == FunctionMode.SEND_FILE: + assert isinstance(self._widget, FileTransferSelector) + if self._widget.transfer_resource_required(): + return + + self._send_files(self._widget.get_catalog()) + elif self._mode == FunctionMode.CHANGE_NICKNAME: assert isinstance(self._widget, InputWidget) nickname = self._widget.get_text() @@ -347,6 +367,24 @@ def _invite(self, invited_jid: JID) -> None: 'message', _('%s has been invited to this group chat') % invited_contact.name) + def _send_files(self, catalog: list[tuple[Path, str, JID]]) -> None: + assert self._contact is not None + client = app.get_client(self._contact.account) + + # catalog: list[(file Path, transfer method, recipient JID)] + for path, method, jid in catalog: + if method == 'httpupload': + client.get_module('HTTPUpload').send_file( + self._contact, path) + continue + + # Send using Jingle + app.interface.instances['file_transfers'].send_file( + self._contact.account, + self._contact, + jid, + str(path)) + class InputWidget(Gtk.Box): ===================================== gajim/gtk/chat_stack.py ===================================== @@ -557,16 +557,19 @@ def _on_action(self, app.call_manager.start_call(account, jid, CallType.VIDEO) elif action_name.startswith('send-file'): + method = None name = action.get_name() if 'httpupload' in name: - app.interface.start_file_transfer(contact, method='httpupload') - return + method = 'httpupload' if 'jingle' in name: - app.interface.start_file_transfer(contact, method='jingle') - return + method = 'jingle' - app.interface.start_file_transfer(contact) + file_paths = None + if param is not None: + file_paths = param.get_strv() or None + self._show_chat_function_page( + FunctionMode.SEND_FILE, method, file_paths) elif action_name == 'add-to-roster': if (isinstance(contact, GroupchatParticipant) and @@ -669,12 +672,13 @@ def _on_drag_motion(self, def _show_chat_function_page(self, function_mode: FunctionMode, - data: Optional[str] = None + data: Optional[str] = None, + files: Optional[list[str]] = None ) -> None: assert self._current_contact is not None self._chat_function_page.set_mode( - self._current_contact, function_mode, data) + self._current_contact, function_mode, data, files) self.set_transition_type(Gtk.StackTransitionType.SLIDE_UP_DOWN) self.set_visible_child_name('function') ===================================== gajim/gtk/const.py ===================================== @@ -196,9 +196,9 @@ def __str__(self): ('correct-message', None, False), ('quote', 's', False), ('mention', 's', False), - ('send-file-httpupload', None, False), - ('send-file-jingle', None, False), - ('send-file', None, False), + ('send-file-httpupload', 'as', False), + ('send-file-jingle', 'as', False), + ('send-file', 'as', False), ('add-to-roster', None, True), ('start-voice-call', None, False), ('start-video-call', None, False), ===================================== gajim/gtk/contact_settings.py ===================================== @@ -27,7 +27,7 @@ class ContactSettings(SettingsBox): def __init__(self, account: str, jid: JID) -> None: SettingsBox.__init__(self, account, str(jid)) - self.get_style_context().add_class('settings-border') + self.get_style_context().add_class('border') self.set_selection_mode(Gtk.SelectionMode.NONE) self.set_size_request(700, -1) self.set_valign(Gtk.Align.START) ===================================== gajim/gtk/control.py ===================================== @@ -59,6 +59,9 @@ log = logging.getLogger('gajim.gui.control') +REQUEST_LINES_COUNT = 20 + + class ChatControl(EventHelper): def __init__(self) -> None: EventHelper.__init__(self) @@ -73,8 +76,7 @@ def __init__(self) -> None: self._scrolled_view = ConversationView() self._scrolled_view.connect('autoscroll-changed', self._on_autoscroll_changed) - self._scrolled_view.connect('request-history', - self._fetch_n_lines_history, 20) + self._scrolled_view.connect('request-history', self._request_history) self._ui.conv_view_overlay.add(self._scrolled_view) self._groupchat_state = GroupchatState() @@ -231,6 +233,8 @@ def _register_events(self) -> None: ged.GUI2, self._on_jingle_request_received), ('file-request-received', ged.GUI2, self._on_file_request_event), ('file-request-sent', ged.GUI2, self._on_file_request_event), + ('http-upload-started', ged.GUI2, self._on_http_upload_started), + ('http-upload-error', ged.GUI2, self._on_http_upload_error), ]) def _is_event_processable(self, event: Any) -> bool: @@ -438,6 +442,12 @@ def _on_file_request_event(self, self.add_jingle_file_transfer(event=event) + def _on_http_upload_started(self, event: events.HTTPUploadStarted) -> None: + self.add_file_transfer(event.transfer) + + def _on_http_upload_error(self, event: events.HTTPUploadError) -> None: + self.add_info_message(event.error_msg) + @property def is_chat(self) -> bool: return isinstance(self.contact, BareContact) @@ -486,22 +496,18 @@ def _on_jump_to_end(self, _button: Gtk.Button) -> None: self.reset_view() def drag_data_file_transfer(self, selection: Gtk.SelectionData) -> None: - # we may have more than one file dropped - uri_splitted = selection.get_uris() - for uri in uri_splitted: + uris = selection.get_uris() + paths: list[str] = [] + for uri in uris: path = get_file_path_from_dnd_dropped_uri(uri) - if not path: + if path is None or not path.is_file(): self.add_info_message( - _('The following address was not understood and was ' - 'not uploaded: %s') % uri) - continue - if not path.is_file(): # is it a regular file? - self.add_info_message( - _('The following file could not be accessed and was ' - 'not uploaded: %s') % path) + _('You dropped something Gajim could not ' + 'process: %s' % path)) continue + paths.append(str(path)) - app.interface.start_file_transfer(self.contact, str(path)) + app.window.activate_action('send-file', GLib.Variant('as', paths)) def get_our_nick(self) -> str: if isinstance(self.contact, GroupchatParticipant): @@ -598,11 +604,10 @@ def scroll_to_message(self, log_line_id: int, timestamp: float) -> None: log_line_id) GLib.idle_add(self._scrolled_view.block_signals, False) - def _fetch_n_lines_history(self, - _scrolled: Gtk.ScrolledWindow, - before: bool, - n_lines: int - ) -> None: + def _request_history(self, + _scrolled: Gtk.ScrolledWindow, + before: bool + ) -> None: self._scrolled_view.block_signals(True) @@ -658,7 +663,7 @@ def _fetch_n_lines_history(self, self.contact.jid, before, timestamp, - n_lines) + REQUEST_LINES_COUNT) if not messages: self._scrolled_view.set_history_complete(before, True) @@ -667,7 +672,7 @@ def _fetch_n_lines_history(self, self.add_messages(messages) - if len(messages) < n_lines: + if len(messages) < REQUEST_LINES_COUNT: self._scrolled_view.set_history_complete(before, True) self._scrolled_view.block_signals(False) ===================================== gajim/gtk/file_transfer_selector.py ===================================== @@ -0,0 +1,313 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +from __future__ import annotations + +from typing import Any +from typing import cast +from typing import Optional +from typing import Union + +import logging +from pathlib import Path + +from gi.repository import Gdk +from gi.repository import GLib +from gi.repository import GObject +from gi.repository import Gtk + +from nbxmpp.namespaces import Namespace +from nbxmpp.protocol import JID + +from gajim.common import app +from gajim.common import types +from gajim.common.helpers import get_file_path_from_dnd_dropped_uri +from gajim.common.helpers import load_file_async +from gajim.common.i18n import _ +from gajim.common.modules.contacts import BareContact +from gajim.common.preview import PREVIEWABLE_MIME_TYPES +from gajim.common.preview_helpers import create_thumbnail +from gajim.common.preview_helpers import guess_mime_type +from gajim.common.preview_helpers import get_icon_for_mime_type +from gajim.common.preview_helpers import pixbuf_from_data + +from .builder import get_builder +from .filechoosers import FileChooserDialog +from .resource_selector import ResourceSelector + +PREVIEW_SIZE = 72 + +log = logging.getLogger('gajim.gui.file_transfer_selector') + + +class FileTransferSelector(Gtk.Box): + + __gsignals__ = { + 'changed': (GObject.SignalFlags.RUN_LAST, None, (bool,)), + } + + def __init__(self, + contact: types.ChatContactT, + method: Optional[str] = None + ) -> None: + + Gtk.Box.__init__(self) + + self._contact = contact + self._method = method or app.window.get_preferred_ft_method(contact) + + client = app.get_client(contact.account) + self._max_file_size = client.get_module('HTTPUpload').max_file_size or 0 + + self._ui = get_builder('file_transfer_selector.ui') + self.add(self._ui.stack) + + self.connect('destroy', self._on_destroy) + self._ui.connect_signals(self) + + self._resource_selector = None + if isinstance(contact, BareContact): + # No jingle file transfers in group chats + self._resource_selector = ResourceSelector( + contact, + constraints=[Namespace.JINGLE_FILE_TRANSFER_5]) + self._resource_selector.connect( + 'selection-changed', self._on_resource_selection) + self._ui.resource_box.pack_start( + self._resource_selector, True, False, 0) + + self._ui.resource_instructions.set_text( + _('%s is online with multiple devices.\n' + 'Choose the device you would like to send the ' + 'files to.') % self._contact.name) + + uri_entry = Gtk.TargetEntry.new( + 'text/uri-list', Gtk.TargetFlags.OTHER_APP, 80) + dst_targets = Gtk.TargetList.new([uri_entry]) + + self._ui.listbox.drag_dest_set( + Gtk.DestDefaults.ALL, + [uri_entry], + Gdk.DragAction.COPY | Gdk.DragAction.MOVE) + self._ui.listbox.drag_dest_set_target_list(dst_targets) + self._ui.listbox.connect( + 'drag-data-received', self._on_drag_data_received) + + self.show_all() + + def transfer_resource_required(self) -> bool: + if not isinstance(self._contact, BareContact): + # No jingle file transfer for group chats + return False + + if self._method is None: + log.error('No file transfer method available') + return False + + current_page = self._ui.stack.get_visible_child_name() + if self._method == 'httpupload': + for path in self._get_file_paths(): + if path.stat().st_size > self._max_file_size: + if current_page == 'resource-selection': + return False + + self._ui.stack.set_visible_child_name('resource-selection') + self.emit('changed', False) + return True + return False + + if current_page == 'resource-selection': + return False + + self._ui.stack.set_visible_child_name('resource-selection') + self.emit('changed', False) + return True + + def get_catalog(self) -> list[tuple[Path, str, JID]]: + # catalog: list[(file Path, transfer method, recipient JID)] + catalog: list[tuple[Path, str, JID]] = [] + + file_paths = self._get_file_paths() + for path in file_paths: + if (self._method == 'jingle' or + path.stat().st_size > self._max_file_size): + assert self._resource_selector is not None + item = (path, 'jingle', self._resource_selector.get_jid()) + elif self._method == 'httpupload': + item = (path, 'httpupload', self._contact.jid) + else: + # No file transfer method available + continue + + catalog.append(item) + + return catalog + + def add_files(self, file_paths: Union[list[Path], list[str]]) -> None: + for path in file_paths: + if isinstance(path, str): + path = Path(path) + + if path.is_dir(): + continue + + size_warning = bool(self._method == 'httpupload' and + path.stat().st_size > self._max_file_size) + jingle_warning = bool(self._method == 'jingle') + + row = FileRow(path, size_warning, jingle_warning) + self._ui.listbox.add(row) + app.settings.set('last_send_dir', str(path)) + + self._ui.listbox.show_all() + + def _on_destroy(self, _widget: FileTransferSelector) -> None: + app.check_finalize(self) + + def _get_file_paths(self) -> list[Path]: + paths: list[Path] = [] + for row in cast(list[FileRow], self._ui.listbox.get_children()): + paths.append(row.file_path) + + return paths + + def _on_drag_data_received(self, + _widget: Gtk.Widget, + _context: Gdk.DragContext, + _x_coord: int, + _y_coord: int, + selection: Gtk.SelectionData, + target_type: int, + _timestamp: int + ) -> None: + if not selection.get_data(): + return + + if target_type == 80: + uris = selection.get_uris() + paths: list[Path] = [] + for uri in uris: + path = get_file_path_from_dnd_dropped_uri(uri) + if path is None or not path.is_file(): + log.warning('Could not add file %s', str(path)) + continue + paths.append(path) + + self.add_files(paths) + + def _on_files_changed(self, _listbox: Gtk.ListBox, _row: FileRow) -> None: + file_paths = self._get_file_paths() + if not file_paths: + self.emit('changed', False) + return + + if self._method == 'httpupload' and self._contact.is_groupchat: + # Enforce HTTPUpload file size limit for group chats + for path in file_paths: + if path.stat().st_size > self._max_file_size: + self.emit('changed', False) + return + + self.emit('changed', True) + + def _on_resource_selection(self, + _selector: ResourceSelector, + state: bool + ) -> None: + + self.emit('changed', state) + + def _on_choose_files_clicked(self, _button: Gtk.Button) -> None: + FileChooserDialog(self.add_files, + select_multiple=True, + transient_for=app.window, + path=app.settings.get('last_send_dir')) + + +class FileRow(Gtk.ListBoxRow): + def __init__(self, + path: Path, + size_warning: bool, + jingle_warning: bool + ) -> None: + + Gtk.ListBoxRow.__init__(self) + self.file_path = path + + self._ui = get_builder('file_transfer_selector.ui') + self.add(self._ui.file_box) + + self._ui.remove_file_button.connect('clicked', self._on_remove_clicked) + + self._ui.file_name_label.set_text(path.name) + + if app.settings.get('use_kib_mib'): + units = GLib.FormatSizeFlags.IEC_UNITS + else: + units = GLib.FormatSizeFlags.DEFAULT + + file_size_string = GLib.format_size_full(path.stat().st_size, units) + self._ui.file_size_label.set_text(file_size_string) + + if size_warning: + self._ui.warning_label.set_text( + _('File too big, will use direct transfer (not encrypted)')) + self._ui.warning_label.show() + + if jingle_warning: + self._ui.warning_label.set_text( + _('Direct transfer (not encrypted)')) + self._ui.warning_label.show() + + self._ui.preview_image_box.set_size_request(PREVIEW_SIZE, -1) + self._set_preview(path) + + def _set_preview(self, path: Path) -> None: + mime_type = guess_mime_type(path) + if mime_type not in PREVIEWABLE_MIME_TYPES: + self._set_icon_for_mime_type(mime_type) + return + + load_file_async(self.file_path, self._on_load_finished, mime_type) + + def _on_load_finished(self, + data: Optional[bytes], + _error: Optional[GLib.Error], + mime_type: Any + ) -> None: + + if data is None: + self._set_icon_for_mime_type(mime_type) + return + + preview_bytes = create_thumbnail(data, PREVIEW_SIZE, mime_type) + if preview_bytes is None: + self._set_icon_for_mime_type(mime_type) + return + + pixbuf = pixbuf_from_data(preview_bytes) + if pixbuf is None: + self._set_icon_for_mime_type(mime_type) + return + + self._ui.preview_image.set_from_pixbuf(pixbuf) + + def _set_icon_for_mime_type(self, mime_type: str) -> None: + icon = get_icon_for_mime_type(mime_type) + self._ui.preview_image.set_from_gicon(icon, Gtk.IconSize.DIALOG) + + def _on_remove_clicked(self, _button: Gtk.Button) -> None: + listbox = cast(Gtk.ListBox, self.get_parent()) + listbox.remove(self) + self.destroy() ===================================== gajim/gtk/file_transfer_send.py deleted ===================================== @@ -1,157 +0,0 @@ -# Copyright (C) 2003-2014 Yann Leboulanger <asterix AT lagaule.org> -# Copyright (C) 2005-2006 Dimitur Kirov <dkirov AT gmail.com> -# Copyright (C) 2005-2007 Nikos Kouremenos <kourem AT gmail.com> -# Copyright (C) 2006 Travis Shirk <travis AT pobox.com> -# -# This file is part of Gajim. -# -# Gajim is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published -# by the Free Software Foundation; version 3 only. -# -# Gajim is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Gajim. If not, see <http://www.gnu.org/licenses/>. - -from __future__ import annotations - -from typing import Callable -from typing import cast -from typing import Optional - -from pathlib import Path - -from gi.repository import Gdk -from gi.repository import Gtk -from gi.repository import Pango - -from nbxmpp.namespaces import Namespace -from nbxmpp.protocol import JID - -from gajim.common import app -from gajim.common.i18n import _ -from gajim.common.modules.contacts import BareContact - -from .filechoosers import FileChooserDialog -from .resource_selector import ResourceSelector -from .builder import get_builder - - -class SendFileDialog(Gtk.ApplicationWindow): - def __init__(self, - contact: BareContact, - send_callback: Callable[..., bool], - transient_for: Gtk.Window, - files: Optional[list[str]] = None - ) -> None: - Gtk.ApplicationWindow.__init__(self) - self.set_application(app.app) - self.set_show_menubar(False) - self.set_resizable(True) - self.set_default_size(500, 350) - self.set_type_hint(Gdk.WindowTypeHint.DIALOG) - self.set_transient_for(transient_for) - self.set_title(_('Choose a File to Send…')) - self.set_destroy_with_parent(True) - - self._contact = contact - self._send_callback = send_callback - - self._ui = get_builder('file_transfer_send.ui') - self.add(self._ui.send_stack) - - self._ui.resource_instructions.set_text( - _('%s is online with multiple devices.\n' - 'Choose the device you would like to send the ' - 'file to.') % self._contact.name) - - self._resource_selector = ResourceSelector( - contact, - constraints=[Namespace.JINGLE_FILE_TRANSFER_5]) - self._resource_selector.connect( - 'selection-changed', self._on_resource_selection) - self._ui.resource_box.pack_start( - self._resource_selector, True, False, 0) - - if files is not None: - self.set_files(files) - - self.connect('key-press-event', self._on_key_press) - self._ui.connect_signals(self) - self.show_all() - - def _on_files_changed(self, _listbox: Gtk.ListBox, _row: FileRow) -> None: - sensitive = bool(len(self._ui.listbox.get_children()) > 0) - self._ui.files_send.set_sensitive(sensitive) - - def _on_resource_selection(self, - _selector: ResourceSelector, - state: bool - ) -> None: - self._ui.resource_send.set_sensitive(state) - - def _on_send_to_resource(self, _button: Gtk.Button) -> None: - resource_jid = self._resource_selector.get_jid() - self._send_files(resource_jid) - - def _on_send_clicked(self, _button: Gtk.Button) -> None: - count = len(self._contact.get_resources()) - if count == 0 or count > 1: - self._ui.send_stack.set_visible_child_name('resource_selection') - return - - resource_jid = self._contact.get_resources()[0].jid - self._send_files(resource_jid) - - def _send_files(self, resource_jid: JID) -> None: - files = cast(list[FileRow], self._ui.listbox.get_children()) - for file in files: - self._send_callback( - resource_jid, str(file.file_path), self._get_description()) - self.destroy() - - def _select_files(self, _button: Gtk.Button) -> None: - FileChooserDialog(self.set_files, - select_multiple=True, - transient_for=self, - path=app.settings.get('last_send_dir')) - - def _remove_files(self, _button: Gtk.Button) -> None: - selected = self._ui.listbox.get_selected_rows() - for item in selected: - self._ui.listbox.remove(item) - - def set_files(self, file_names: list[str]) -> None: - last_dir = '' - for file in file_names: - row = FileRow(file) - if row.file_path.is_dir(): - continue - last_dir = row.file_path.parent - self._ui.listbox.add(row) - self._ui.listbox.show_all() - app.settings.set('last_send_dir', str(last_dir)) - self._ui.files_send.set_sensitive(True) - - def _get_description(self) -> str: - buffer_ = self._ui.description.get_buffer() - start, end = buffer_.get_bounds() - return buffer_.get_text(start, end, False) - - def _on_key_press(self, _widget: Gtk.Widget, event: Gdk.EventKey) -> None: - if event.keyval == Gdk.KEY_Escape: - self.destroy() - - -class FileRow(Gtk.ListBoxRow): - def __init__(self, path: str) -> None: - Gtk.ListBoxRow.__init__(self) - self.file_path: Path = Path(path) - label = Gtk.Label(label=self.file_path.name) - label.set_ellipsize(Pango.EllipsizeMode.END) - label.set_xalign(0) - self.add(label) ===================================== gajim/gtk/filetransfer.py ===================================== @@ -60,7 +60,6 @@ from .dialogs import ConfirmationDialog from .dialogs import ErrorDialog from .filechoosers import FileSaveDialog -from .file_transfer_send import SendFileDialog from .tooltips import FileTransfersTooltip from .builder import get_builder from .util import format_eta @@ -405,16 +404,9 @@ def _on_yes(): text=_('_Download Again'), callback=_on_yes)]).show() - def show_file_send_request(self, - account: str, - contact: types.BareContact - ) -> None: - send_callback = partial(self.send_file, account, contact) - SendFileDialog(contact, send_callback, self.window) - def send_file(self, account: str, - contact: types.BareContact, + contact: types.ResourceContact, resource_jid: JID, file_path: str, file_desc: str = '' ===================================== gajim/gtk/groupchat_settings.py ===================================== @@ -27,7 +27,7 @@ class GroupChatSettings(SettingsBox): def __init__(self, account: str, jid: JID) -> None: SettingsBox.__init__(self, account, str(jid)) - self.get_style_context().add_class('settings-border') + self.get_style_context().add_class('border') self.set_selection_mode(Gtk.SelectionMode.NONE) self.set_size_request(700, -1) self.set_valign(Gtk.Align.START) ===================================== gajim/gtk/main.py ===================================== @@ -39,6 +39,7 @@ from gajim.common.i18n import _ from gajim.common.helpers import play_sound from gajim.common.modules.bytestream import is_transfer_active +from gajim.common.modules.contacts import GroupchatContact from gajim.plugins.pluginmanager import PluginManifest from gajim.plugins.repository import PluginRepository @@ -950,6 +951,33 @@ def _on_window_active(self, if control.get_autoscroll(): self.mark_as_read(control.contact.account, control.contact.jid) + def get_preferred_ft_method(self, + contact: types.ChatContactT + ) -> Optional[str]: + + ft_pref = app.settings.get_account_setting( + contact.account, + 'filetransfer_preference') + httpupload_enabled = app.window.get_action_enabled( + 'send-file-httpupload') + jingle_enabled = app.window.get_action_enabled('send-file-jingle') + + if isinstance(contact, GroupchatContact): + if httpupload_enabled: + return 'httpupload' + return None + + if httpupload_enabled and jingle_enabled: + return ft_pref + + if httpupload_enabled: + return 'httpupload' + + if jingle_enabled: + return 'jingle' + + return None + def show_add_join_groupchat(self, account: str, jid: str, ===================================== gajim/gtk/menus.py ===================================== @@ -98,7 +98,7 @@ def get_singlechat_menu(contact: types.BareContact) -> GajimMenu: def get_private_chat_menu(contact: types.GroupchatParticipant) -> GajimMenu: menu = GajimMenu() menu.add_item(_('Details'), 'win.show-contact-info') - menu.add_item(_('Upload File…'), 'win.send-file-httpupload') + menu.add_item(_('Upload File…'), 'win.send-file-httpupload([""])') menu.add_item(_('Search…'), 'win.search-history') if can_add_to_roster(contact): @@ -111,8 +111,8 @@ def get_private_chat_menu(contact: types.GroupchatParticipant) -> GajimMenu: def get_send_file_submenu() -> GajimMenu: menu = GajimMenu() - menu.add_item(_('Upload File…'), 'win.send-file-httpupload') - menu.add_item(_('Send File Directly…'), 'win.send-file-jingle') + menu.add_item(_('Upload File…'), 'win.send-file-httpupload([""])') + menu.add_item(_('Send File Directly…'), 'win.send-file-jingle([""])') return menu ===================================== gajim/gtk/message_actions_box.py ===================================== @@ -25,7 +25,6 @@ from gi.repository import GLib from gi.repository import Gdk -from gi.repository import GdkPixbuf from gi.repository import Gio from gi.repository import Gtk from gi.repository import GObject @@ -45,9 +44,7 @@ from gajim.gui.security_label_selector import SecurityLabelSelector from .builder import get_builder -from .dialogs import DialogButton from .dialogs import ErrorDialog -from .dialogs import PastePreviewDialog from .emoji_chooser import emoji_chooser from .menus import get_encryption_menu from .menus import get_format_menu @@ -577,32 +574,16 @@ def _on_paste_clipboard(self, clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) image = clipboard.wait_for_image() if image is None: + log.info('No image pasted') return - PastePreviewDialog( - _('Paste Image'), - _('You are trying to paste an image'), - _('Are you sure you want to paste your ' - "clipboard's image into the chat window?"), - _('_Do not ask me again'), - image, - [DialogButton.make('Cancel'), - DialogButton.make('Accept', - text=_('_Paste'), - callback=self._paste_event_confirmed, - args=[image])]).show() - - def _paste_event_confirmed(self, - image: GdkPixbuf.Pixbuf - ) -> None: - - dir_ = tempfile.gettempdir() - path = os.path.join(dir_, f'{uuid.uuid4()}.png') + temp_dir = tempfile.gettempdir() + image_path = os.path.join(temp_dir, f'{uuid.uuid4()}.png') + + image.savev(image_path, 'png', [], []) if image is None: log.error('Could not process pasted image') return - image.savev(path, 'png', [], []) - - assert self._contact is not None - app.interface.start_file_transfer(self._contact, path) + app.window.activate_action( + 'send-file', GLib.Variant('as', [image_path])) ===================================== gajim/gtk/preferences.py ===================================== @@ -173,7 +173,7 @@ def _on_destroy(self, _widget: Gtk.Widget) -> None: class PreferenceBox(SettingsBox): def __init__(self, settings: list[Setting]) -> None: SettingsBox.__init__(self, None) - self.get_style_context().add_class('settings-border') + self.get_style_context().add_class('border') self.set_selection_mode(Gtk.SelectionMode.NONE) self.set_vexpand(False) self.set_valign(Gtk.Align.END) ===================================== gajim/gtk/preview_audio.py ===================================== @@ -55,7 +55,7 @@ def __init__(self, file_path: Path) -> None: def _build_audio_widget(self) -> None: play_button = Gtk.Button() play_button.get_style_context().add_class('flat') - play_button.get_style_context().add_class('preview-button') + play_button.get_style_context().add_class('border') play_button.set_tooltip_text(_('Start/stop playback')) self._play_icon = Gtk.Image.new_from_icon_name( 'media-playback-start-symbolic', ===================================== gajim/gui_interface.py ===================================== @@ -39,7 +39,6 @@ import sys import time import logging -from functools import partial from threading import Thread from gi.repository import Gtk @@ -50,30 +49,16 @@ from nbxmpp import JID from gajim.common import app -from gajim.common import exceptions from gajim.common import proxy65_manager from gajim.common import socks5 - from gajim.common.events import FileCompleted from gajim.common.events import FileHashError from gajim.common.events import FileProgress from gajim.common.events import FileError -from gajim.common.modules.contacts import BareContact -from gajim.common.modules.contacts import GroupchatContact -from gajim.common.structs import OutgoingMessage -from gajim.common.i18n import _ -from gajim.common.const import FTState from gajim.common.file_props import FileProp -from gajim.common.types import ChatContactT - -from gajim.common.modules.httpupload import HTTPFileTransfer from gajim.gui.dialogs import ErrorDialog -from gajim.gui.filechoosers import FileChooserDialog -from gajim.gui.file_transfer_send import SendFileDialog from gajim.gui.filetransfer import FileTransfersWindow -from gajim.gui.control import ChatControl - log = logging.getLogger('gajim.interface') @@ -202,130 +187,6 @@ def __compare_hashes(account: str, file_props: FileProp) -> None: if session: session.end_session() - def send_httpupload(self, - chat_control: ChatControl, - path: Optional[str] = None - ) -> None: - if path is not None: - self._send_httpupload(chat_control, path) - return - - accept_cb = partial(self._on_file_dialog_ok, chat_control) - FileChooserDialog(accept_cb, - select_multiple=True, - transient_for=app.window) - - def _on_file_dialog_ok(self, - chat_control: ChatControl, - paths: list[str] - ) -> None: - for path in paths: - self._send_httpupload(chat_control, path) - - def _send_httpupload(self, chat_control: ChatControl, path: str) -> None: - client = app.get_client(chat_control.contact.account) - encryption = chat_control.contact.settings.get('encryption') or None - try: - transfer = client.get_module('HTTPUpload').make_transfer( - path, - encryption, - chat_control.contact, - chat_control.is_groupchat) - except exceptions.FileError as error: - ErrorDialog(_('Could not Open File'), str(error)) - return - - transfer.connect('cancel', self._on_cancel_upload) - transfer.connect('state-changed', - self._on_http_upload_state_changed) - chat_control.add_file_transfer(transfer) - client.get_module('HTTPUpload').start_transfer(transfer) - - def _on_http_upload_state_changed(self, - transfer: HTTPFileTransfer, - _signal_name: str, - state: FTState - ) -> None: - # Note: This has to be a bound method in order to connect the signal - if state.is_finished: - uri = transfer.get_transformed_uri() - - type_ = 'chat' - if transfer.is_groupchat: - type_ = 'groupchat' - - message = OutgoingMessage(account=transfer.account, - contact=transfer.contact, - message=uri, - type_=type_, - oob_url=uri) - - client = app.get_client(transfer.account) - client.send_message(message) - - def _on_cancel_upload(self, - transfer: HTTPFileTransfer, - _signal_name: str - ) -> None: - # Note: This has to be a bound method in order to connect the signal - client = app.get_client(transfer.account) - client.get_module('HTTPUpload').cancel_transfer(transfer) - - def _get_pref_ft_method(self, contact: ChatContactT) -> Optional[str]: - ft_pref = app.settings.get_account_setting(contact.account, - 'filetransfer_preference') - httpupload = app.window.get_action_enabled('send-file-httpupload') - jingle = app.window.get_action_enabled('send-file-jingle') - - if isinstance(contact, GroupchatContact): - if httpupload: - return 'httpupload' - return None - - if httpupload and jingle: - return ft_pref - - if httpupload: - return 'httpupload' - - if jingle: - return 'jingle' - return None - - def start_file_transfer(self, - contact: ChatContactT, - path: Optional[str] = None, - method: Optional[str] = None - ) -> None: - - if method is None: - method = self._get_pref_ft_method(contact) - if method is None: - return - - control = app.window.get_control() - if not control.has_active_chat(): - return - - if path is None: - if method == 'httpupload': - self.send_httpupload(control) - return - if method == 'jingle': - self.instances['file_transfers'].show_file_send_request( - contact.account, contact) - return - - if method == 'httpupload': - self.send_httpupload(control, path) - else: - assert isinstance(contact, BareContact) - send_callback = partial( - self.instances['file_transfers'].send_file, - contact.account, - contact) - SendFileDialog(contact, send_callback, app.window, [path]) - def process_connections(self) -> bool: ''' Called each foo (200) milliseconds. Check for idlequeue timeouts View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/2008247fa4caf79294481f7b07488db… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/2008247fa4caf79294481f7b07488db… You're receiving this email because of your account on dev.gajim.org.

1 0

← Newer
1
...
4
5
6
7
8
9
10
11
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits November 2022