1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-09-29 19:56:07 -04:00
Commit Graph

493 Commits

Author SHA1 Message Date
Jan Hacker
e87eb4c40e "/bookmark add foo" crash - fix
A user providing an invalid JID when creating a new bookmark (like 'foo')
would reproducibly crash/segfault profanity, as it insists on checking
string length behind the @ of the JID. However, it could be NULL
if the user accidentally omitted it.
The patch avoids the crash by NULL-checking and prevents
getting there in the first place by checking the argument to "add".
Backtrace of unpatched profanity with above command:

Program received signal EXC_BAD_ACCESS, Could not access memory.
Reason: KERN_INVALID_ADDRESS at address: 0x0000000000000000
0x00007fff85699732 in strlen ()
(gdb) bt
 #0  0x00007fff85699732 in strlen ()
 #1  0x00000001000965d2 in xmpp_strdup ()
 #2  0x0000000100095d6d in xmpp_stanza_set_attribute ()
 #3  0x0000000100011c5c in _send_bookmarks ()
 #4  0x00000001000115a8 in _bookmark_add ()
 #5  0x000000010003320d in cmd_bookmark ()
 #6  0x000000010002a0f2 in cmd_execute ()
 #7  0x0000000100003a1d in process_input ()
 #8  0x00000001000037c7 in prof_run ()
 #9  0x0000000100045032 in main ()
