Commits

commits@gajim.org

17632 discussions

gajim: [dpapavas] Improvements for Emacs Gtk binding theme. Fixe...
by Yann Leboulanger 13 Feb '13

13 Feb '13

changeset 66471f38503c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=66471f38503c description: [dpapavas] Improvements for Emacs Gtk binding theme. Fixes #7254 diffstat: src/message_window.py | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diffs (29 lines): diff -r a8ab5806dbf4 -r 66471f38503c src/message_window.py --- a/src/message_window.py Tue Jan 29 10:27:51 2013 +0100 +++ b/src/message_window.py Thu Nov 08 12:09:13 2012 +0100 @@ -351,8 +351,10 @@ # CTRL mask if modifier & gtk.gdk.CONTROL_MASK: if keyval == gtk.keysyms.h: # CTRL + h - control._on_history_menuitem_activate() - return True + if gtk.settings_get_default().get_property( + 'gtk-key-theme-name') != 'Emacs': + control._on_history_menuitem_activate() + return True elif control.type_id == message_control.TYPE_CHAT and \ keyval == gtk.keysyms.f: # CTRL + f # CTRL + f moves cursor one char forward when user uses Emacs @@ -432,8 +434,10 @@ control.show_emoticons_menu() return True elif keyval == gtk.keysyms.d: # ALT + D show actions menu - control.on_actions_button_clicked(control.actions_button) - return True + if gtk.settings_get_default().get_property( + 'gtk-key-theme-name') != 'Emacs': + control.on_actions_button_clicked(control.actions_button) + return True elif control.type_id == message_control.TYPE_GC and \ keyval == gtk.keysyms.t: # ALT + t control._on_change_subject_menuitem_activate(None)

1 0

gajim: fix traceback
by Denis Fomin 13 Feb '13

13 Feb '13

changeset 57e066cee4a2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=57e066cee4a2 description: fix traceback diffstat: src/gui_interface.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r f882cb23d496 -r 57e066cee4a2 src/gui_interface.py --- a/src/gui_interface.py Sun Feb 10 11:29:14 2013 +0100 +++ b/src/gui_interface.py Wed Feb 13 10:16:52 2013 +0400 @@ -210,7 +210,7 @@ #('STATUS', account, show) account = obj.conn.name if obj.show in ('offline', 'error'): - for name in self.instances[account]['online_dialog'].keys(): + for name in list(self.instances[account]['online_dialog'].keys()): # .keys() is needed to not have a dictionary length changed # during iteration error self.instances[account]['online_dialog'][name].destroy()

1 0

gajim: check that contacts are not in "not in roster" group when...
by Yann Leboulanger 12 Feb '13

12 Feb '13

changeset eab7311f57a2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=eab7311f57a2 description: check that contacts are not in "not in roster" group when we receive a RIE stanza. Fixes #7289 diffstat: src/dialogs.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 6a70ffed6597 -r eab7311f57a2 src/dialogs.py --- a/src/dialogs.py Sun Feb 10 18:57:25 2013 +0100 +++ b/src/dialogs.py Tue Feb 12 19:31:35 2013 +0100 @@ -3452,7 +3452,7 @@ is_in_roster = True contact = gajim.contacts.get_contact_with_highest_priority( self.account, jid) - if not contact: + if not contact or _('Not in Roster') in contact.groups: is_in_roster = False name = self.exchange_list[jid][0] num_list = len(self.exchange_list[jid][1])

1 0

python-nbxmpp: try write acces to repo.
by Denis Fomin 12 Feb '13

12 Feb '13

changeset af74094962c7 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=af74094962c7 description: try write acces to repo. diffstat: nbxmpp/transports_nb.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 95ce5d2db84b -r af74094962c7 nbxmpp/transports_nb.py --- a/nbxmpp/transports_nb.py Tue Feb 12 17:10:37 2013 +0100 +++ b/nbxmpp/transports_nb.py Tue Feb 12 20:48:40 2013 +0400 @@ -548,7 +548,7 @@ sent_data = self.sendbuff[:send_count] self.sendbuff = self.sendbuff[send_count:] self._plug_idle(writable=(self.sendqueue != []), readable=True) - + if self.sent_bytes_buff: sent_data = self.sent_bytes_buff + sent_data self.sent_bytes_buff = b''

1 0

python-nbxmpp: fix var name
by Yann Leboulanger 12 Feb '13

12 Feb '13

