adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-08-04 16:03:25 +02:00
Code Issues Packages Projects Releases Wiki Activity
4,587 Commits 6 Branches 91 Tags
2e6c8d90e71c6ba59e41db1074cd863108a5bc89
Commit Graph

4587 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexey Sokolov 2e6c8d90e7 Link pyeval to its wiki page 2016-11-20 23:43:53 +00:00
Alexey Sokolov 5c524df298 Merge branch '1.6.x' 2016-11-20 18:09:55 +00:00
Alexey Sokolov 6366430870 Fix deletion of users which are connecting. 
Close #1342
 2016-11-20 17:56:26 +00:00
Alexey Sokolov a76a9db369 Merge branch '1.6.x' of github.com:znc/znc into 1.6.x 2016-11-19 23:41:15 +00:00
Alexey Sokolov 2feced63e1 Merge branch '1.6.x' 2016-11-19 23:39:32 +00:00
Alexey Sokolov 0ac3cfc8d5 Fix regression of 1.6.0 
Cloning a user caused a non-immediate segfault.
This was fixed already in 1.7 branch (by refactoring).
Fix #1340
 2016-11-19 23:35:12 +00:00
Alexey Sokolov 676d105347 Workaround gitter for 1.6 
It's fixed properly for 1.7 already.
Fix #1321
 2016-11-17 23:45:25 +00:00
Will Elwood 4c7fa1aabf Fix version.sh for ancient git 
I'm not sure when the `format` argument was added to `git log`, but it seems to be an alias for `pretty` (ie both exist in current versions of git). I noticed this was failing on my ancient system that's stuck with git 1.5, this makes it work.

Also, `ignore-submodules` is not understood by ancient `git status` - I believe the expected output would be achieved by simply removing this argument, but it's not important since it fails gracefully enough and fixing it so newer git doesn't fail seems more complicated.
 2016-11-16 15:49:47 +00:00
Alexey Sokolov 19c44bc8c5 Merge branch '1.6.x' 
Fix #1310
 2016-11-16 14:59:15 +00:00
Alexey Sokolov c0c1fb14f4 Update Csocket submodule: fix openssl 1.1 2016-11-16 14:50:00 +00:00
Alexey Sokolov 0aaabe8c9f Update Csocket submodule: fix build with openssl 1.1 2016-11-16 14:42:34 +00:00
Alexey Sokolov 806edd048a AppVeyor: cygwin's python3 package was split to -devel. Install it. 2016-11-12 14:51:38 +00:00
Jos Ahrens 881fa94add sasl: Make the first requirement for SET actually mandatory, return information about settings if no input for SET 2016-11-12 14:38:35 +00:00
John Reese c55caba68b Fix spelling in documentation 2016-11-07 20:53:31 +00:00
Alexey Sokolov 39646b620d Merge pull request #1327 from lol768/module_csrf_override 
Module CSRF override support (mark II)

Close #1180
Close #1296
 2016-10-08 23:31:06 +01:00
lol768 d40d87e268 Fix race condition by using ReadUntil per review 2016-10-05 09:32:02 +01:00
lol768 9cc59b2b78 Address review comment, module is already global 
https://github.com/lol768/znc/commit/b94c639e6a1755c33cc315aad247bbc50a83209e#commitcomment-19252797
 2016-10-05 09:32:02 +01:00
lol768 e066f896ef Add integration test for module CSRF overrides 2016-10-05 09:32:02 +01:00
lol768 3930c5b34e Sample web API doesn't make sense as a user module 2016-10-05 09:29:40 +01:00
lol768 0393153a62 Allow anonymous access for sample mod 
This makes testing simpler.
 2016-10-05 09:29:40 +01:00
lol768 f387dc56c0 More relevant comments for CSRF behaviour 2016-10-05 09:29:40 +01:00
Latchezar Tzvetkoff a9a7f17910 Allow modules to override CSRF protection. 
Useful for Web APIs and all other kinds of things.

API changes:
	- Added public CHTTPSock::GetURI() method
	- Added public CModule::ValidateWebRequestCSRFCheck() method
	- Made CWebSock::GetCSRFCheck() method public so it can be accessed
	  from CModule
	- Added public CWebSock::ValidateCSRFCheck() method

Other changes:
	- Added a Sample Web API module (modules/samplewebapi.cpp) and a
	  simple web form with no CSRF check.

Implements feature request #1180.
 2016-10-05 09:29:40 +01:00
Alexey Sokolov 222ae86fcc Fix newest additions to keepnick module and write the test for it. 
Fix the documentation.

See #1324 and #1325
 2016-10-05 09:21:21 +01:00