(gdb)
2014-08-17 22:22:12 +02:00
Dariusz Dwornikowski
225312802e Spelling errors fixed and hyphenation used as minus sign fixed 2014-08-11 18:54:20 +02:00
James Booth
ac68cc77f8 Allow escaping commands using double slash "//" 2014-08-06 22:46:36 +01:00
James Booth
e38ebe8a85 Check for unknown commands and show message in console
fixes #390
2014-08-04 22:21:53 +01:00
James Booth
9123675c9c Show message when no group or empty roster on /who 2014-07-22 23:31:14 +01:00
James Booth
fd1d540889 Added _who_roster function 2014-07-22 23:27:36 +01:00
James Booth
6a1975f65b Added _who_room function 2014-07-22 23:22:50 +01:00
James Booth
1aee7ce4bf Show message when no contacts with presence for /who 2014-07-22 23:17:42 +01:00
James Booth
d02c8af532 Save chat room message prefix for autocomplete 2014-07-15 22:46:29 +01:00
James Booth
2f3234a5f5 Added quote param to autocomplete_param_with_ac 2014-07-09 20:32:28 +01:00
James Booth
954661e59e Added quote param to autocomplete_complete 2014-07-09 20:23:47 +01:00
James Booth
c98ce4299d Free resources on OTR shutdown 2014-06-26 23:55:57 +01:00
James Booth
d668d15081 Free aliases on cmd_init 2014-06-18 21:36:09 +01:00
James Booth
7344d3b898 Added deallocation function for string prefs, added otr policy enum 2014-06-18 00:32:36 +01:00
James Booth
79ddf10484 Fixed memleaks with otr policy and autoaway options 2014-06-17 23:34:52 +01:00
James Booth
d0fa51fe67 Fixed compiler warning 2014-06-03 21:48:38 +01:00
James Booth
1925cb80ec Show info in chat and private chat windows 2014-06-03 21:35:27 +01:00
James Booth
c65b43f081 Show info in room for participant 2014-06-03 21:20:13 +01:00
James Booth
b36fbe413a Added settings to show message text in notifications 2014-05-24 22:14:26 +01:00
James Booth
b25b3f3180 Added notification setting for typing in current window 2014-05-24 21:13:33 +01:00
James Booth
eb0f0dd96b Added settings for message notifications in current window 2014-05-24 20:46:03 +01:00
James Booth
8e14946aad Ignore case for chat room mention notification 2014-05-24 16:59:45 +01:00
James Booth
866d87af79 Added /notify room mention setting 2014-05-24 16:46:05 +01:00
James Booth
7d90d218c0 Split regular and chat room notify settings 2014-05-24 15:54:10 +01:00
James Booth
0166454794 Added config.h to files checking for OTR support 2014-05-19 21:25:21 +01:00
James Booth
e10ea1be4e Fixed OTR dependency when library not present, changed version to 0.4.2 2014-05-19 20:41:19 +01:00
cara marie
058ce13aec spelling corrections 2014-05-17 18:19:30 -07:00
James Booth
10a8798973 Corrected bookmark help 2014-05-17 23:20:23 +01:00
James Booth
cb614ec36f Free autocomplete hash table 2014-05-17 22:49:24 +01:00
James Booth
e762d80b68 Use hash table for autocomplete functions 2014-05-14 21:54:38 +01:00
James Booth
75898a777a More tidy of bookmark autocomplete 2014-05-14 21:01:54 +01:00
James Booth
bd55e7a978 Tidied bookmark autocompleter 2014-05-14 20:53:31 +01:00
James Booth
506ce9cb13 Added autocomplete for bookmark autojoin 2014-05-14 20:49:25 +01:00
James Booth
9dda7036a9 Implemented per contact OTR policy setting 2014-05-11 19:32:07 +01:00
James Booth
6d955609c5 Added /otr policy for contacts in account preferences 2014-05-11 18:13:04 +01:00
James Booth
2aa39fc362 Add contact to /otr policy autocomplete 2014-05-11 15:59:11 +01:00
James Booth
3967b26aea Added otr to /account clear properties 2014-05-11 15:32:38 +01:00
James Booth
d44e954f6b Added otr property to /account help 2014-05-11 15:26:45 +01:00
James Booth
e8d84abb46 Moved OTR policy check to otr module 2014-05-11 15:03:10 +01:00
James Booth
95ff13136b Added OTR policy account preference 2014-05-11 14:13:15 +01:00
James Booth
f2ebbdb8de Added autocompletion for /account set <account> otr <policy> 2014-05-11 13:48:41 +01:00
James Booth
015780662e Added /prefs otr 2014-05-11 13:32:59 +01:00
James Booth
7e359c171c Added autocomplete for bookmark options 2014-05-11 00:17:10 +01:00
James Booth
d2662a6f17 Refactored bookmarks to use option parser, allow bookmarking rooms with passwords 2014-05-10 00:50:43 +01:00
James Booth
dfb1e1c4a2 Added help for shared secret and question answer otr verification 2014-05-07 21:28:36 +01:00
James Booth
a077d2008a Added question answer authentication (libotr 3.2.x) 2014-04-30 23:59:40 +01:00
James Booth
2bc19f4669 Added SMP secret authentication success message 2014-04-27 01:17:38 +01:00
James Booth
aff9eee433 Handle SMP secret response 2014-04-26 22:52:25 +01:00
James Booth
06d81ed9ce Send SMP init message with /otr secret 2014-04-26 22:08:53 +01:00
James Booth
d6e92f62dc Fixed cppcheck warnings 2014-04-26 00:36:36 +01:00
James Booth
f8b2e009ed Fixed /wins swap help 2014-04-24 23:09:04 +01:00
James Booth
e9ddbab585 Allow /wins swap to move to empty position 2014-04-24 23:06:42 +01:00
James Booth
547b6cf4da Added command /wins swap 2014-04-24 21:50:59 +01:00
James Booth
4d8caee483 Added /otr policy autocompletion 2014-04-23 00:01:18 +01:00
James Booth
1a0f12b0e6 Merge remote-tracking branch 'lucian/master' 2014-04-22 23:53:15 +01:00
lightb
da89e24172 Added opportunistic send functionality to cmd_msg
If policy is set to 'opportunistic' then when the user executes cmd_msg it will append the otr whitespace tag to the message

The other client should start AKE once it receives the message.

TODO: Analyze incoming messages for whitespace tag
2014-04-21 18:03:07 -04:00
James Booth
2c15aba92a Chat room windows now created only after successful join 2014-04-21 00:37:04 +01:00
lightb
1ceca89296 Added some otr policy functionality, if policy is set to "always"
if otr_is_secure fails, the message will not be sent.

