about summary refs log tree commit diff stats
Commit message (Collapse)AuthorAgeFilesLines
* Remove not needed if blocksMichael Vetter2019-11-011-9/+2
|
* Don't override ProfMessage Id with origin-idMichael Vetter2019-10-315-22/+46
| | | | | | | | | | Profanity sends the same value for both. Other clients might not. Safe both since we could need them later. Once we implement Last Message Correction we will need the regular id. If we override it with origin-id and another client chooses to not use the same value for id and origin-id then we can't interpret the id sent with the LMC request correctly.
* Replace sent_messages list with algoMichael Vetter2019-10-314-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | For OMEMO we had a list with our sent messages. It was used so that we don't decrypt our own messages in MUCs that come in via reflection. Recently for https://github.com/profanity-im/profanity/pull/1209 we started to use origin-id and use an algorithm so we can detect our own sent messages via checking origin-id. Profanity uses the same id for the message ID and origin-id. With 06f300a42c4c627b6f1817bd48d92f083ffd9883 we added the message_is_sent_by_us() function. We implemented XEP-0359 this way to fix https://github.com/profanity-im/profanity/issues/1201 so that we don't log our own messages in MUCs twice. We can now check whether the message was sent by us using this function and can get rid of the list. Probably we could also put many parts of the sv_ev_room_message() function inside (else) part of `if (!(g_strcmp0(mynick, message->jid->resourcepart) == 0 && message_is_sent_by_us(message))) {`. Have to look more closely whether any of this needs to be run in case the message actually comes from us.
* Merge pull request #1217 from aszlig/omemo-check-element-namesMichael Vetter2019-10-301-0/+8
|\ | | | | omemo: Check stanza names when iterating nodes
| * omemo: Check stanza names when iterating nodesaszlig2019-10-291-0/+8
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some clients (eg. PSI) are sending the stanzas delimited by whitespace text nodes, which will fail while looping through the <prekeys/> children and also print weird errors when iterating through the <list/> of devices. When debugging this, I was looking at the XML of Gajim and PSI and first was somehow confused why Profanity printed "OMEMO: received device without ID" while the XML looked identical (minus the actual IDs and the JIDs of course). However, Gajim was sending the XML without whitespace nodes in between and PSI did not, so for example the following (with the relevant whitespace nodes marked with X): <message type="headline" to="..." from="..."> <event xmlns="http://jabber.org/protocol/pubsub#event"> <items type="headline" node="eu.siacs.conversations.axolotl.devicelist"> <item id="..."> <list xmlns="eu.siacs.conversations.axolotl"> X <device id="..."/> X <device id="..."/> X </list> </item> </items> </event> <delay xmlns="urn:xmpp:delay" stamp="..." from="..."/> </message> ... would result in three times the "OMEMO: received device without ID" error, because we actually have three XML text nodes here that obviously don't have an "id" attribute. Now since the <list/> children above aren't really a problem and only annoying, text nodes in the <prekeys/> stanza actually cause omemo_start_device_session_handle_bundle to return failure. I've fixed this by explicitly matching the stanza names we are interested in, skipping everything else. Signed-off-by: aszlig <aszlig@nix.build> Reported-by: @devhell
* Put ifdef around tray.h functionsMichael Vetter2019-10-292-9/+8
| | | | Only define in case we built with GTK support.
* Remove not neede gtk_init() in tray.cMichael Vetter2019-10-291-1/+0
| | | | gtk_init_check() already has that functionality.
* Remove commentsMichael Vetter2019-10-291-6/+0
|
* Merge pull request #1216 from profanity-im/feature/issue-156-clipboardMichael Vetter2019-10-297-5/+179
|\ | | | | Paste command
| * Dont use clipboard_init yetMichael Vetter2019-10-292-1/+4
| | | | | | | | | | | | For now we initialize gtk in tray_init(). Should maybe use a general function and check in tray_init and clipboard_init whether gtk was already initialized.
| * Send clipboard via /pasteMichael Vetter2019-10-291-2/+34
| | | | | | | | | | | | New command `/paste` that sends the clipboard in MUC, Chat etc windows. Fix https://github.com/profanity-im/profanity/issues/156
| * Adjust tray configure switch to also include clipboardMichael Vetter2019-10-292-5/+7
| | | | | | | | General GTK.
| * Add clipboard featureMichael Vetter2019-10-295-0/+137
|/ | | | | Use GTK to take the text from the clipboard. Add `/paste` command which pastes this text now to console window.
* Update chat_log_pgp_msg_out() usageMichael Vetter2019-10-291-6/+6
| | | | Fix build
* Adjust message stubs in unit testsMichael Vetter2019-10-291-4/+4
|
* Two carbon logging changesMichael Vetter2019-10-291-27/+38
| | | | | | | | | | | | | Add resourcepart to the outgoing carbon that is logged, so we use the correct filenames for MUC PMs. Dont log incoming carbons of MUC PMs as a workaround to faulty server behaviour. See https://wiki.xmpp.org/web/Multi-Session_Nicks#Private_Messages under 'Client-side workaround behavior'. Regards https://github.com/profanity-im/profanity/issues/1214
* Also log sv_ev_delayed_private_messageMichael Vetter2019-10-291-0/+1
|
* Set mucuser in carbon caseMichael Vetter2019-10-291-0/+8
| | | | | | | | | | | Also we initialize mucuser properly. Now in case of a carbon of a MUC PM we sv_ev_incoming_carbon() which calls _sv_ev_incoming_plain() and then we log it via chat_log_msg_in() in there. But we also get the sv_ev_incoming_private_message() and call chat_log_msg_in() in there too. So the incoming message get's logged twice.
* Actually log MUC PM messagesMichael Vetter2019-10-285-28/+33
| | | | | | | | | | If I'm not mistaken MUC PMs have not been logged at all if there was no other client sending carbons. This should add MUC PM logging functionality. We still need to make sure carbons log to the same file. Regards https://github.com/profanity-im/profanity/issues/1214
* Remove not neede freeMichael Vetter2019-10-251-1/+0
| | | | It's in the def == NULL case. So will always be noop.
* Remove /leave commandMichael Vetter2019-10-222-27/+0
| | | | | | We have `/close` which does the same and more. Regards https://github.com/profanity-im/profanity/issues/1116
* Make forest theme more readableMichael Vetter2019-10-221-1/+2
|
* Adjust stub for connection_get_profanity_identifierMichael Vetter2019-10-221-1/+1
|
* Make prof_identifier constMichael Vetter2019-10-221-1/+1
|
* Display ownership of connection_get_profanity_identifierMichael Vetter2019-10-222-2/+2
|
* Dont allow new issuesMichael Vetter2019-10-221-0/+4
|
* Use UUID in origin-id and idMichael Vetter2019-10-222-11/+11
| | | | | Let's use UUID to have a more random string then just 10 alphanumeric values.
* Change default text colors to default (#1213)Martin2019-10-221-8/+8
| | | | | | | | Change default themes text color Using "default" instead of white makes the default better readable when using a black/dark font on white/light background. May fix #535
* Make sure date vars are initializedMichael Vetter2019-10-211-3/+3
|
* Properly display chatwin historyMichael Vetter2019-10-212-5/+10
| | | | | | | | | | | | | | | | | | | | So far if one had enabled `/history` and did `/msg somenick` the history was loaded from file and displayed like this: ``` 04-04-17 15:23 - 3/4/2017: 01-01-00 10:30 - me: .... 01-01-00 10:31 - somebody: .... 01-01-00 10:32 - somebody: .... ``` So the first line contained the actual date. But the date used in each line was always 01-01-2000. This date was for some reason hardcoded. This commit now actually uses that date to build the proper GDateTime instead of just printing it. Fix https://github.com/profanity-im/profanity/issues/922
* Remove old commentMichael Vetter2019-10-211-1/+0
| | | | | It's not up to date. Some time ago we changed from individual handlers to general ones.
* Merge pull request #1209 from jubalh/feature/xep-0359Michael Vetter2019-10-2120-117/+272
|\ | | | | XEP-0359
| * Set prof_ident to NULL after freeMichael Vetter2019-10-211-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This caused the bug mentioned in the PR comment: ``` It seems with the changes done here we get a crash in: src/xmpp/message.c message_handlers_init() when looking up handlers: ProfMessageHandler *handler = g_hash_table_lookup(pubsub_event_handlers, curr->data);. Steps to reproduce: open Profanity and connect /autoping set 10 /autoping timeout 10 stop WiFi/connection wait for Lost connection restart wifi /connect ```
| * Rename _calculate_identifier to _compute_identifierMichael Vetter2019-10-201-3/+3
| |
| * Rename random_bytes to profanity_instance_idMichael Vetter2019-10-191-6/+6
| |
| * Fix which message we want to logMichael Vetter2019-10-191-5/+3
| |
| * Free hmac and msgidMichael Vetter2019-10-192-3/+7
| |
| * Free prof_identifier in case of reconnectMichael Vetter2019-10-191-0/+3
| | | | | | | | Bedore we assign it new.
| * Move ProfMessage and message_is_sent_by_us to xmppMichael Vetter2019-10-193-24/+24
| | | | | | | | Not meant for internal usage only.
| * Change origin-id/id algoMichael Vetter2019-10-182-14/+29
| | | | | | | | | | Hash twice. Use HMAC SHA256 from glib.
| * Add message_is_sent_by_us stubMichael Vetter2019-10-181-0/+5
| |
| * Move message sent by us logic in own functionMichael Vetter2019-10-183-12/+21
| |
| * Remove accidentally added fileMichael Vetter2019-10-181-7/+0
| |
| * sv_ev_room_message: log in all cases if not our clientMichael Vetter2019-10-181-14/+13
| | | | | | | | Forgot to check what happens if the length is <= 10.
| * sv_ev_room_message: check if message->id is not NULLMichael Vetter2019-10-181-1/+1
| |
| * Add connection_get_profanity_identifier stubMichael Vetter2019-10-186-3/+15
| | | | | | | | And move defintion to xmpp.h
| * Add XEP-0359 to capabilitiesMichael Vetter2019-10-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | We implement </origin-id> from [XEP-0359](https://xmpp.org/extensions/xep-0359.html). We already had this implemented for OMEMO. And now use it to check whether MUC messages were sent from us (https://github.com/profanity-im/profanity/issues/1201). We don't implement </stanza-id> yet, but probably need to do so for MAM. Anyways let's flag this as implementing the XEP. Fix https://github.com/profanity-im/profanity/issues/1207
| * Log incoming MUC messages if origin-id sais they dont come from usMichael Vetter2019-10-183-12/+29
| | | | | | | | Regards https://github.com/profanity-im/profanity/issues/1201
| * Remove prefix from stanza idMichael Vetter2019-10-1710-64/+64
| | | | | | | | | | We sent `prof_prefix_uuid` as id. Where the prefix was also optional. We don't need this at all.
| * Change algo for connection_create_stanza_id()Michael Vetter2019-10-171-7/+11
| |