Commit Graph

914 Commits

Author SHA1 Message Date
Alexey Sokolov
481fdb5a2c Merge branch '1.7.x' 2019-01-01 12:53:11 +00:00
Alexey Sokolov
70a221addd Add more details to DNS error logs. See #1626 2019-01-01 12:51:51 +00:00
Alexey Sokolov
dda8bfe1f1 Merge branch '1.7.x' 2018-12-09 22:51:08 +00:00
Rosen Penev
a28c5f8056 Fix compilation with LibreSSL < 2.7.0
LibreSSL was stubborn and did not implement all of OpenSSL 1.1 despite
advertising support for it. Fixed in 2.7.0.

Close #1623
2018-12-09 22:50:50 +00:00
Alexey Sokolov
f3eca21bae Merge branch '1.7.x' 2018-11-26 23:02:21 +00:00
Alexey Sokolov
519294a70a Merge pull request #1620 from neheb/dep2
Fix compilation without deprecated APIs in OpenSSL 1.1
2018-11-26 23:01:50 +00:00
Alexey Sokolov
ca4977879d Don't show server passwords on ZNC startup.
Fix #1599
Close #1607
2018-11-26 22:58:50 +00:00
Rosen Penev
f6eb43673c Fix compilation without deprecated APIs in OpenSSL 1.1
Prior commit was tested with 1.0.2. This one with 1.1.
2018-11-26 14:35:24 -08:00
ZNC-Jenkins
030bc4b37c Update translations from Crowdin for pt_BR 2018-11-25 00:27:57 +00:00
ZNC-Jenkins
4c5e6eee18 Update translations from Crowdin for pt_BR 2018-11-25 00:27:21 +00:00
Alexey Sokolov
0199ffe698 Merge branch '1.7.x' 2018-11-10 18:05:28 +00:00
Rosen Penev
dddcef52b9 Fix compilation without deprecated APIs in OpenSSL
Added a few implicit headers that don't get included anymore and switched
to OpenSSL 1.0.0's THREAD API when supported.

Close #1615
2018-11-10 18:04:03 +00:00
ZNC-Jenkins
a1aca29427 Update translations from Crowdin for fr_FR 2018-11-02 00:26:18 +00:00
Alexey Sokolov
b00cc30982 Merge branch '1.7.x' 2018-09-30 10:47:55 +01:00
ZNC-Jenkins
4cda4b5c45 Update translations from Crowdin for fr_FR 2018-08-19 00:26:52 +00:00
ZNC-Jenkins
2f4b158fd1 Update translations from Crowdin for ru_RU 2018-08-09 00:26:09 +00:00
ZNC-Jenkins
0714a9ec23 Update translations from Crowdin for de_DE es_ES fr_FR id_ID nl_NL pt_BR ru_RU 2018-08-08 00:26:26 +00:00
Alexey Sokolov
7f89a6f484 Merge branch '1.7.x' 2018-08-08 00:15:41 +01:00
Alexey Sokolov
61513e96b7 Merge pull request #1585 from Wolf480pl/adduser-fix
Fix memory leak and null dereference in CZNC::LoadUsers when reading invalid config
2018-08-08 00:02:56 +01:00
Ryan S
e73060ad59 Unblock signals when spawning child processes.
The signal mask is inherited by children, so if we don't remove it
the shell module spawns processes which are accidentally resistant
to most signals.

see: man sigprocmask (znc uses pthread_sigmask, but they act the same)
2018-08-03 09:14:41 -07:00
ZNC-Jenkins
33cc6a2a2c Update translations from Crowdin for fr_FR 2018-08-01 00:26:26 +00: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
ZNC-Jenkins
1e69758015 Update translations from Crowdin for nl_NL 2018-07-18 14:36:36 +00:00
ZNC-Jenkins
8f2269083a Update translations from Crowdin for es_ES 2018-07-18 14:36:34 +00:00
ZNC-Jenkins
cb867d6b71 Update translations from Crowdin for de_DE id_ID nl_NL pt_BR ru_RU 2018-07-18 14:31:35 +00:00
ZNC-Jenkins
a021784ebf Update translations from Crowdin for de_DE es_ES id_ID pt_BR ru_RU 2018-07-18 14:31:23 +00:00
Alexey Sokolov
29fab65723 Merge 1.7.x to master 2018-07-14 07:28:08 +01:00
Alexey Sokolov
a4a5aeeb17 Don't let web skin name ../../../../ access files outside of usual skins directories.
Thanks for Jeriko One <jeriko.one@gmx.us> for finding and reporting this.
2018-07-14 07:09:26 +01:00
Alexey Sokolov
d22fef8620 Better cleanup lines coming from network.
Thanks for Jeriko One <jeriko.one@gmx.us> for finding and reporting this.
2018-07-14 07:08:50 +01:00
Alexey Sokolov
a7bfbd9381 Don't let attackers inject rogue values into znc.conf
Because of this vulnerability, existing ZNC users could get Admin
permissions.

Thanks for Jeriko One <jeriko.one@gmx.us> for finding and reporting this.
2018-07-14 07:05:57 +01:00
ZNC-Jenkins
2058aa0fa6 Update translations from Crowdin for es_ES 2018-07-02 00:25:44 +00:00
ZNC-Jenkins
87fe01d3aa Update translations from Crowdin for ru_RU 2018-06-19 21:24:58 +00:00
ZNC-Jenkins
71ebbf4d14 Update translations from Crowdin for ru_RU 2018-06-19 21:24:46 +00:00
ZNC-Jenkins
3b6980cb85 Update translations from Crowdin for de_DE es_ES id_ID nl_NL pt_BR ru_RU 2018-06-19 21:04:33 +00:00
ZNC-Jenkins
b483ba8a8d Update translations from Crowdin for de_DE es_ES id_ID nl_NL pt_BR ru_RU 2018-06-19 21:04:31 +00:00
Alexey Sokolov
271cc8babb Merge branch 'master' of github.com:znc/znc 2018-06-18 00:47:20 +01:00
Alexey Sokolov
66acad5791 Merge branch '1.7.x' 2018-06-18 00:46:54 +01:00
Alexey Sokolov
6d1e77bb52 Revert "transperancy: Make the user aware that DEBUG mode is enabled."
This reverts commit ab501767a1.

Superceded by admindebug module
2018-06-18 00:41:18 +01:00
ZNC-Jenkins bot
27540a8d40 Update translations from Crowdin (#1552) 2018-06-16 10:15:05 +01:00
ZNC-Jenkins
cc3f8499a7 Update translations from Crowdin 2018-06-16 00:25:59 +00:00
Alexey Sokolov
bdbcaca055 Merge branch '1.7.x' 2018-06-15 19:34:49 +01:00
ZNC-Jenkins bot
38a007d5c5 Update translations from Crowdin (#1551) 2018-06-15 19:34:12 +01:00
Alexey Sokolov
2ed6cb7c54 Merge branch '1.7.x' 2018-06-10 21:10:30 +01:00
Baruch Siach
e567f4cb73 Fix build without SSL support
The <memory> headers is needed for unique_ptr even when SSL is not
enabled. This fixes the following build failure:

src/Utils.cpp: In static member function 'static bool CUtils::CheckCIDR(const CString&, const CString&)':
src/Utils.cpp:674:5: error: 'unique_ptr' is not a member of 'std'
     std::unique_ptr<addrinfo, decltype(deleter)> aiHost(aiHostC, deleter);
     ^

Close #1554
2018-06-10 21:09:07 +01:00
ZNC-Jenkins bot
8edcdf3263 Update translations from Crowdin (#1539) 2018-06-04 22:38:56 +01:00
ZNC-Jenkins bot
633e695aba Update translations from Crowdin (#1544) 2018-06-04 22:38:33 +01:00
Alexey Sokolov
fda73d8c81 Merge branch '1.7.x' 2018-06-04 22:30:53 +01:00
Alexey Sokolov
e531fe870a Replace the deprecated overload of CMessage::GetParam 2018-06-01 22:22:44 +01:00
Alexey Sokolov
5b7daac2f0 Rename one of overloads of CMessage::GetParams to GetParamsColon 2018-06-01 22:22:44 +01:00
Alexey Sokolov
add1316517 Merge branch '1.7.x' 2018-06-01 19:43:00 +01:00