Changed both cmd_msg and cmd_execute_default
2014-04-19 05:08:33 -04:00
lightb
a687e3f6b4 Added /otr policy to commands (still need to add autocomplete stuff?) 2014-04-19 04:18:53 -04:00
lightb
02b77cfa4e Added PREF_OTR_POLICY to preferences.c -> key -> otr.policy
Added default value "manual" to PREF_OTR_POLICy -> preferences.c
Modified help string to reflect otr_policy, started checks on cmd_otr
2014-04-19 04:00:41 -04:00
James Booth
ef776e52ca Tidied xmlconsole 2014-04-15 23:45:17 +01:00
James Booth
e6e0a13e89 Added XML Console window 2014-04-15 13:16:32 +01:00
James Booth
40759eddbf Simplified parse_options to take first option as argument 2014-04-15 00:27:55 +01:00
James Booth
4425aba1f2 Simplified parse_options to take gchar** 2014-04-15 00:13:32 +01:00
James Booth
79088d0150 Clean up keys after using parse_options 2014-04-14 23:41:45 +01:00
James Booth
3e69d6b71e Refactored cmd_join to use parse_options 2014-04-14 23:36:00 +01:00
James Booth
428d9eb936 Refactored cmd_connect to use parse_options 2014-04-14 23:15:39 +01:00
James Booth
67a109927c Added /log where command 2014-04-13 22:20:15 +01:00
James Booth
c3418a2909 Added /log shared setting
Issue #170
2014-04-13 21:56:51 +01:00
James Booth
a4a23fdf68 Added /log rotate option 2014-04-13 20:41:11 +01:00
James Booth
71180f66d7 Added focus param to ui_room_join, not set for bookmark autojoin
Issue #194
2014-04-13 02:52:25 +01:00
James Booth
0b2f810431 Added bookmark autocomplete to /join
Issue #194
2014-04-13 01:20:36 +01:00
James Booth
5bb3fab17c Implemented "/bookmark add" for private storage
Issue #194
2014-04-13 01:01:53 +01:00
James Booth
132976d85e Revert "Added ui_unknown_command"
This reverts commit 714ee24863.
2014-04-12 15:20:31 +01:00
James Booth
2fafcf0013 Revert "Added ui_already_connected"
This reverts commit e97ec56fce.
2014-04-12 15:20:19 +01:00
James Booth
e97ec56fce Added ui_already_connected 2014-04-09 22:29:38 +01:00
James Booth
714ee24863 Added ui_unknown_command 2014-04-09 22:13:01 +01:00
James Booth
b9aac28ccc Refactored invalid command usage 2014-04-09 22:05:31 +01:00
James Booth
26216f6c17 Refactored cmd_execute 2014-04-09 21:38:57 +01:00
James Booth
c3e3759256 Command argument parsers set result argument 2014-04-09 21:31:43 +01:00
James Booth
9aa282f6de Removed inputwin functions from ui.h 2014-04-07 21:50:28 +01:00
James Booth
f0f0dbfdac Removed statusbar functions from ui.h 2014-04-07 21:12:30 +01:00
James Booth
fc40637789 Removed titlebar functions from ui.h 2014-04-07 20:41:06 +01:00
James Booth
aa2a87d162 Tidied ui dependencies 2014-04-06 21:35:17 +01:00
James Booth
561d96c711 Removed titlebar version property and allow disabling of titlebar display 2014-04-03 21:46:43 +01:00
James Booth
a720ef2627 Removed strcpy calls 2014-04-02 21:01:20 +01:00
James Booth
b19b881b97 Added missing files, refactored ui_switch_win to check win exists 2014-04-01 23:54:26 +01:00
James Booth
404dde2810 Renamed refresh functions to update_virtual 2014-04-01 21:52:04 +01:00
James Booth
7e27d96f16 Revert "Commented bookmarks code for 0.4.0 release"
This reverts commit 8306d4c244.
2014-03-29 22:58:48 +00:00
James Booth
8306d4c244 Commented bookmarks code for 0.4.0 release 2014-03-16 18:20:31 +00:00
James Booth
22ab268618 Change 'passwd' option to 'password' for /join command 2014-03-16 18:12:16 +00:00
James Booth
89f306ceb2 Updated /roster help 2014-03-16 17:59:01 +00:00
James Booth
11c04d9fcd Added /roster clearnick command 2014-03-16 17:53:41 +00:00
James Booth
05952e8337 Small changes to help 2014-03-16 00:53:46 +00:00
James Booth
2af418fd8d Command '/statuses muc' now allows 'all', 'online' and 'none' settings 2014-03-15 22:25:15 +00:00
James Booth
26726b207a Updated copyright 2014-03-09 01:18:19 +00:00
James Booth
b177250f47 Refactored muc_room_is_active to only take room, rather than full jid 2014-03-08 21:20:26 +00:00
James Booth
dd1ee18c72 Added test for /join with nick option 2014-03-08 21:10:23 +00:00
James Booth
e9b5d3294b Removed unused variables from cmd_join 2014-03-08 18:32:48 +00:00
James Booth
a94814f0a9 Added invalid jid test for /join 2014-03-08 00:23:52 +00:00
James Booth
2d54c565ce Added test to show usage when no room supplied to /join 2014-03-08 00:19:21 +00:00
James Booth
f3fe1d34d2 Added connection status tests for cmd_join 2014-03-08 00:07:38 +00:00
James Booth
a9e2028981 Added autocompeleter for /join options 2014-03-05 20:57:59 +00:00
Kristofer M White
7c6755b62c Ensuring nick is set when not included in opt args for cmd_join 2014-03-05 19:55:02 +00:00
Kristofer M White
3f18d933ca Removing extra nick = line that broke nick assignment 2014-03-05 17:39:44 +00:00
Kristofer M White
a4e2809756 Removing strdup calls per cmd_connect design 2014-03-05 17:25:26 +00:00
Kristofer M White
28425060bc Parsing optional args for cmd_join 2014-03-05 17:13:42 +00:00
Kristofer M White
8a54c5895d Adding password handling for joining chatrooms 2014-02-27 05:31:10 +00:00
Kristofer M White
79d55a4668 Updating cmd description 2014-02-25 18:45:45 +00:00
James Booth
18e0884f5f Fixed issue with /otr myfp when no key loaded 2014-02-23 20:34:27 +00:00
James Booth
66424565dd Show OTR status on /msg usr when usr has already started an OTR session
fixes #308
2014-02-23 01:17:03 +00:00
James Booth
09472e43c4 Added OTR supported versions in initial start query message 2014-02-18 22:31:27 +00:00
James Booth
7e956fb347 Added tests for /otr warn 2014-02-16 02:22:29 +00:00
James Booth
6295336284 Added cmd_otr tests 2014-02-16 00:04:53 +00:00
James Booth
17d3751306 Fixed /alias add, when alias already exists 2014-02-15 21:17:31 +00:00
James Booth
b30155a10e Moved otr sources into folder 2014-02-12 22:19:21 +00:00
James Booth
25131e3f36 Added command to show libotr version 2014-02-11 23:19:09 +00:00
James Booth
9d957e5f93 Show message on /bookmark remove when bookmark does not exist 2014-02-02 00:59:32 +00:00
James Booth
92b85bb7f1 Added message when bookmark updated 2014-02-02 00:49:02 +00:00
James Booth
a8ecbccc9c Added /bookmark remove tests 2014-02-02 00:37:37 +00:00
James Booth
ebafc19220 Added cons message on ./bookmark add 2014-02-02 00:00:08 +00:00
James Booth
af51fa3c68 Added cmd_bookmark tests 2014-02-01 23:48:24 +00:00
James Booth
3d7d070b13 Added test for /bookmark list 2014-02-01 21:18:15 +00:00
James Booth
614ae232ef Fixed cmd_bookmark message when not connected 2014-02-01 16:24:51 +00:00
James Booth
652e99fdd8 Added cmd_bookmark tests 2014-02-01 16:16:56 +00:00
James Booth
8f6ead2b7b Changed log level to info for failed connection 2014-01-27 22:50:32 +00:00
James Booth
5472c6965a Moved xmpp ping to iq module 2014-01-26 00:15:34 +00:00
James Booth
4bd06a5d87 Don't allow /alias to overwrite standard command 2014-01-25 01:39:12 +00:00
James Booth
b05e17db3e Added autocomplete for /alias remove 2014-01-25 01:00:51 +00:00
James Booth
cb590dd82c Added help for /alias command 2014-01-25 00:50:07 +00:00
James Booth
5d85974bc0 Added aliases to autocomplete 2014-01-23 23:53:20 +00:00
James Booth
66631308a5 Implemented basic running of alias commands 2014-01-23 23:04:00 +00:00
James Booth
e089ffb15c Show message when alias already exists in /alias add 2014-01-23 22:38:12 +00:00
James Booth
8dbe300d72 Added /alias command, writing aliases to [alias] group in profrc 2014-01-23 22:29:53 +00:00
James Booth
8ba2d26947 Added skeleton /alias command 2014-01-23 19:56:33 +00:00
James Booth
b6c52007ee Removed debug 2014-01-23 19:27:39 +00:00
James Booth
3f31c1a4e7 Encrypt /tiny command when in OTR session
fixes #292
2014-01-23 19:25:53 +00:00
James Booth
21ab182151 Refactored ProfAccount creation 2014-01-22 22:22:01 +00:00
James Booth
7e9c8c02a3 Implemented autocomplete for new /statuses options 2014-01-21 00:28:56 +00:00
James Booth
9549cf431e Tidied /statuses help 2014-01-21 00:20:31 +00:00
James Booth
79e9ab83b0 Changed /statuses preferences 2014-01-19 16:17:34 +00:00
James Booth
c7325de073 Added cmd_statuses validation tests 2014-01-19 01:25:04 +00:00
James Booth
0edfef5612 Added /account set <account> port <port> 2014-01-19 00:05:04 +00:00
James Booth
47fe146a22 Added to and tidied /connect help 2014-01-18 23:49:15 +00:00
James Booth
b32ba75db5 Implemented autocomplete for /connect properties 2014-01-18 23:43:13 +00:00
James Booth
168cb0e557 Moved /connect autocomplete to function 2014-01-18 23:05:35 +00:00
James Booth
91d4097df9 Added cmd_connect test for repeated port property 2014-01-18 22:50:17 +00:00
James Booth
21f0bd04a8 Added cmd_connect test for repeated server property 2014-01-18 22:45:24 +00:00
James Booth
b4e9905db9 Added cmd_connect tests for argument validation 2014-01-18 21:18:25 +00:00
James Booth
e7013408e5 WIP - Adding port to account options 2014-01-18 01:45:05 +00:00
James Booth
45aee2e778 Tidied OTR messages 2014-01-16 23:16:37 +00:00
James Booth
4f98bc8c25 Show OTR coloured status
Customisable within theme files e.g.:
titlebar.unencrypted=red
titlebar.encrypted=green
titlebar.trusted=red
titlebar.untrusted=green