changeset 95ce5d2db84b in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=95ce5d2db84b description: fix var name diffstat: nbxmpp/transports_nb.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 675173fbd348 -r 95ce5d2db84b nbxmpp/transports_nb.py --- a/nbxmpp/transports_nb.py Sun Feb 10 11:28:44 2013 +0100 +++ b/nbxmpp/transports_nb.py Tue Feb 12 17:10:37 2013 +0100 @@ -361,7 +361,7 @@ self._sock.setblocking(False) self._sock.connect((self.server, self.port)) except Exception as exc: - errnum, errstr = e.errno, e.strerror + errnum, errstr = exc.errno, exc.strerror if errnum in (errno.EINPROGRESS, errno.EALREADY, errno.EWOULDBLOCK): # connecting in progress

1 0

gajim: send RIE stanza as an IQ if user is online and supports R...
by Yann Leboulanger 10 Feb '13

10 Feb '13

changeset 6a70ffed6597 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=6a70ffed6597 description: send RIE stanza as an IQ if user is online and supports RIE. Fixes #7289 diffstat: src/common/connection.py | 26 +++++++++++++++----------- src/roster_window.py | 9 +++++++-- 2 files changed, 22 insertions(+), 13 deletions(-) diffs (71 lines): diff -r d39dea6c45de -r 6a70ffed6597 src/common/connection.py --- a/src/common/connection.py Sun Feb 10 11:29:14 2013 +0100 +++ b/src/common/connection.py Sun Feb 10 18:57:25 2013 +0100 @@ -1879,26 +1879,30 @@ form_node=obj.form_node, original_message=obj.original_message, delayed=obj.delayed, attention=obj.attention, callback=cb) - def send_contacts(self, contacts, jid): + def send_contacts(self, contacts, fjid, type_='message'): """ Send contacts with RosterX (Xep-0144) """ if not gajim.account_is_connected(self.name): return - if len(contacts) == 1: - msg = _('Sent contact: "%s" (%s)') % (contacts[0].get_full_jid(), + if type_ == 'message': + if len(contacts) == 1: + msg = _('Sent contact: "%s" (%s)') % (contacts[0].get_full_jid(), contacts[0].get_shown_name()) - else: - msg = _('Sent contacts:') - for contact in contacts: - msg += '\n "%s" (%s)' % (contact.get_full_jid(), + else: + msg = _('Sent contacts:') + for contact in contacts: + msg += '\n "%s" (%s)' % (contact.get_full_jid(), contact.get_shown_name()) - msg_iq = nbxmpp.Message(to=jid, body=msg) - x = msg_iq.addChild(name='x', namespace=nbxmpp.NS_ROSTERX) + stanza = nbxmpp.Message(to=gajim.get_jid_without_resource(fjid), + body=msg) + elif type_ == 'iq': + stanza = nbxmpp.Iq(to=fjid, typ='set') + x = stanza.addChild(name='x', namespace=nbxmpp.NS_ROSTERX) for contact in contacts: x.addChild(name='item', attrs={'action': 'add', 'jid': contact.jid, - 'name': contact.get_shown_name()}) - self.connection.send(msg_iq) + 'name': contact.get_shown_name()}) + self.connection.send(stanza) def send_stanza(self, stanza): """ diff -r d39dea6c45de -r 6a70ffed6597 src/roster_window.py --- a/src/roster_window.py Sun Feb 10 11:29:14 2013 +0100 +++ b/src/roster_window.py Sun Feb 10 18:57:25 2013 +0100 @@ -70,7 +70,7 @@ if dbus_support.supported: import dbus -from nbxmpp.protocol import NS_FILE +from nbxmpp.protocol import NS_FILE, NS_ROSTERX from common.pep import MOODS, ACTIVITIES #(icon, name, type, jid, account, editable, second pixbuf) @@ -4503,7 +4503,12 @@ def on_drop_rosterx(self, widget, account_source, c_source, account_dest, c_dest, was_big_brother, context, etime): - gajim.connections[account_dest].send_contacts([c_source], c_dest.jid) + type_ = 'message' + if c_dest.show not in ('offline', 'error') and c_dest.supports( + NS_ROSTERX): + type_ = 'iq' + gajim.connections[account_dest].send_contacts([c_source], + c_dest.get_full_jid(), type_=type_) def on_drop_in_contact(self, widget, account_source, c_source, account_dest, c_dest, was_big_brother, context, etime):

1 0

python-nbxmpp: don't crash when cacerts is an empty string
by Yann Leboulanger 10 Feb '13

10 Feb '13

