aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00
Code
5,505 Commits 7 Branches 77 Tags 12 MiB
d4bd0d02fb
Commit Graph

4082 Commits

Author SHA1 Message Date
Nei
f4c8018cfb Merge branch 'fix-gl-13' into 'security' 
Fix use after free when channel is destroyed inbetween being synced

See merge request irssi/irssi!19
 2017-10-20 15:22:32 +02:00
Joseph Bisch
beb2beba3b Revert "Don't proceed with cmd_msg if there was an error splitting msg" 
This reverts commit bd83852d646de28f2e0fe01efe7c9236aa4074d4.
 2017-10-20 15:22:32 +02:00
Nei
e37d9b2497 Merge branch 'fix-gl-12' into 'security' 
fix out of bounds read in compress_colors

See merge request irssi/irssi!18
 2017-10-20 15:22:32 +02:00
Joseph Bisch
73d7b9d775 Don't proceed with cmd_msg if there was an error splitting msg 
There may be cases (such as if target or server->nick is very long)
where the split_message function returns NULL, indicating an error. To
avoid a potential segfault, we now check to see if splitmsgs is NULL.
 2017-10-20 15:22:32 +02:00
ailin-nemui
9f0dc4766c fix dcc issue 2017-10-20 15:14:10 +02:00
LemonBoy
45dfe2ba38 Prevent a OOB read when parsing IRCNet ! channels 
Make sure the string has enough data.
Fixes #16
 2017-10-19 11:17:56 +02:00
LemonBoy
28d0b8c746 Merge pull request #771 from paultownsend/issue-120 
Add alternate_nick as a network-specific property
 2017-10-18 12:00:56 +02:00
Paul Townsend
7b94015f8f Changes based on comments in pull #771. 2017-10-14 17:42:45 +01:00
Will Storey
233be9f580 Mark net_ip_compare() deprecated 2017-10-13 18:30:57 -07:00
Will Storey
da59fd7c2d Revert "Delete unused function net_ip_compare()" 
This reverts commit cb5f3cba1f.
 2017-10-13 18:28:26 -07:00
ailin-nemui
7b97edf9d1 Merge pull request #769 from horgh/horgh/error-check-server-connect 
Set host to an empty string on error
 2017-10-13 17:14:47 +02:00
Edward Tomasz Napierala
9895e7b28a Silence down a warning that would appear on "/away" in Capability mode. 2017-10-11 23:52:36 +01:00
Edward Tomasz Napierala
5c0b4aeb05 Sort Capsicum headers. 2017-10-11 23:31:26 +01:00
Edward Tomasz Napierala
1e66cbd62e Improve Capsicum stdio limits to fix terminal state on exit. 2017-10-11 23:13:06 +01:00
Paul Townsend
87955b69cb Add alternate_nick as a network-specific property. 2017-10-11 21:33:14 +01:00
Edward Tomasz Napierala
17b195021d Bump default capsicum_port_max to 9999. 
This is needed for servers like ssl.efnet.org, which, per default
config, listen on 9999.
 2017-10-11 14:34:38 +01:00
Will Storey
174adee9dd Always initialize the host string 
This also removes a wordy comment
 2017-10-10 18:21:05 -07:00
Will Storey
b8b90c76d4 Delete unused function net_connect() 2017-10-09 13:20:44 -07:00
Will Storey
3b3939b146 Delete commented out CYGWIN define 2017-10-09 13:14:59 -07:00
Will Storey
cb5f3cba1f Delete unused function net_ip_compare() 2017-10-09 13:14:34 -07:00
Will Storey
4ccff71f67 Set host to an empty string on error 
While investigating #317, I noticed that it was possible we would access
an uninitialized buffer due to failing to check the return value of
net_ip2host(). This is done in several places. To make such uses safe,
set the host buffer to an empty string on error. It is possible callers
could be improved by handling the error in each spot, but this gives us
some safety.
 2017-10-09 12:50:04 -07:00
Joseph Bisch
2edd816e7d
Fix segfault in query_remove_all 
It is possible for rec to be NULL in query_remove_all, resulting in a
segfault. So return without doing anything if rec is NULL.
 2017-10-08 22:02:44 -04:00
ailin-nemui
49ace3251b fix uaf in chanquery module 
the chanquery needs to be removed in any case if a channel rec is
destroyed, regardless of any state

Fixes GL#13
 2017-10-08 19:48:11 +02:00
ailin-nemui
00c80cb6fc fix out of bounds read in compress_colors 
Reported by Hanno Böck.

Fixes GL#12
 2017-10-07 20:48:53 +02:00