Shows [unencrypted] for all non-OTR chat

Disable with '/otr warn off'
2014-01-16 22:44:23 +00:00
James Booth
9f6d6d44cc Renamed title_bar_set_status -> title_bar_set_presence 2014-01-16 18:13:22 +00:00
James Booth
ecf323de31 Implemented chat logging options for OTR messages
on - Log OTR messages as plaintext
off - Do not log OTR messages
redact - Log, but replace the text with '[redacted]'

Defaults to redact
2014-01-13 20:38:19 +00:00
James Booth
60820007ee Added setting /otr log on|off|redact 2014-01-13 20:17:45 +00:00
James Booth
df760bed18 Check for already established but not used OTR session on /otr start <contact>
For example, one may have been established from the other end, without
any messages being sent yet
2014-01-13 19:25:08 +00:00
James Booth
a07880f5c0 Implemented /otr start <contact> 2014-01-13 19:16:46 +00:00
James Booth
bc1d4df230 Open new chat win, or use existing for /otr start <contact> 2014-01-13 19:12:23 +00:00
James Booth
671fa839e8 Added contact autocompletion to /otr start <contact> 2014-01-13 19:00:34 +00:00
James Booth
aa4dede30a Moved otr autocompletion to function 2014-01-13 18:56:04 +00:00
James Booth
933b56c449 Added /otr to /help chatting 2014-01-12 21:58:29 +00:00
James Booth
264fc55aa2 Added conditionals to makefile for otr support 2014-01-12 02:15:16 +00:00
James Booth
462e84ea82 Added /otr trust|untrust commands 2014-01-12 01:20:22 +00:00
James Booth
43deea7c05 Added /otr autocompleter and updated help 2014-01-12 00:10:16 +00:00
James Booth
494aaadba4 Added /otr end command 2014-01-11 23:59:20 +00:00
James Booth
f35e485bd4 Handle window creation for incoming and outgoing OTR sessions 2014-01-11 21:44:24 +00:00
James Booth
5a7eba518d Show contacts fingerprint on /otr theirfp 2014-01-11 20:02:35 +00:00
James Booth
03086c0384 Added /otr theirfp with hardcoded fingerprint 2014-01-11 19:10:00 +00:00
James Booth
bc8532b79c Renamed fingerprint command, updated help 2014-01-11 18:29:37 +00:00
James Booth
b5469e2e06 Added [OTR] and (trusted/untrusted) to titlebar for OTR sessions 2014-01-11 18:24:44 +00:00
James Booth
d189f7ea43 Use version 1 query to start OTR session 2014-01-11 17:15:07 +00:00
James Booth
9daefe170d Require '/otr start' from both parties before encryption used both ways 2014-01-11 17:03:01 +00:00
James Booth
5c13538e6b Load OTR private key on connect, gen command checks if already generated 2014-01-11 15:48:22 +00:00
James Booth
e294a6db92 Added "/otr fp" to show users fingerprint 2014-01-10 20:20:38 +00:00
James Booth
84f1c4b96f WIP - OTR support 2014-01-10 00:08:49 +00:00
James Booth
0776c574b6 Merge branch 'master' into otr 2014-01-05 23:58:10 +00:00
James Booth
76484665fd Removed prof_handle group functions 2014-01-05 23:24:48 +00:00
James Booth
1d716e48ad Removed roster_list dependency on xmpp module 2014-01-05 23:08:11 +00:00
James Booth
06ce95f68a Refactored roster_change_name 2014-01-05 22:55:04 +00:00
James Booth
468e80fe30 Removed prof_handle_disconnect 2014-01-05 22:00:15 +00:00
James Booth
4a8d6c2153 Renamed roster_add_new -> roster_send_add_new 2014-01-05 20:33:48 +00:00
James Booth
170af88c0d Merge branch 'master' into otr
Conflicts:
	Makefile.am