changeset f9e1827b7d59 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=f9e1827b7d59 description: don't crash when cacerts is an empty string diffstat: nbxmpp/tls_nb.py | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diffs (19 lines): diff -r 919506ffd27e -r f9e1827b7d59 nbxmpp/tls_nb.py --- a/nbxmpp/tls_nb.py Wed Jan 02 13:51:30 2013 +0100 +++ b/nbxmpp/tls_nb.py Sun Feb 10 11:28:44 2013 +0100 @@ -395,13 +395,9 @@ tcpsock.ssl_errnum = [0] tcpsock._sslContext.set_verify(OpenSSL.SSL.VERIFY_PEER, - self._ssl_verify_callback) - try: - tcpsock._sslContext.load_verify_locations(self.cacerts) - except: - log.warning('Unable to load SSL certificates from file %s' % \ - os.path.abspath(self.cacerts)) + self._ssl_verify_callback) store = tcpsock._sslContext.get_cert_store() + self._load_cert_file(self.cacerts, store) self._load_cert_file(self.mycerts, store) if os.path.isdir('/etc/ssl/certs'): for f in os.listdir('/etc/ssl/certs'):

1 0

python-nbxmpp: hardcode error values in protocol.py
by Yann Leboulanger 10 Feb '13

10 Feb '13

