Commit Graph

134 Commits

Author SHA1 Message Date
MAGIC
9081aa971d Welcome to 2020 2020-01-02 00:36:05 +01:00
Alexey Sokolov
8d309bbb3d Merge branch '1.7.x' 2019-03-30 16:17:59 +00:00
Alexey Sokolov
64613bc8b6 Don't crash if user specified invalid encoding.
This is CVE-2019-9917
2019-03-22 00:22:00 +00:00
Alexey Sokolov
0ab205ccfa Merge pull request #1628 from dgw/welcome-to-2019
Welcome to 2019
2019-01-08 22:50:58 +00:00
dgw
8d5427cf9b Welcome to 2019
What are we going to do today, Brain?

The same thing we do every year, Pinky: Update all the copyright
headers!

[Skip CI]
2019-01-01 17:05:05 -06:00
Pierre Gordon
6af027c5dd Normalize methods with 'UserName' to 'Username' 2019-01-01 16:19:27 -05:00
Pierre Gordon
812b27c268 Normalize variable "sUserName" to "sUsername"
Fixes #1546
2019-01-01 12:31:33 -05:00
Wolf480pl
80f9baf0a6 Fix memory leak and null dereference in CZNC::LoadUsers
Before this commit, when pUser->SetBeingDeleted(true) is executed,
pUser is an empty unique_ptr, because release() was already called
on it. Therefore, pUser->SetBeingDeleted is unidefined behaviour.

Also, AddUser only takes ownership of the passed user pointer if it
succeeds. In case of a failure, it's the caller's responsibility to
delete the user.

Fix this by keeping a raw pointer to the user, and handling it
accordingly when AddUser fails.

I have no idea whether SetBeingDeleted is necessary there, leaving it
just in case.