2014-01-02 01:57:05 +00:00
James Booth
3fbd45bd06 Added full stop to /help help summary
Conflicts:

	src/command/command.c
2014-01-02 01:53:46 +00:00
James Booth
3a57a792e4 Added full stop to /grlog help summary
Conflicts:

	src/command/command.c
2014-01-02 01:52:53 +00:00
James Booth
8d4bec2d37 Added full stop to /chlog help summary
Conflicts:

	src/command/command.c
2014-01-02 01:51:21 +00:00
James Booth
d3fff13255 Added full stop to /about help summary
Conflicts:

	src/command/command.c
2014-01-02 01:49:46 +00:00
James Booth
976f3e303a Added /sub command test 2013-12-27 17:25:30 +00:00
James Booth
6d6bc67d5c Test for presence update when changing priority 2013-12-27 14:17:24 +00:00
James Booth
7a63cf2e22 Changed messages on invalid priorities 2013-12-27 00:29:20 +00:00
James Booth
5a5b1340aa Dynamically load UI functions, fixed tests 2013-12-22 22:14:15 +00:00
James Booth
bc700fbfea Merge branch 'master' into otr 2013-12-18 00:36:05 +00:00
James Booth
f47bd58a1c Added tests for setting presence priorities 2013-12-17 23:57:06 +00:00
James Booth
95d08db292 Merge branch 'master' into otr
Conflicts:
	src/command/commands.c
2013-12-16 01:11:36 +00:00
James Booth
6d75ebb8e9 Test account free'd after connect 2013-12-15 22:00:42 +00:00
James Booth
5e739cbfb7 Moved fulljid logic to accounts 2013-12-15 20:32:30 +00:00
James Booth
079ea5304b Moved _ask_password to UI module 2013-12-15 19:38:23 +00:00
James Booth
2470f642c7 Merge branch 'master' into otr
Conflicts:
	src/command/command.c
2013-12-15 17:19:01 +00:00
James Booth
2490f5b417 Seperated command functions into module 2013-12-15 16:10:32 +00:00
James Booth
107fdd355e Added simple mock test, refactored roster 2013-12-14 15:34:17 +00:00
James Booth
06367723d7 Merge branch 'master' into otr 2013-12-10 22:13:21 +00:00