changeset 919506ffd27e in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=919506ffd27e description: hardcode error values in protocol.py diffstat: nbxmpp/protocol.py | 376 +++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 308 insertions(+), 68 deletions(-) diffs (truncated from 389 to 300 lines): diff -r 36031c4c739e -r 919506ffd27e nbxmpp/protocol.py --- a/nbxmpp/protocol.py Sun Jan 20 19:52:22 2013 +0100 +++ b/nbxmpp/protocol.py Wed Jan 02 13:51:30 2013 +0100 @@ -169,77 +169,317 @@ NS_HASHES_SHA256 = 'urn:xmpp:hash-function-textual-names:sha-256' NS_HASHES_SHA512 = 'urn:xmpp:hash-function-textual-names:sha-512' -xmpp_stream_error_conditions = ''' -bad-format -- -- -- The entity has sent XML that cannot be processed. -bad-namespace-prefix -- -- -- The entity has sent a namespace prefix that is unsupported, or has sent no namespace prefix on an element that requires such a prefix. -conflict -- -- -- The server is closing the active stream for this entity because a new stream has been initiated that conflicts with the existing stream. -connection-timeout -- -- -- The entity has not generated any traffic over the stream for some period of time. -host-gone -- -- -- The value of the 'to' attribute provided by the initiating entity in the stream header corresponds to a hostname that is no longer hosted by the server. -host-unknown -- -- -- The value of the 'to' attribute provided by the initiating entity in the stream header does not correspond to a hostname that is hosted by the server. -improper-addressing -- -- -- A stanza sent between two servers lacks a 'to' or 'from' attribute (or the attribute has no value). -internal-server-error -- -- -- The server has experienced a misconfiguration or an otherwise-undefined internal error that prevents it from servicing the stream. -invalid-from -- cancel -- -- The JID or hostname provided in a 'from' address does not match an authorized JID or validated domain negotiated between servers via SASL or dialback, or between a client and a server via authentication and resource authorization. -invalid-id -- -- -- The stream ID or dialback ID is invalid or does not match an ID previously provided. -invalid-namespace -- -- -- The streams namespace name is something other than "http://etherx.jabber.org/streams" or the dialback namespace name is something other than "jabber:server:dialback". -invalid-xml -- -- -- The entity has sent invalid XML over the stream to a server that performs validation. -not-authorized -- -- -- The entity has attempted to send data before the stream has been authenticated, or otherwise is not authorized to perform an action related to stream negotiation. -policy-violation -- -- -- The entity has violated some local service policy. -remote-connection-failed -- -- -- The server is unable to properly connect to a remote resource that is required for authentication or authorization. -resource-constraint -- -- -- The server lacks the system resources necessary to service the stream. -restricted-xml -- -- -- The entity has attempted to send restricted XML features such as a comment, processing instruction, DTD, entity reference, or unescaped character. -see-other-host -- -- -- The server will not provide service to the initiating entity but is redirecting traffic to another host. -system-shutdown -- -- -- The server is being shut down and all active streams are being closed. -undefined-condition -- -- -- The error condition is not one of those defined by the other conditions in this list. -unsupported-encoding -- -- -- The initiating entity has encoded the stream in an encoding that is not supported by the server. -unsupported-stanza-type -- -- -- The initiating entity has sent a first-level child of the stream that is not supported by the server. -unsupported-version -- -- -- The value of the 'version' attribute provided by the initiating entity in the stream header specifies a version of XMPP that is not supported by the server. -xml-not-well-formed -- -- -- The initiating entity has sent XML that is not well-formed.''' +#xmpp_stream_error_conditions = ''' +#bad-format -- -- -- The entity has sent XML that cannot be processed. +#bad-namespace-prefix -- -- -- The entity has sent a namespace prefix that is unsupported, or has sent no namespace prefix on an element that requires such a prefix. +#conflict -- -- -- The server is closing the active stream for this entity because a new stream has been initiated that conflicts with the existing stream. +#connection-timeout -- -- -- The entity has not generated any traffic over the stream for some period of time. +#host-gone -- -- -- The value of the 'to' attribute provided by the initiating entity in the stream header corresponds to a hostname that is no longer hosted by the server. +#host-unknown -- -- -- The value of the 'to' attribute provided by the initiating entity in the stream header does not correspond to a hostname that is hosted by the server. +#improper-addressing -- -- -- A stanza sent between two servers lacks a 'to' or 'from' attribute (or the attribute has no value). +#internal-server-error -- -- -- The server has experienced a misconfiguration or an otherwise-undefined internal error that prevents it from servicing the stream. +#invalid-from -- cancel -- -- The JID or hostname provided in a 'from' address does not match an authorized JID or validated domain negotiated between servers via SASL or dialback, or between a client and a server via authentication and resource authorization. +#invalid-id -- -- -- The stream ID or dialback ID is invalid or does not match an ID previously provided. +#invalid-namespace -- -- -- The streams namespace name is something other than "http://etherx.jabber.org/streams" or the dialback namespace name is something other than "jabber:server:dialback". +#invalid-xml -- -- -- The entity has sent invalid XML over the stream to a server that performs validation. +#not-authorized -- -- -- The entity has attempted to send data before the stream has been authenticated, or otherwise is not authorized to perform an action related to stream negotiation. +#policy-violation -- -- -- The entity has violated some local service policy. +#remote-connection-failed -- -- -- The server is unable to properly connect to a remote resource that is required for authentication or authorization. +#resource-constraint -- -- -- The server lacks the system resources necessary to service the stream. +#restricted-xml -- -- -- The entity has attempted to send restricted XML features such as a comment, processing instruction, DTD, entity reference, or unescaped character. +#see-other-host -- -- -- The server will not provide service to the initiating entity but is redirecting traffic to another host. +#system-shutdown -- -- -- The server is being shut down and all active streams are being closed. +#undefined-condition -- -- -- The error condition is not one of those defined by the other conditions in this list. +#unsupported-encoding -- -- -- The initiating entity has encoded the stream in an encoding that is not supported by the server. +#unsupported-stanza-type -- -- -- The initiating entity has sent a first-level child of the stream that is not supported by the server. +#unsupported-version -- -- -- The value of the 'version' attribute provided by the initiating entity in the stream header specifies a version of XMPP that is not supported by the server. +#xml-not-well-formed -- -- -- The initiating entity has sent XML that is not well-formed.''' -xmpp_stanza_error_conditions = ''' -bad-request -- 400 -- modify -- The sender has sent XML that is malformed or that cannot be processed. -conflict -- 409 -- cancel -- Access cannot be granted because an existing resource or session exists with the same name or address. -feature-not-implemented -- 501 -- cancel -- The feature requested is not implemented by the recipient or server and therefore cannot be processed. -forbidden -- 403 -- auth -- The requesting entity does not possess the required permissions to perform the action. -gone -- 302 -- modify -- The recipient or server can no longer be contacted at this address. -internal-server-error -- 500 -- wait -- The server could not process the stanza because of a misconfiguration or an otherwise-undefined internal server error. -item-not-found -- 404 -- cancel -- The addressed JID or item requested cannot be found. -jid-malformed -- 400 -- modify -- The value of the 'to' attribute in the sender's stanza does not adhere to the syntax defined in Addressing Scheme. -not-acceptable -- 406 -- cancel -- The recipient or server understands the request but is refusing to process it because it does not meet criteria defined by the recipient or server. -not-allowed -- 405 -- cancel -- The recipient or server does not allow any entity to perform the action. -not-authorized -- 401 -- auth -- The sender must provide proper credentials before being allowed to perform the action, or has provided improper credentials. -payment-required -- 402 -- auth -- The requesting entity is not authorized to access the requested service because payment is required. -recipient-unavailable -- 404 -- wait -- The intended recipient is temporarily unavailable. -redirect -- 302 -- modify -- The recipient or server is redirecting requests for this information to another entity. -registration-required -- 407 -- auth -- The requesting entity is not authorized to access the requested service because registration is required. -remote-server-not-found -- 404 -- cancel -- A remote server or service specified as part or all of the JID of the intended recipient does not exist. -remote-server-timeout -- 504 -- wait -- A remote server or service specified as part or all of the JID of the intended recipient could not be contacted within a reasonable amount of time. -resource-constraint -- 500 -- wait -- The server or recipient lacks the system resources necessary to service the request. -service-unavailable -- 503 -- cancel -- The server or recipient does not currently provide the requested service. -subscription-required -- 407 -- auth -- The requesting entity is not authorized to access the requested service because a subscription is required. -undefined-condition -- 500 -- -- Undefined Condition -unexpected-request -- 400 -- wait -- The recipient or server understood the request but was not expecting it at this time (e.g., the request was out of order).''' +#xmpp_stanza_error_conditions = ''' +#bad-request -- 400 -- modify -- The sender has sent XML that is malformed or that cannot be processed. +#conflict -- 409 -- cancel -- Access cannot be granted because an existing resource or session exists with the same name or address. +#feature-not-implemented -- 501 -- cancel -- The feature requested is not implemented by the recipient or server and therefore cannot be processed. +#forbidden -- 403 -- auth -- The requesting entity does not possess the required permissions to perform the action. +#gone -- 302 -- modify -- The recipient or server can no longer be contacted at this address. +#internal-server-error -- 500 -- wait -- The server could not process the stanza because of a misconfiguration or an otherwise-undefined internal server error. +#item-not-found -- 404 -- cancel -- The addressed JID or item requested cannot be found. +#jid-malformed -- 400 -- modify -- The value of the 'to' attribute in the sender's stanza does not adhere to the syntax defined in Addressing Scheme. +#not-acceptable -- 406 -- cancel -- The recipient or server understands the request but is refusing to process it because it does not meet criteria defined by the recipient or server. +#not-allowed -- 405 -- cancel -- The recipient or server does not allow any entity to perform the action. +#not-authorized -- 401 -- auth -- The sender must provide proper credentials before being allowed to perform the action, or has provided improper credentials. +#payment-required -- 402 -- auth -- The requesting entity is not authorized to access the requested service because payment is required. +#recipient-unavailable -- 404 -- wait -- The intended recipient is temporarily unavailable. +#redirect -- 302 -- modify -- The recipient or server is redirecting requests for this information to another entity. +#registration-required -- 407 -- auth -- The requesting entity is not authorized to access the requested service because registration is required. +#remote-server-not-found -- 404 -- cancel -- A remote server or service specified as part or all of the JID of the intended recipient does not exist. +#remote-server-timeout -- 504 -- wait -- A remote server or service specified as part or all of the JID of the intended recipient could not be contacted within a reasonable amount of time. +#resource-constraint -- 500 -- wait -- The server or recipient lacks the system resources necessary to service the request. +#service-unavailable -- 503 -- cancel -- The server or recipient does not currently provide the requested service. +#subscription-required -- 407 -- auth -- The requesting entity is not authorized to access the requested service because a subscription is required. +#undefined-condition -- 500 -- -- Undefined Condition +#unexpected-request -- 400 -- wait -- The recipient or server understood the request but was not expecting it at this time (e.g., the request was out of order).''' -sasl_error_conditions = ''' -aborted -- -- -- The receiving entity acknowledges an <abort/> element sent by the initiating entity; sent in reply to the <abort/> element. -incorrect-encoding -- -- -- The data provided by the initiating entity could not be processed because the [BASE64]Josefsson, S., The Base16, Base32, and Base64 Data Encodings, July 2003. encoding is incorrect (e.g., because the encoding does not adhere to the definition in Section 3 of [BASE64]Josefsson, S., The Base16, Base32, and Base64 Data Encodings, July 2003.); sent in reply to a <response/> element or an <auth/> element with initial response data. -invalid-authzid -- -- -- The authzid provided by the initiating entity is invalid, either because it is incorrectly formatted or because the initiating entity does not have permissions to authorize that ID; sent in reply to a <response/> element or an <auth/> element with initial response data. -invalid-mechanism -- -- -- The initiating entity did not provide a mechanism or requested a mechanism that is not supported by the receiving entity; sent in reply to an <auth/> element. -mechanism-too-weak -- -- -- The mechanism requested by the initiating entity is weaker than server policy permits for that initiating entity; sent in reply to a <response/> element or an <auth/> element with initial response data. -not-authorized -- -- -- The authentication failed because the initiating entity did not provide valid credentials (this includes but is not limited to the case of an unknown username); sent in reply to a <response/> element or an <auth/> element with initial response data. -temporary-auth-failure -- -- -- The authentication failed because of a temporary error condition within the receiving entity; sent in reply to an <auth/> element or <response/> element.''' +#sasl_error_conditions = ''' +#aborted -- -- -- The receiving entity acknowledges an <abort/> element sent by the initiating entity; sent in reply to the <abort/> element. +#incorrect-encoding -- -- -- The data provided by the initiating entity could not be processed because the [BASE64]Josefsson, S., The Base16, Base32, and Base64 Data Encodings, July 2003. encoding is incorrect (e.g., because the encoding does not adhere to the definition in Section 3 of [BASE64]Josefsson, S., The Base16, Base32, and Base64 Data Encodings, July 2003.); sent in reply to a <response/> element or an <auth/> element with initial response data. +#invalid-authzid -- -- -- The authzid provided by the initiating entity is invalid, either because it is incorrectly formatted or because the initiating entity does not have permissions to authorize that ID; sent in reply to a <response/> element or an <auth/> element with initial response data. +#invalid-mechanism -- -- -- The initiating entity did not provide a mechanism or requested a mechanism that is not supported by the receiving entity; sent in reply to an <auth/> element. +#mechanism-too-weak -- -- -- The mechanism requested by the initiating entity is weaker than server policy permits for that initiating entity; sent in reply to a <response/> element or an <auth/> element with initial response data. +#not-authorized -- -- -- The authentication failed because the initiating entity did not provide valid credentials (this includes but is not limited to the case of an unknown username); sent in reply to a <response/> element or an <auth/> element with initial response data. +#temporary-auth-failure -- -- -- The authentication failed because of a temporary error condition within the receiving entity; sent in reply to an <auth/> element or <response/> element.''' -ERRORS, _errorcodes = {}, {} -for ns, errname, errpool in ((NS_XMPP_STREAMS, 'STREAM', -xmpp_stream_error_conditions), (NS_STANZAS, 'ERR', xmpp_stanza_error_conditions), -(NS_SASL, 'SASL', sasl_error_conditions)): - for err in errpool.split('\n')[1:]: - cond, code, typ, text = err.split(' -- ') - name = errname + '_' + ascii_upper(cond).replace('-', '_') - locals()[name] = ns + ' ' + cond - ERRORS[ns + ' ' + cond] = [code, typ, text] - if code: - _errorcodes[code] = cond -del ns, errname, errpool, err, cond, code, typ, text +#ERRORS, _errorcodes, loc = {}, {}, {} +#for ns, errname, errpool in ((NS_XMPP_STREAMS, 'STREAM', +#xmpp_stream_error_conditions), (NS_STANZAS, 'ERR', xmpp_stanza_error_conditions), +#(NS_SASL, 'SASL', sasl_error_conditions)): + #for err in errpool.split('\n')[1:]: + #cond, code, typ, text = err.split(' -- ') + #name = errname + '_' + ascii_upper(cond).replace('-', '_') + #locals()[name] = ns + ' ' + cond + #loc[name] = ns + ' ' + cond + #ERRORS[ns + ' ' + cond] = [code, typ, text] + #if code: + #_errorcodes[code] = cond +#del ns, errname, errpool, err, cond, code, typ, text +#import pprint +#pprint.pprint(ERRORS) +#pprint.pprint(_errorcodes) +#for (k, v) in loc.items(): + #print('%s = \'%s\'' % (k, v)) + +ERRORS = { + 'urn:ietf:params:xml:ns:xmpp-sasl aborted': ['', + '', + 'The receiving entity acknowledges an <abort/> element sent by the initiating entity; sent in reply to the <abort/> element.'], + 'urn:ietf:params:xml:ns:xmpp-sasl incorrect-encoding': ['', + '', + 'The data provided by the initiating entity could not be processed because the [BASE64]Josefsson, S., The Base16, Base32, and Base64 Data Encodings, July 2003. encoding is incorrect (e.g., because the encoding does not adhere to the definition in Section 3 of [BASE64]Josefsson, S., The Base16, Base32, and Base64 Data Encodings, July 2003.); sent in reply to a <response/> element or an <auth/> element with initial response data.'], + 'urn:ietf:params:xml:ns:xmpp-sasl invalid-authzid': ['', + '', + 'The authzid provided by the initiating entity is invalid, either because it is incorrectly formatted or because the initiating entity does not have permissions to authorize that ID; sent in reply to a <response/> element or an <auth/> element with initial response data.'], + 'urn:ietf:params:xml:ns:xmpp-sasl invalid-mechanism': ['', + '', + 'The initiating entity did not provide a mechanism or requested a mechanism that is not supported by the receiving entity; sent in reply to an <auth/> element.'], + 'urn:ietf:params:xml:ns:xmpp-sasl mechanism-too-weak': ['', + '', + 'The mechanism requested by the initiating entity is weaker than server policy permits for that initiating entity; sent in reply to a <response/> element or an <auth/> element with initial response data.'], + 'urn:ietf:params:xml:ns:xmpp-sasl not-authorized': ['', + '', + 'The authentication failed because the initiating entity did not provide valid credentials (this includes but is not limited to the case of an unknown username); sent in reply to a <response/> element or an <auth/> element with initial response data.'], + 'urn:ietf:params:xml:ns:xmpp-sasl temporary-auth-failure': ['', + '', + 'The authentication failed because of a temporary error condition within the receiving entity; sent in reply to an <auth/> element or <response/> element.'], + 'urn:ietf:params:xml:ns:xmpp-stanzas bad-request': ['400', + 'modify', + 'The sender has sent XML that is malformed or that cannot be processed.'], + 'urn:ietf:params:xml:ns:xmpp-stanzas conflict': ['409', + 'cancel', + 'Access cannot be granted because an existing resource or session exists with the same name or address.'], + 'urn:ietf:params:xml:ns:xmpp-stanzas feature-not-implemented': ['501', + 'cancel', + 'The feature requested is not implemented by the recipient or server and therefore cannot be processed.'], + 'urn:ietf:params:xml:ns:xmpp-stanzas forbidden': ['403', + 'auth', + 'The requesting entity does not possess the required permissions to perform the action.'], + 'urn:ietf:params:xml:ns:xmpp-stanzas gone': ['302', + 'modify', + 'The recipient or server can no longer be contacted at this address.'], + 'urn:ietf:params:xml:ns:xmpp-stanzas internal-server-error': ['500', + 'wait', + 'The server could not process the stanza because of a misconfiguration or an otherwise-undefined internal server error.'], + 'urn:ietf:params:xml:ns:xmpp-stanzas item-not-found': ['404', + 'cancel', + 'The addressed JID or item requested cannot be found.'], + 'urn:ietf:params:xml:ns:xmpp-stanzas jid-malformed': ['400', + 'modify', + "The value of the 'to' attribute in the sender's stanza does not adhere to the syntax defined in Addressing Scheme."], + 'urn:ietf:params:xml:ns:xmpp-stanzas not-acceptable': ['406', + 'cancel', + 'The recipient or server understands the request but is refusing to process it because it does not meet criteria defined by the recipient or server.'], + 'urn:ietf:params:xml:ns:xmpp-stanzas not-allowed': ['405', + 'cancel', + 'The recipient or server does not allow any entity to perform the action.'], + 'urn:ietf:params:xml:ns:xmpp-stanzas not-authorized': ['401', + 'auth', + 'The sender must provide proper credentials before being allowed to perform the action, or has provided improper credentials.'], + 'urn:ietf:params:xml:ns:xmpp-stanzas payment-required': ['402', + 'auth', + 'The requesting entity is not authorized to access the requested service because payment is required.'], + 'urn:ietf:params:xml:ns:xmpp-stanzas recipient-unavailable': ['404', + 'wait', + 'The intended recipient is temporarily unavailable.'], + 'urn:ietf:params:xml:ns:xmpp-stanzas redirect': ['302', + 'modify', + 'The recipient or server is redirecting requests for this information to another entity.'], + 'urn:ietf:params:xml:ns:xmpp-stanzas registration-required': ['407', + 'auth', + 'The requesting entity is not authorized to access the requested service because registration is required.'], + 'urn:ietf:params:xml:ns:xmpp-stanzas remote-server-not-found': ['404', + 'cancel', + 'A remote server or service specified as part or all of the JID of the intended recipient does not exist.'], + 'urn:ietf:params:xml:ns:xmpp-stanzas remote-server-timeout': ['504', + 'wait', + 'A remote server or service specified as part or all of the JID of the intended recipient could not be contacted within a reasonable amount of time.'], + 'urn:ietf:params:xml:ns:xmpp-stanzas resource-constraint': ['500', + 'wait', + 'The server or recipient lacks the system resources necessary to service the request.'], + 'urn:ietf:params:xml:ns:xmpp-stanzas service-unavailable': ['503', + 'cancel', + 'The server or recipient does not currently provide the requested service.'], + 'urn:ietf:params:xml:ns:xmpp-stanzas subscription-required': ['407', + 'auth', + 'The requesting entity is not authorized to access the requested service because a subscription is required.'], + 'urn:ietf:params:xml:ns:xmpp-stanzas undefined-condition': ['500', + '', + 'Undefined Condition'], + 'urn:ietf:params:xml:ns:xmpp-stanzas unexpected-request': ['400', + 'wait', + 'The recipient or server understood the request but was not expecting it at this time (e.g., the request was out of order).'], + 'urn:ietf:params:xml:ns:xmpp-streams bad-format': ['', + '', + 'The entity has sent XML that cannot be processed.'], + 'urn:ietf:params:xml:ns:xmpp-streams bad-namespace-prefix': ['', + '', + 'The entity has sent a namespace prefix that is unsupported, or has sent no namespace prefix on an element that requires such a prefix.'], + 'urn:ietf:params:xml:ns:xmpp-streams conflict': ['', + '', + 'The server is closing the active stream for this entity because a new stream has been initiated that conflicts with the existing stream.'], + 'urn:ietf:params:xml:ns:xmpp-streams connection-timeout': ['', + '', + 'The entity has not generated any traffic over the stream for some period of time.'], + 'urn:ietf:params:xml:ns:xmpp-streams host-gone': ['', + '', + "The value of the 'to' attribute provided by the initiating entity in the stream header corresponds to a hostname that is no longer hosted by the server."], + 'urn:ietf:params:xml:ns:xmpp-streams host-unknown': ['', + '', + "The value of the 'to' attribute provided by the initiating entity in the stream header does not correspond to a hostname that is hosted by the server."], + 'urn:ietf:params:xml:ns:xmpp-streams improper-addressing': ['', + '', + "A stanza sent between two servers lacks a 'to' or 'from' attribute (or the attribute has no value)."], + 'urn:ietf:params:xml:ns:xmpp-streams internal-server-error': ['', + '', + 'The server has experienced a misconfiguration or an otherwise-undefined internal error that prevents it from servicing the stream.'], + 'urn:ietf:params:xml:ns:xmpp-streams invalid-from': ['cancel', + '', + "The JID or hostname provided in a 'from' address does not match an authorized JID or validated domain negotiated between servers via SASL or dialback, or between a client and a server via authentication and resource authorization."], + 'urn:ietf:params:xml:ns:xmpp-streams invalid-id': ['', + '', + 'The stream ID or dialback ID is invalid or does not match an ID previously provided.'], + 'urn:ietf:params:xml:ns:xmpp-streams invalid-namespace': ['', + '', + 'The streams namespace name is something other than "http://etherx.jabber.org/streams" or the dialback namespace name is something other than "jabber:server:dialback".'], + 'urn:ietf:params:xml:ns:xmpp-streams invalid-xml': ['', + '', + 'The entity has sent invalid XML over the stream to a server that performs validation.'], + 'urn:ietf:params:xml:ns:xmpp-streams not-authorized': ['', + '', + 'The entity has attempted to send data before the stream has been authenticated, or otherwise is not authorized to perform an action related to stream negotiation.'], + 'urn:ietf:params:xml:ns:xmpp-streams policy-violation': ['', + '', + 'The entity has violated some local service policy.'], + 'urn:ietf:params:xml:ns:xmpp-streams remote-connection-failed': ['', + '', + 'The server is unable to properly connect to a remote resource that is required for authentication or authorization.'], + 'urn:ietf:params:xml:ns:xmpp-streams resource-constraint': ['', + '', + 'The server lacks the system resources necessary to service the stream.'], + 'urn:ietf:params:xml:ns:xmpp-streams restricted-xml': ['', + '', + 'The entity has attempted to send restricted XML features such as a comment, processing instruction, DTD, entity reference, or unescaped character.'], + 'urn:ietf:params:xml:ns:xmpp-streams see-other-host': ['', + '', + 'The server will not provide service to the initiating entity but is redirecting traffic to another host.'], + 'urn:ietf:params:xml:ns:xmpp-streams system-shutdown': ['', + '', + 'The server is being shut down and all active streams are being closed.'], + 'urn:ietf:params:xml:ns:xmpp-streams undefined-condition': ['', + '',