Alexey Sokolov ac0048cc01 Make ZNC faster in the integration test. 
This is not appropriate for normal usage.
 2016-10-04 01:19:34 +01:00
Alexey Sokolov 87ca820bda Make integration test to load until module is loaded before testing it. 2016-10-03 23:55:35 +01:00
Jos Ahrens a6c79fa1e1 keepnick: improve behaviour by listening to ircd-side numeric errors (#1324) 
Fixes #945
 2016-10-03 23:23:45 +01:00
Jos Ahrens b6ffaa6527 Message.h: Add a comment briefly explaining how to use the class, and what exactly a message is. 2016-10-02 00:21:58 +01:00
Donovan Zimmerman 1417783758 nickserv: support messages from X3 services 2016-09-30 12:46:51 -04:00
Alexey Sokolov 4aa5e41465 Merge commit 'refs/pull/1319/head' of github.com:znc/znc 2016-09-23 21:59:09 +01:00
Alexey Sokolov f841decbf7 Merge commit 'refs/pull/1320/head' of github.com:znc/znc 2016-09-23 21:58:42 +01:00
Alexey Sokolov 2113ea4ac1 Try Codecov. It has better GUI than Coveralls. 
For now both are enabled.
 2016-09-23 21:57:00 +01:00
arza 7c53d2106f Hide passwords in listservers output 2016-09-23 18:13:07 +03:00
wolfy1339 00aadbaf91 Use <th> in <thead> instead of <td> 
Ref: #1308
 2016-09-22 12:39:00 -04:00
Alexey Sokolov ce79be8b0b Add test results to Jenkins 2016-09-22 01:41:25 +01:00
Alexey Sokolov 51c532839a Show jenkins badge through shields.io 
It supports custom label, e.g. "freebsd" as here.

[skip ci]
 2016-09-18 01:41:35 +01:00
Alexey Sokolov 2532aca967 Simplify jenkins file and enable integration test 2016-09-17 18:45:23 +01:00
Alexey Sokolov b56ab9106d Fix OpenSSL CMake build on OS X 
See #1311
 2016-09-17 16:54:13 +01:00
Alexey Sokolov dd21f8202e Jenkins: cleanup the workspace differently 
git clean doesn't work
 2016-09-17 11:09:56 +01:00
Alexey Sokolov 8a9ee77239 Jenkins should clean workspace before new build 
if build agent is reused
 2016-09-17 10:51:36 +01:00
Alexey Sokolov 682d2f1e01 Remove additional github commit status update from jenkins. 
There is a status update already, which I didn't see during earlier
tests.
 2016-09-17 09:09:30 +01:00
Alexey Sokolov be40b76a23 Add jenkins badge to readme 2016-09-17 02:41:01 +01:00
Alexey Sokolov 9cfc7e8a82 Add a Jenkins pipeline config to test ZNC on FreeBSD 2016-09-17 00:49:47 +01:00
Alexey Sokolov 3846813512 Merge branch '1.6.x' 
Conflicts:
	modules/schat.cpp
	src/SSLVerifyHost.cpp
	src/Utils.cpp
 2016-09-13 22:45:10 +01:00
Alexey Sokolov b7dcac5e5f Merge pull request #1311 from welwood08/openssl-1.1 
OpenSSL 1.1 compatibility
 2016-09-13 20:41:48 +01:00
William Elwood 853dcc211d Fix use of a feature deprecated in OpenSSL 1.1 
If OpenSSL 1.1 is configured in such a way that features deprecated in 1.1.0 are not built, then compile errors would result here.
 2016-09-13 11:51:13 +01:00
William Elwood 6a5c2c649d Fix use of a feature deprecated in OpenSSL 0.9.8 
If OpenSSL 1.1 is configured in such a way that features deprecated in 0.9.8 are not built, then compile errors would result here.
I also noticed a potential memory leak where pRSA was not always freed before early return from this function - fixed by using C++11 unique_ptr.
 2016-09-13 11:50:40 +01:00
William Elwood 03775fcdc5 Fix compile errors caused by OpenSSL 1.1 2016-09-12 23:39:19 +01:00
Alexey Sokolov 74e95ffdd9 Merge pull request #1314 from RealKindOne/master 
route_replies: fix module to check if we are not connected to a network.

Close #1299
 2016-09-12 23:18:57 +01:00
KindOne 34db7be4ae route_replies: fix module to check if we are not connected to a network. 
psychon gets credit for this code change.
 2016-09-12 04:45:15 -04:00
Alexey Sokolov 6a8fbbc933 Script modules should also use the new name of translation methods 2016-09-12 00:10:57 +01:00