Maybe it would be better if we could change the semantics of
AddUser to always take ownership of the pointer,
or even take unique_ptr, but I have no idea how to adapt Python
bindings in modpython to such change.
2018-07-25 17:25:38 +02:00
Alexey Sokolov
9de990715b More translateable strings (fix #1354) 2018-04-03 22:31:20 +01:00
Alexey Sokolov
5d603b0932 Fix non-default location of znc.pem when upgrading configs from pre-1.7.
New options SSLDHParamFile and SSLKeyFile were pointing at the default
location instead of the same as SSLCertFile.

Thanks to @xelra for the report.
2018-03-15 22:14:00 +00:00
Falk Seidel
d647eaabc0 Welcome to 2018
The same procedure as last year, Miss Sophie?
The same procedure as every year, James.

[skip ci]
2018-01-19 19:38:58 +00:00
Fox Wilson
42939c998f Add "AuthOnlyViaModule" global/user setting
Setting AuthOnlyViaModule on a user causes CheckPass to never return true,
causing all authentication attempts using the configured password to fail, both
on IRC connections and for webadmin. This is useful in situations where an
external module (cyrusauth, certauth, imapauth) handles authentication. Setting
the global AuthOnlyViaModule option causes similar behavior across every
user. If AuthOnlyViaModule is set to true globally, it cannot be overridden
per-user.

Close #1474
Close #331
2017-12-22 14:23:17 +00:00
Alexey Sokolov
10bfece38c Switch znc.in URLs to https 2017-05-30 22:32:01 +01:00
Fusl Dash
2e90c9ae9e Update link to Configuration wiki page 2017-05-14 08:51:48 +01:00
Phansa
3189ce7f8a Welcome to 2017
Welcome to 2017

temp

temp2
2017-03-12 20:34:26 -04:00
Alexey Sokolov
2fcde9f2e1 Fix a couple of issues pointed out by https://scan.coverity.com/ 2016-12-26 17:22:09 +00:00
Alexey Sokolov
13049e5fc3 Refactor the way how modules are loaded.
Make version checks more strict.

This finishes attempt to preserve ABI between patch versions. That
didn't work well, and the people who could make it work, left the
project already.

Close #1255
Close #1274
Close #172
2016-12-22 20:49:01 +00:00
Adam
6bde0fc270 Add config write delay setting 2016-03-26 13:34:02 -04:00
Alexey Sokolov
8eeeaf71a0 Add framework for translating ZNC to different languages 2016-01-31 20:09:19 +00:00
Alexey Sokolov
ae3eb5c219 Revert "Revert "Fix delay between receiving signal in separate thread and handling it""
This reverts commit 615d936b6c.

I forgot the condition before...
2016-01-23 11:57:48 +00:00
Alexey Sokolov
615d936b6c Revert "Fix delay between receiving signal in separate thread and handling it"
This reverts commit e14e3586e1.

Until I find what's wrong with it...
2016-01-23 11:40:43 +00:00
Alexey Sokolov
e14e3586e1 Fix delay between receiving signal in separate thread and handling it
Also this allows increasing maximum wait time in poll(), though it
doesn't matter much
2016-01-23 11:05:30 +00:00
Alexey Sokolov
561a18054c Yet another attempt to use CMake 2016-01-15 10:50:33 +00:00
Alexey Sokolov
cfa178f75e Fix build when ICU is disabled
Thanks FFForever for report
2016-01-09 21:10:44 +00:00
Alexey Sokolov
1f226d2ade Add test for #1229 and actually fix it. 2016-01-09 18:00:47 +00:00
Alexey Sokolov
4fe4a45dd6 Disable legacy encoding mode when modpython is loaded.
Python is not happy when using non-unicode text as str.

Fix #1229
2016-01-09 14:18:24 +00:00
Ondřej Nový
6881ca5b8f Fixed few misspellings 2016-01-05 20:45:08 +01:00
Falk Seidel
8f73840e74 Welcome to 2016
🎆  Happy 2016 🎆
2016-01-01 20:11:21 +01:00
Alexey Sokolov
16a8c77737 Replace virtual with override where possible.
Using clang-tidy
2015-12-08 20:51:50 +00:00
Alexey Sokolov
d185d6f22d clang-format: switch tabs to spaces
I like tabs, but I have to admit that spaces make source code more
consistent, because every editor/viewer tends to render tabs differently :(
2015-12-07 00:53:30 +00:00
Alexey Sokolov
33b0627d75 Add clang-format configuration.
For now, it uses tabs like before, to make the diff easier to read/check.
One of following commits will switch it to spaces.
2015-12-07 00:53:01 +00:00
Alexey Sokolov
7869de1e0f Decrease max select()/poll() timeout to 5 sec.
With signals on a different thread, select() isn't interrupted anymore.
Probably need to wake up it differently now...
2015-12-06 16:16:29 +00:00
Dylan Lloyd
dcd259778a support separate SSLKeyFile & SSLDHParamFile configuration 2015-11-25 17:00:23 -08:00
Alexey Sokolov
0750e529c5 Don't print anything from signal handler.
Thread sanitizer doesn't like that.
2015-10-03 19:29:01 +01:00
Jos Ahrens
2031a82a77 Remove 'ok' from bootup
ZNC previously sent 'ok' on a new line every time a process went alright in CUtils::PrintStatus

No longer is this the case! ZNC now remains silent when everything is going well.
2015-09-25 13:11:33 +02:00
J-P Nurmi
6ad7cdb4a2 Resolve #818: "Got ZNC?" is a little weird real name 2015-09-20 23:22:01 +02:00
J-P Nurmi
2b18d6ee38 Merge pull request #1020 from jpnurmi/traffic
Calculate per-network traffic (#963)
2015-09-02 01:01:13 +02:00
Alexey Sokolov
9688727f32 Add a possibility (not an "option") to disable launch after --makeconf
See #257
2015-08-24 21:22:14 +01:00
J-P Nurmi
66053e24ff Add CZNC::GetNetworkTrafficStats() 2015-08-22 01:27:23 +02:00
J-P Nurmi
d19a040f2d Remove flawed Add/Del/List/BindHost(s) (close #983) 2015-08-17 15:35:29 +02:00
J-P Nurmi
2417ca68a8 Prefer Contains() over find() != npos 2015-08-14 13:55:11 +02:00
J-P Nurmi
4995e7517e Prefer StartsWith(s) over Left(n) == s 2015-08-14 13:51:44 +02:00
J-P Nurmi
475acd8f00 Prefer TrimPrefix() over Left() + LeftChomp() 2015-08-14 12:29:42 +02:00
Alexey Sokolov
71fc592bfa Merge pull request #1019 from jpnurmi/ssl
CZNC: add missing SSL-related getters and setters
2015-08-07 09:26:43 +01:00
Gustavo Zacarias
9a51195e91 Add <time.h> includes where appropiate
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
2015-08-06 11:20:54 -03:00
J-P Nurmi
a13b4a8e46 CZNC: add missing SSL-related getters and setters
- SSLCiphers
- SSLProtocols
- SSLCertFile
2015-08-05 01:05:46 +02:00
J-P Nurmi
d39b20b505 Fix sources to include their respective header 2015-07-14 19:05:23 +02:00
Alexey Sokolov
70cc4285f9 Merge branch '1.6.x' 2015-04-06 20:43:41 +01:00
Alexey Sokolov
4596d97502 Remove "-" between "ZNC" and version number.
ZNC 1.6.0 looks better than ZNC - 1.6.0, IMHO
2015-04-06 20:41:57 +01:00
Thomas Kriechbaumer
8d2ca76838 fail if no config version is not found 2015-03-31 14:29:08 +01:00