1 0

gajim: don't crash when cacerts.pem file doesn't exists
by Yann Leboulanger 10 Feb '13

10 Feb '13

changeset f882cb23d496 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f882cb23d496 description: don't crash when cacerts.pem file doesn't exists diffstat: src/common/connection.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r 3f8001c9d5c1 -r f882cb23d496 src/common/connection.py --- a/src/common/connection.py Tue Feb 05 13:22:03 2013 +0400 +++ b/src/common/connection.py Sun Feb 10 11:29:14 2013 +0100 @@ -1168,6 +1168,8 @@ port = self._current_host['port'] cacerts = os.path.join(common.gajim.DATA_DIR, 'other', 'cacerts.pem') + if not os.path.exists(cacerts): + cacerts = '' mycerts = common.gajim.MY_CACERTS secure_tuple = (self._current_type, cacerts, mycerts)

1 0

gajim: don't crash when cacerts.pem file doesn't exists
by Yann Leboulanger 10 Feb '13

10 Feb '13

changeset d39dea6c45de in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d39dea6c45de description: don't crash when cacerts.pem file doesn't exists diffstat: src/common/connection.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r 0ad7f7647d92 -r d39dea6c45de src/common/connection.py --- a/src/common/connection.py Thu Jan 24 21:23:57 2013 +0100 +++ b/src/common/connection.py Sun Feb 10 11:29:14 2013 +0100 @@ -1168,6 +1168,8 @@ port = self._current_host['port'] cacerts = os.path.join(common.gajim.DATA_DIR, 'other', 'cacerts.pem') + if not os.path.exists(cacerts): + cacerts = '' mycerts = common.gajim.MY_CACERTS secure_tuple = (self._current_type, cacerts, mycerts)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits