Commit Graph

5003 Commits

Author SHA1 Message Date
Alexey Sokolov 482f1ae31c Remove file which was accidentally added by automation 2018-11-01 07:56:52 +00:00
Alexey Sokolov b00cc30982 Merge branch '1.7.x' 2018-09-30 10:47:55 +01:00
ZNC-Jenkins 36e8f55bb9 Update translations from Crowdin for fr_FR 2018-09-30 00:26:44 +00:00
Alexey Sokolov 070d680e22 Merge pull request #1600 from Al-tay/1.7.x
Create fr-FR translation
2018-09-28 23:07:29 +01:00
Altay 0304a6516c Create fr-FR translation
Add French translation option.
2018-09-28 19:49:33 +02:00
ZNC-Jenkins 4cda4b5c45 Update translations from Crowdin for fr_FR 2018-08-19 00:26:52 +00:00
ZNC-Jenkins 1d57ffeaa3 Update translations from Crowdin for fr_FR 2018-08-10 00:26:43 +00:00
ZNC-Jenkins 2f4b158fd1 Update translations from Crowdin for ru_RU 2018-08-09 00:26:09 +00:00
ZNC-Jenkins f16b2958a5 Update translations from Crowdin for de_DE es_ES id_ID nl_NL pt_BR ru_RU 2018-08-08 00:26:34 +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 34509981d3 Merge branch '1.7.x' of github.com:znc/znc into 1.7.x 2018-08-08 00:15:34 +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
Chris Tyrrel 327969cc55 controlpanel: Add missing return to ListNetMods
Close #1589
2018-08-08 00:00:55 +01:00
Alexey Sokolov 33c612ba5c Merge pull request #1590 from TheWug/remove-child-sigmask
Unblock signals when spawning child processes.
2018-08-07 23:59:10 +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
ZNC-Jenkins e2a96470a0 Update translations from Crowdin for 2018-08-01 00:25:56 +00:00
ZNC-Jenkins d58563a880 Update translations from Crowdin for es_ES 2018-07-27 00:26:09 +00:00
ZNC-Jenkins e8093e06e4 Update translations from Crowdin for de_DE id_ID nl_NL pt_BR ru_RU 2018-07-26 00:26:33 +00:00
Alexey Sokolov 18871dab8d admindebug: use \n instead of \r\n 2018-07-26 01:10:52 +01:00
Alexey Sokolov 8a1f8c358e admindebug: language/style fixes 2018-07-26 01:10:52 +01:00
Jos Ahrens d7e94d7ac5 admindebug: Enforce need of TTY to turn on debug mode
Fix #1580
Close #1581
2018-07-26 01:10:31 +01: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 7b95e2ee6e Merge branch '1.7.x' 2018-07-17 23:00:24 +01:00
Alexey Sokolov bae80fd383 Return version number to 1.7.x 2018-07-17 22:58:48 +01:00
Alexey Sokolov c426898b3a Increase the version number to 1.7.1 znc-1.7.1 2018-07-17 22:48:03 +01:00
Alexey Sokolov b52fecc42d Merge branch 'master' of github.com:znc/znc 2018-07-14 07:30:12 +01:00
Alexey Sokolov 29fab65723 Merge 1.7.x to master 2018-07-14 07:28:08 +01:00
Alexey Sokolov 9e4d89aaa4 ZNC 1.7.1-rc1 znc-1.7.1-rc1 2018-07-14 07:21:12 +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 4d82211816 Update translations from Crowdin for es_ES 2018-07-01 00:26:28 +00:00
Alexey Sokolov c2731dfecd Merge branch '1.7.x' 2018-06-29 00:08:15 +01:00
Alexey Sokolov efd301de4b Merge branch '1.7.x' of github.com:znc/znc into 1.7.x 2018-06-28 23:59:22 +01:00
Alexey Sokolov abee9f9bfc Fix a warning in integration test / gmake / znc-buildmod interaction.
It was requested on https://github.com/gentoo/gentoo/pull/8901
2018-06-28 23:57:29 +01:00
ZNC-Jenkins 08fe2ae2f7 Update translations from Crowdin for de_DE 2018-06-24 00:26:41 +00:00
ZNC-Jenkins eec5c5a036 Update translations from Crowdin for de_DE 2018-06-24 00:26:33 +00:00
Alexey Sokolov ff8b629884 Don't throw from destructor in the integration test 2018-06-20 01:28:46 +01: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 05f00630c7 crowdin: Use separate keys for pushing to znc and znc-jenkins 2018-06-19 21:49:31 +01:00