Commit Graph

3750 Commits

Author SHA1 Message Date
Alexander Færøy 5ae5ff46db Q: Ignore JoinAfterCloaked unless UseCloakedHost is set
This patch ignores the value of JoinAfterCloaked unless UseCloakedHost
is set. Without this patch, it's possible to enable JoinAfterCloaked,
but not have UseCloakedHost enabled, which means that no channel will
ever be joined automatically by ZNC.

Fixes: #602
2015-01-11 17:42:26 +01:00
Alexey Sokolov 5608e4f201 Oops, I'm not familiar with our CSS 2015-01-11 09:06:15 +00:00
Alexey Sokolov 00b38dc164 Enable editing trusted fingerprints in webadmin 2015-01-11 09:04:31 +00:00
Alexey Sokolov 7504cb205b modpython: Enable default arguments feature of SWIG 3.0.4
Some corner cases are disabled for now, until SWIG fixes them.
See #809 for details.
2015-01-09 08:26:38 +00:00
Alexey Sokolov 8fe8c69a88 Merge pull request #791 from James-TR/namespace-refactor
Change namespace for <fcntl.h>
2015-01-08 08:40:45 +00:00
James Taylor 13f7574579 Change namespace for fcntl.h
* Fixes warnings under musl-libc.
* <fcntl.h> should be universal in the Unix world, it's more likely a system doesn't have <sys/fcntl.h> than if it doesn't have <fcntl.h> (and has <sys/fcntl.h>.)
2015-01-08 05:19:19 +00:00
Alexey Sokolov 05e3a85542 Travis: Enable OS X in addition to existing Ubuntu 2015-01-06 21:58:06 +00:00
Alexey Sokolov cf0accbfc5 Update Csocket to dd3d780c251e07dc40731d4ca603dc0e121e4db2
Fix #652 (build on OS X)
2015-01-06 18:06:27 +00:00
Alexey Sokolov 6181858b02 Travis: --enable-charset 2015-01-05 22:42:02 +00:00
Alexey Sokolov ce1543c5ed Warn about outdated csocket submodule 2015-01-04 11:26:07 +00:00
Alexey Sokolov ffd1352f76 Advise how to use git submodules 2015-01-04 00:14:18 +00:00
Alexey Sokolov 50cae4e357 Travis: use new enough ICU which has pkg-config files. 2015-01-03 22:17:04 +00:00
Alexey Sokolov 0e884a4f19 Travis: Use teward's PPA for swig 3 2015-01-03 21:12:15 +00:00
Alexey Sokolov 9166e6ed40 Move Csocket to git submodule 2015-01-03 12:45:12 +00:00
Alexey Sokolov fc4613b4ea Merge pull request #798 from kerio92/master
Update Csocket and choose TLS ciphers following the server order
2015-01-03 09:54:33 +00:00
Edoardo Spadolini 507f9b3392 Follow SSL Cipher Server Preference 2015-01-02 23:40:15 +01:00
Edoardo Spadolini cac9da4951 Update Csocket to 0119a006bdfb6223a1a86d48b02efee87d11b721 2015-01-02 23:36:36 +01:00
Alexey Sokolov 56f0d3bcbf Fix travis 2015-01-02 01:01:23 +00:00
Alexey Sokolov 9fe689c2dd Travis: Use prebuilt SWIG 3 2015-01-02 00:53:09 +00:00
Alexey Sokolov a9fe85bb13 Merge pull request #795 from Un1matr1x/master
Welcome to 2015
2014-12-31 20:25:18 +00:00
Falk Seidel 2e29d49a53 Welcome to 2015 2014-12-31 11:28:38 +01:00
Alexey Sokolov 4fa4f9cbe3 Merge pull request #794 from Mkaysi/charset
webadmin: suggest ISO-8859-15 if non-UTF-8 char...
2014-12-31 08:37:34 +00:00
Alexey Sokolov a0ec20b110 Fix HTTP basic auth.
It looks like it was broken since we implemented cookies...
2014-12-30 21:35:39 +00:00
Mikaela Suomalainen 94c0c244be webadmin: suggest ISO-8859-15 if non-UTF-8 char...
...set must be recommended.
2014-12-30 13:34:35 +02:00
Alexey Sokolov 9dfdeeef9b Merge pull request #792 from kerio92/master
Remove DH-BLOWFISH and DH-AES from the sasl module
2014-12-26 09:37:09 +00:00
Edoardo Spadolini beee1f74bc Mention username as well as password in the sasl module help 2014-12-26 10:30:35 +01:00
Edoardo Spadolini eac2469275 Remove DH-BLOWFISH and DH-AES from the sasl module 2014-12-26 10:19:42 +01:00
Alexey Sokolov d56621f9f6 Fix modperl startup 2014-12-25 16:36:55 +00:00
Alexey Sokolov fd4c355e46 Let's use recommended value by default for new users 2014-12-25 14:42:52 +00:00
Alexey Sokolov e943f8b370 Fix crash in Add User page in webadmin
Thanks to JordanJ2 for reporting it
2014-12-25 13:00:27 +00:00
Alexey Sokolov 98a57261e7 Merge pull request #789 from Mkaysi/makepem
src/Utils.cpp: don't lie to --makepem
2014-12-23 19:48:50 +00:00
Alexey Sokolov b2d661e64f ChangeLog/1.4: CVE was finally assigned. 2014-12-23 19:47:34 +00:00
Alexey Sokolov c48729fe8b Fix some int_t types in modperl/modpython 2014-12-23 14:20:06 +00:00
Alexey Sokolov 4ba00559ac Recommend UTF-8 in webadmin
Fix #790
2014-12-23 14:19:30 +00:00
Mikaela Suomalainen 963ecf6753 src/Utils.cpp: don't lie to --makepem
I removed C, ST, L and O as certificate would be fine with just CN too
and the other variables are get from environment correctly.
2014-12-23 11:31:27 +02:00
Alexey Sokolov 60367fb2bf Provide DH parameters in --makepem 2014-12-23 09:02:22 +00:00
Alexey Sokolov 5c72c8232f Show fingerprints with colons 2014-12-23 00:58:59 +00:00
Alexey Sokolov 72ca970731 Make default ciphers a bit better 2014-12-23 00:57:59 +00:00
Alexey Sokolov 012bb6e134 Make self-signed cert with SHA-256 in --makepem 2014-12-23 00:55:39 +00:00
Alexey Sokolov 2aa6c7e1d9 Merge pull request #775 from DarthGandalf/table
Wrap lines in CTable
2014-12-22 15:18:15 +00:00
Alexey Sokolov 79d33925c4 Update Csocket to f3267e4cb21ba5b83c15da75f52706253817ddab
* Fix SSL crash. Thanks to kerio for reporting it.
2014-12-22 15:08:50 +00:00
Alexey Sokolov 0ff3e34985 Simplify nickserv module.
Now alias module exists, so nickserv module doesn't need any custom
command. It justs identifies user.

Close #662
2014-12-22 13:07:23 +00:00
Alexey Sokolov f050780f2c Merge pull request #779 from Mkaysi/sasl
sasl.cpp: don't advertise DH-* as secure
2014-12-21 19:33:50 +00:00
Mikaela Suomalainen fac07b2e5a sasl.cpp: don't advertise DH-* as secure
They were removed from Atheme, because people thought them to be more
secure than PLAIN + SSL, so ZNC shouldn't advertise them as secure.

I think that DH-AES and DH-BLOWFISH should say something about not being
widely supported, but I am not sure what. Newer Atheme doesn't support
it and with Anope they are optional unlike PLAIN and EXTERNAL that are
in their SASL core.
2014-12-21 21:28:13 +02:00
Alexey Sokolov 8930fc4d7a Don't break IRC control characters in some encodings
Fix #577
2014-12-21 17:09:59 +00:00
Alexey Sokolov bd9450b99e Webadmin: Add GUI for character encoding 2014-12-21 17:08:41 +00:00
Alexey Sokolov 86e5ca3fd3 Update Csocket to 7c9c6ef676818457a952c2bda478ce7e27a928bf
* Add encoding mode which reads UTF-8 and something else, but sends UTF-8
* Expose encoding conversion error callbacks to subclasses
2014-12-21 17:07:29 +00:00
Alexey Sokolov 4f48bff6a4 Merge pull request #777 from James-TR/Csocket_update
Csocket update
2014-12-18 12:56:19 +00:00
James Taylor 6720eec669 Update Csocket to jimloco/Csocket@09b6430dba
Fixes build failures under musl, an alternative libc, due to
incompatibilities with GLIBC specific code. Also fixes Issue #776
2014-12-18 11:31:32 +00:00
Alexey Sokolov 9e05bb1917 Make list of vars in controlpanel's help compact 2014-12-18 10:31:09 +00:00