Edward Tomasz Napierala
40ae8f5fa6 Limit capsicum rights to stdio. 
This requires FreeBSD fix (https://reviews.freebsd.org/D12622)
to work properly.
 2017-10-07 03:28:02 +01:00
ailin-nemui
5da0b73a12 up abi 2017-10-06 15:31:59 +02:00
ailin-nemui
deac66f33c add a key binding to erase history entries 
it is possible to delete the current history entry using the
erase_history_entry key binding
 2017-10-06 15:31:52 +02:00
ailin-nemui
16d68a86ca add two XSFuncs to manipulate command history entries 
it is possible to use Irssi::UI::Window::get_history_entries to save the
history entries, load_history_entries to load entries into the command
history and delete_history_entries to remove history entries (for example
to remove history selectively)
 2017-10-06 15:02:15 +02:00
ailin-nemui
1fd285dccf refactor history to use history_entries list 
this allows access to the global history even when a using /window history
named or /set window_history on, and you want to recall something from one
of the other windows' histories.

usage (default): ctrl+up/down
 2017-10-06 14:58:47 +02:00
ailin-nemui
92dbb1895b Merge pull request #754 from ailin-nemui/fix-752 
add new function to set the position in bytes
 2017-10-05 11:31:44 +02:00
ailin-nemui
1f7de4c3bd up abi 2017-10-05 11:31:33 +02:00
ailin-nemui
8dfeca57ed hidden lines 2017-09-21 14:20:31 +02:00
ailin-nemui
0468c5d912 add new function to set the position in bytes 
fixes #752
 2017-09-15 13:47:01 +02:00
ailin-nemui
fc8c15fcd7 Merge pull request #755 from trasz/capsicum 
Get rid of the zombies in Capsicum capability mode.
 2017-09-15 13:40:17 +02:00
Edward Tomasz Napierala
624ef4a696 Get rid of the zombies in Capsicum capability mode. 
Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
 2017-09-12 14:19:17 +01:00
LemonBoy
36d8b974fc Restore compatibility with old OpenSSL versions 
Let's implement X509_STORE_up_ref on our own.
 2017-09-11 17:19:20 +02:00
LemonBoy
96d5a4669d Increment the X509_STORE refcount during the connection 
OpenSSL doesn't increment the reference count when the store is assigned
to a SSL_CTX.
 2017-09-11 16:32:36 +02:00
ailin-nemui
24ad80177b Merge pull request #735 from trasz/capsicum 
Add Capsicum support
 2017-09-10 19:43:59 +02:00
Edward Tomasz Napierala
b529e1a9df Fix /back in Capsicum capability mode. 
Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
 2017-09-08 13:14:24 +01:00
LemonBoy
7086eae650 Complete filenames ending with a slash 2017-08-29 21:03:42 +02:00
ailin-nemui
13471013f3 Merge pull request #737 from ailin-nemui/fix-733 
Revert "Merge pull request #452 from LemonBoy/terminfo-cup"
 2017-08-10 16:49:32 +02:00
Edward Tomasz Napierala
edee0ba587 Don't error out on failure to load default certificate store. 
This restores the previous behaviour.

Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
 2017-08-10 14:35:34 +01:00
Joseph Bisch
1ad38b27e4 Merge pull request #738 from trasz/master 
Fix indentation; no functional changes.
 2017-08-09 10:29:10 -04:00
Edward Tomasz Napierala
4bcbb41113 Fix indentation; no functional changes. 
(Take two.)

Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
 2017-08-09 14:36:06 +01:00
Edward Tomasz Napierala
0c49a84ffb Add back some ifdefs. 
Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
 2017-08-09 11:06:36 +01:00
ailin-nemui
947682e5dd Revert "Merge pull request #452 from LemonBoy/terminfo-cup" 
Fixes #733. The fix outlined in #452 had adverse effects for the
following reason. The code removed the restoration path that would go on
the code path from kill SIGTSTP. The problem is this: When Irssi is not
running in a controlling parent (like a shell), the TSTP will in fact be
ignored. In that case, there is no process sending a CONT either and
thus the screen state never gets restored. Luckily, the patch in #457 is
sufficient to prevent the problem in #450 (which lead to the development
of #452). To that end, we do end up with potentially calling
terminfo_cont twice but that is better than not calling it at all.

This reverts commit b1ffd5f647, reversing
changes made to 9cb0419435.
 2017-08-07 15:29:17 +02:00
Paul Townsend
788e47032f Update /CONNECT and /SERVER syntax tags (-ssl -> -tls). 2017-08-05 21:02:35 +01:00
Edward Tomasz Napierala
5db6caee0d Attempt to fix build by adding the forgotten header. 
Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
 2017-08-01 01:50:16 +01:00
Edward Tomasz Napierala
96f4fe10c6 Change the way we load default CA certificates so it works with Capsicum. 
Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
 2017-08-01 01:47:45 +01:00
Edward Tomasz Napierala
aeaa420ad3 Clean up includes a bit. 
Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
 2017-08-01 01:15:25 +01:00
Edward Tomasz Napierala
5551b4fe95 Update copyrights. 
Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
 2017-07-30 11:47:08 +01:00
Edward Tomasz Napierala
8bb392a3f4 Hook up capsicum.h and fe-capsicum.h to autotools. 
This hopefully fixes Travis build.

Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
 2017-07-30 01:27:33 +01:00
Edward Tomasz Napierala
a29eeaa9f2 Fix trailing slash handling for capsicum_irclogs_path. 
This is mostly an anti-footshooting measure, but still.

Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
 2017-07-29 23:52:23 +01:00
Edward Tomasz Napierala
7f2697d307 Cosmetics. 
Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
 2017-07-29 23:52:23 +01:00
Edward Tomasz Napierala
8c04c2be14 Fix build without Capsicum. 
Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
 2017-07-29 23:52:23 +01:00
Edward Tomasz Napierala
12e2c46d6a Add wrappers to reduce #ifdefs. 
Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
 2017-07-29 23:52:23 +01:00
Edward Tomasz Napierala
c00d4753ae Restrict port range available in capability mode. 
Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
 2017-07-29 23:52:23 +01:00
Edward Tomasz Napierala
e777ae986d Working autolog. 
Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
 2017-07-29 23:52:23 +01:00
Edward Tomasz Napierala
241dd66ac1 Working /log and /rawlog. 
Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
 2017-07-29 23:52:23 +01:00
Edward Tomasz Napierala
939371aa1d Fix warnings. 
Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
 2017-07-29 23:52:23 +01:00
Edward Tomasz Napierala
1f57ceec4c Prevent the user from calling "/capsicum enter" twice. 
Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
 2017-07-29 23:52:23 +01:00
Edward Tomasz Napierala
509eca76f0 Make DNS work in capability mode. 
Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
 2017-07-29 23:52:23 +01:00
Edward Tomasz Napierala
f4546be7ec Reorder functions. 
Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
 2017-07-29 23:52:23 +01:00
Edward Tomasz Napierala
925240155e Config file support for "capsicum" parameter. 
Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
 2017-07-29 23:52:23 +01:00
Edward Tomasz Napierala
cec68557aa /connect works - although only with IP addresses. 2017-07-29 23:52:23 +01:00
Edward Tomasz Napierala
3200c381db Rename to "/capability enter" and "/capability status". 
Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
 2017-07-29 23:52:23 +01:00
Edward Tomasz Napierala
d5d45c29b8 Add capability mode error/success messages. 
Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
 2017-07-29 23:52:23 +01:00
Edward Tomasz Napierala
56c94570b4 Implement /cap_enter. 
Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
 2017-07-29 23:52:23 +01:00
Edward Tomasz Napierala
2914498b29 Consistency: use FALSE instead of 0. 
Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
 2017-07-29 10:42:53 +01:00
Edward Tomasz Napierala
08dc6734b9 When rawlog open fails, there's no point in trying to write. Don't. 
Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
 2017-07-29 10:40:42 +01:00
Edward Tomasz Napierala
42b5e89f6e Add missing diagnostics for rawlog open(). 
Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
 2017-07-28 04:49:14 +01:00
Edward Tomasz Napierala
e08e2bd87a Don't compute log_dir_create_mode in three different places. 
Signed-off-by: Edward Tomasz Napierala <trasz@FreeBSD.org>
 2017-07-28 03:56:02 +01:00
ailin-nemui
437fbef6eb Merge pull request #719 from LemonBoy/sasl-disable-none 
Setting sasl_mechanism to '' disables the auth
 2017-07-26 10:57:05 +02:00
LemonBoy
d971c02920 Allow the user to clear the sasl-related fields 
There was no easy way for the user to disable the SASL authentication or
to clear the username/password once the network was created.
Closes #718
 2017-07-25 22:53:33 +02:00
Nei
f67e766934 Merge branch 'fix-11' into 'security' 
Correct GHashTable usage

See merge request !16
 2017-07-05 14:46:42 +00:00
Nei
fc3615120d Merge branch 'fix-10' into 'security' 
Check return value of localtime

See merge request !15
 2017-07-05 14:46:24 +00:00
ailin-nemui
73b851c39c correct GHashTable usage 2017-07-04 16:11:45 +02:00
ailin-nemui
1656dc1e54 Merge pull request #653 from ailin-nemui/regexex 
Enable UTF8 in GRegex
 2017-07-03 09:53:09 +02:00
Nei
29ebac987d Check return value of localtime 
Fixes #10
 2017-06-29 13:48:44 +00:00
ailin-nemui
2b209348bd Merge pull request #722 from dequis/back-to-the-future 
parse_time_interval: Allow negative time in settings
 2017-06-23 18:00:51 +02:00
ailin-nemui
28d82c8f63 Merge pull request #709 from osm/master 
Escape nicks during nick completion when expand_escapes is enabled
 2017-06-23 18:00:04 +02:00
ailin-nemui
9d32636ebe Merge pull request #703 from vague666/server_modify_port 
Allow -port <num> or irc.host.tld <num> in /server add
 2017-06-23 17:59:02 +02:00
ailin-nemui
c56919768e Merge pull request #721 from dequis/unexpected-exits 
term-terminfo: Avoid switching out of alt screen on unexpected exits
 2017-06-23 17:58:40 +02:00
ailin-nemui
bbf8b86074 remove const 2017-06-22 09:33:33 +02:00
Oscar Linderholm
12d671a056 Escape nicks during nick completion when expand_escapes is enabled 
Fixes #693
 2017-06-21 10:40:47 +02:00
ailin-nemui
02a5d1a00b fix weird n-fold unescaping 2017-06-19 14:09:02 +02:00
ailin-nemui
1fc170ee11 Merge branch 'master' into regexex 2017-06-19 11:06:24 +02:00
dequis
7354a74c65 parse_time_interval: Allow negative time in settings 
This splits sign parsing out of parse_time_interval_uint() so that the
negative sign is applied outside of the unsigned context where the
number parsing is done, and after all the checks that it's lower than
(1 << 31)

This fixes issues with settings like `server_reconnect_time`,
`server_connect_timeout` and `lag_max_before_disconnect`, which accepted
-1 as a valid value.
 2017-06-17 15:34:36 -03:00
dequis
4b1c60b2ec term-terminfo: Avoid switching out of alt screen on unexpected exits 
Perl sucks and kills the whole process when there's a version mismatch
in Perl_xs_handshake(). Our atexit handler catches the exit and
deinitializes the terminal, removing the error.

This commit uses the 'quitting' global variable which is set when irssi
is voluntarily quitting, and avoids sending TI_rmcup, which restores the
original screen and makes the error invisible.
 2017-06-17 13:47:13 -03:00
ailin-nemui
3246001fb4 Merge pull request #715 from dequis/lastlog-glist-performance 
Performance improvements for /lastlog
 2017-06-07 00:15:45 +02:00
ailin-nemui
5e9a3ad80c Merge pull request #714 from dequis/dcc-fname-gcc-warnings 
fe-dcc-(get|send): Fix some -Wpointer-compare with newer gcc
 2017-06-07 00:15:05 +02:00
dequis
e498265328 Performance improvements for /lastlog -before 
This avoids the use of g_list_find() to find if a match was already
added to the list of results, by checking the last two added matches
instead.

Checking just the last match isn't enough because a NULL match is added
as a separator (shown as -- in the UI)
 2017-06-05 18:11:47 -03:00
dequis
0e44ea8916 Performance improvements for /lastlog with big result sets 
This applies to "/lastlog" with no filters (or with filters that don't
filter a lot) and with large amounts of text in the scrollback.

Test case:

    /exec seq 1 500000
    /lastlog -file log.txt

Thanks to morning for reporting this.
 2017-06-05 18:10:27 -03:00
dequis
52bb06ccd9 fe-dcc-(get|send): Fix some -Wpointer-compare with newer gcc 
The warning itself:

>warning: comparison between pointer and zero character constant [-Wpointer-compare]

Harmless stuff as far as I can tell.

The fix adds a null check that probably isn't needed. The old code that
compared against '\0' worked a lot like a null check so it makes sense
to keep that, while also adding the intended check for empty string.

This was visible with "/dcc close send a" showing an empty filename.
The equivalent for get didn't show the filename in the format string.
 2017-06-05 15:58:43 -03:00
Ailin Nemui
fb08fc7f1a Merge remote-tracking branch 'gitlab/security' 2017-06-05 15:12:16 +02:00
ailin-nemui
4edfccfce7 get rid of new_text 2017-06-05 13:46:43 +02:00
ailin-nemui
48899a123d Update iregex-gregex.c 
add 2 comments about new_string
 2017-06-05 10:23:16 +02:00
ailin-nemui
00354c3651 Update iregex-gregex.c 
make helper functions static
 2017-06-05 10:10:38 +02:00
Jari Matilainen
f28c64a3dc Make backward compatible with ssl flags 2017-06-04 19:47:30 +02:00
ailin-nemui
78a390f479 abi up 2017-06-04 19:03:40 +02:00