Commit Graph
100 Commits
Author SHA1 Message Date
Alexey Sokolovanddgw 14846166c6 Update test/integration/framework/znctest.cpp
Co-authored-by: dgw <dgw@technobabbl.es>
2026-06-08 22:00:37 +01:00
Alexey Sokolov 9f8015b8ad Add several more tests to sasl 2025-02-28 20:48:24 +01:00
Alexey Sokolovanddgw ed20d489b6 Apply suggestions from code review
Co-authored-by: dgw <dgw@technobabbl.es>
2025-02-23 22:41:01 +01:00
Alexey Sokolov 82bfa2be66 Merge pull request #1625 from Zarthus/fix_1624
ctcp: Distinguish Channel CTCP Requests and Replies
2019-01-08 22:53:21 +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
Alexey Sokolov 6079c01d2f Merge pull request #1627 from pierlon/refactor/normalize-username
Normalize variable "sUserName" to "sUsername"
2019-01-08 22:50:45 +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 070d680e22 Merge pull request #1600 from Al-tay/1.7.x
Create fr-FR translation
2018-09-28 23:07:29 +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
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
Alexey Sokolov 1b894982af Merge pull request #1572 from csprr/patch-2
Create nl_NL
2018-06-19 19:50:42 +01:00
Alexey Sokolov 7b019bf9bf Merge pull request #1569 from Zarthus/jenkins/trans/pr-summary
ci: return output of shell commands to stdout
2018-06-16 20:53:20 +01:00
Alexey Sokolov 27f4dce638 Merge pull request #1564 from Zarthus/jenkins/trans/pr-summary
ci: Modify crowdin CI to make better PR descriptions
2018-06-16 11:45:20 +01:00
Alexey Sokolov e6df9f7f4a Merge pull request #1561 from znc-jenkins/l10n_1.7.x
Update translations in 1.7.x
2018-06-16 10:14:09 +01:00
Alexey Sokolov 594dfed41f Merge pull request #1504 from DarthGandalf/san
Support IP while verifying SSL certificates
2018-05-06 09:41:21 +01:00
Alexey Sokolov 22ef6de8e4 Merge pull request #1506 from Zarthus/feature/simpleaway-timezone-info-utc
simple_away: Convert to UTC time
2018-05-05 23:41:41 +01:00
Alexey Sokolov f669c42588 Merge pull request #1443 from Zarthus/fix/1421-route-replies-rizon
route_replies: rizon: [MODE] Add 403, 442 expectations
2018-05-05 22:14:17 +01:00
Alexey Sokolov 6b6bbdcaeb Merge pull request #1513 from throwaway-user/master
Don't echo-message and self-message messages to *status and *modules
2018-04-15 10:15:21 +01:00
Alexey Sokolov 8d7dac00a4 Merge pull request #1492 from citrus-it/patch-1
Stop creating files with odd permissions.
2018-02-09 23:26:13 +00:00
Alexey Sokolov 5904d3e38b Merge pull request #1472 from GLolol/notice-failed-logins
src/Client: send failed logins to NOTICE instead of PRIVMSG
2017-12-17 02:28:52 +00:00
Alexey Sokolov 55d993e08f Merge pull request #1462 from znc-jenkins/l10n_master
Update translations
2017-12-15 08:53:26 +00:00
Alexey Sokolov 4a2c223379 Add comments for translator to .tmpl files (#1473)
They are ignored in CTemplate, because the string doesn't reference it
as {N}
2017-12-14 10:26:07 +00:00
Alexey Sokolov bd51ebcdca Merge pull request #1455 from CyberShadow/timeval
Add sub-second precision for timestamp formatting
2017-12-10 11:46:22 +00:00
Alexey Sokolov 42d30901d4 Merge pull request #1444 from Zarthus/tidy_up_readme
Tidy up README
2017-10-15 18:26:39 +01:00
Alexey Sokolov 2ebd358521 Merge pull request #1446 from Zarthus/feature/debug-mode-awareness
transparency: Make the user aware that DEBUG mode is enabled.
2017-10-04 19:09:09 -07:00
Alexey Sokolov 57ad5cd814 Merge pull request #1445 from Zarthus/fix/debug-shows-pass
debugging: Add Filter method to hide filter sensitive data
2017-10-04 19:06:50 -07:00
Alexey Sokolov 9358cc5f71 Merge pull request #1436 from MuffinMedic/modpython
Add CQuery(s) and CServer(s) to modpython
2017-08-27 20:06:30 +01:00
Alexey Sokolov 3b9f39f543 Merge pull request #1406 from elyscape/feature/custom-tags
Support custom message tags
2017-05-10 23:29:44 +01:00
Alexey Sokolov c28d5adf43 Merge pull request #1395 from elyscape/feature/log-user-quits
Log user quit messages
2017-04-22 15:33:15 +01:00
Alexey Sokolov 9146ea6187 Merge pull request #1398 from elyscape/feature/onsend-message-hooks
Add OnSendToIRCMessage and OnSendToClientMessage
2017-04-22 01:10:38 +01:00
Alexey Sokolov f37aa308e1 Merge pull request #1396 from elyscape/fix/on-user-quit-hook
Fix OnUserQuitMessage documentation
2017-04-16 10:22:41 +01:00
Alexey Sokolov 57b912f645 Merge pull request #1361 from kylef/kylef/block_motd
Fix block_motd incorrectly tracking state on which user requested MOTD
2017-04-10 00:16:16 +01:00
Alexey Sokolov aefc97d09a Merge pull request #1383 from Phansa/master
Adding comments to modules, updating dates to 2017
2017-03-23 22:49:29 +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
Alexey Sokolov b7dcac5e5f Merge pull request #1311 from welwood08/openssl-1.1
OpenSSL 1.1 compatibility
2016-09-13 20:41:48 +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
Alexey Sokolov 14cef81bb5 Merge pull request #1312 from welwood08/gtest
Fix `make test` in 1.6.x
2016-09-04 22:02:43 +01:00
Alexey Sokolov 85984ee4be Merge pull request #1277 from xnrand/master
Add network-specific settings for cert validation
2016-08-20 12:08:41 +01:00
Alexey Sokolov d0e93c5171 Merge pull request #1304 from RealKindOne/master
Remove reference for attaching queries.
2016-08-15 20:46:09 +01:00
Alexey Sokolov b04e274963 Merge pull request #1294 from torarnv/priv-buffer-playback-signals
Add OnPrivBufferStarting/Ending signals, similar to Chan buffers
2016-07-17 23:12:16 +01:00
Alexey Sokolov b7fc670a39 Merge pull request #1290 from torarnv/fix-gettimeofday-ret
Fix inverted gettimeofday() return value handling
2016-07-08 10:28:23 +01:00
Alexey Sokolov 5dd209369d Merge pull request #1289 from torarnv/echo-message-time
Don't strip timestamp when sending echo-messages
2016-07-05 21:41:01 +01:00
Alexey Sokolov ff2d1e47b2 Merge pull request #1282 from Zarthus/always-send-nick-in-notice
Always send the users name in NOTICE when logging in.
2016-06-26 20:55:02 +01:00
Alexey Sokolov b7309cdaa4 Merge pull request #1280 from teward/patch-1
Update default SSL ciphers, using Mozilla Intermediate recommendations, 2016-06-03
2016-06-12 00:19:29 +01:00
Alexey Sokolov c5db7793d3 Merge pull request #1272 from Zarthus/patch/security-fail2ban-cmds-admin
fix #1271: Disallow non-admin users to use fail2ban commands
2016-05-11 08:10:52 +01:00
Alexey Sokolov 23b19e53f9 Merge pull request #1261 from kylef/kylef/strip-resetfg-bg
Strip background colours when we reset foreground
2016-04-17 18:44:22 +01:00
Alexey Sokolov b45617cb59 Merge pull request #1257 from staticfox/tweaks
Small misc cleanups
2016-04-01 00:00:41 +01:00
Alexey Sokolov c2d23aae2d Merge pull request #1250 from Adam-/master+configwritetimer
Add config write delay configuration setting
2016-03-26 18:52:36 +00:00
Alexey Sokolov 5b29bb711e Merge pull request #1228 from onovy/typos
Fixed few misspellings
2016-01-05 21:59:21 +00:00
Alexey Sokolov 0268f6dda6 Merge pull request #1222 from onovy/ssl_ciphers_update
Default SSL ciphers updated to new Mozilla recommendation
2016-01-02 18:07:34 +00:00
Alexey Sokolov 5b9cde062f Merge pull request #1220 from Un1matr1x/master
Welcome to 2016
2016-01-01 19:31:09 +00:00
Alexey Sokolov b17481b751 Readme: Add coverity badge 2015-12-25 11:03:21 +00:00
Alexey Sokolov 8e0faa7475 Merge pull request #1213 from nasonfish/master
modules/sasl, modules/route_replies: interpret messages even if they have prefix tags (resolves #1212)
2015-12-22 16:41:38 +00:00
Alexey Sokolov d45743e0a2 Merge pull request #1174 from DarthGandalf/thread
Rework signal handling and use C++11 threads.
2015-12-06 00:53:58 +00:00
Alexey Sokolov 45f661e496 Merge pull request #1192 from nospampleasemam/support-separate-sslkeyfile
support for separate SSLKeyFile configuration
2015-11-27 01:38:45 +00:00
Alexey Sokolov 2cb6599c87 Merge pull request #1184 from TingPing/tingping/servicefile
Fix bindir in service file
2015-11-15 23:34:38 +00:00
Alexey Sokolov 622b48427c Merge pull request #1166 from Mikaela/systemd
znc.service.in: add datadir & instructions
2015-11-15 22:28:51 +00:00
Alexey Sokolov 1e46ea821a Merge pull request #1176 from KindOne-/master
Add test for controlpanel module
2015-11-08 16:47:34 +00:00
Alexey Sokolov f909cf1ce0 Merge pull request #1178 from Mikaela/travis
.travis.yml: encrypt IRC notification settings
2015-11-06 11:27:07 +00:00
Alexey Sokolov 622c07b864 Merge pull request #1171 from walliski/logNameFix
Make $USER and $NETWORK case sensitive in logs
2015-11-04 22:52:43 +00:00
Alexey Sokolov cf1c56557a Merge pull request #1154 from jreese/server-details
#1147: show new server name when jumping
2015-10-25 20:08:32 +00:00
Alexey Sokolov 3856e7ba2f Merge pull request #1150 from jreese/simple-away
Fix #1133: Add MinClients option to simple_away
2015-10-20 07:37:50 +01:00
Alexey Sokolov 0022fc6162 Merge pull request #1153 from Mikaela/travis-trusty
.travis.yml: use Ubuntu Trusty & #znc-dev
2015-10-16 20:28:42 +01:00
Alexey Sokolov c87a40ac9b Merge pull request #1145 from Zarthus/blockmotd_override
blockmotd: Allow overriding via command
2015-10-16 08:00:03 +01:00
Alexey Sokolov eb6852f58b Merge pull request #1140 from Zarthus/simpleaway-expandstring
Use ExpandString for simple_away, rename %s to %awaytime% to follow ExpandString standards
2015-10-15 09:00:06 +01:00
Alexey Sokolov 3623cf0d45 Merge pull request #1152 from znc/revert-1149-server-details
Revert "Fix #1147: show new server name when jumping"
2015-10-15 08:39:06 +01:00
Alexey Sokolov 44bbde35ee Revert "Fix #1147: show new server name when jumping" 2015-10-15 08:38:02 +01:00
Alexey Sokolov e57f6460a1 Merge pull request #1149 from jreese/server-details
Fix #1147: show new server name when jumping
2015-10-15 08:33:58 +01:00
Alexey Sokolov 87a921d87a Merge pull request #1139 from Zarthus/expandstring-network
Expandstring network, alphabeticize expandstring list
2015-10-15 08:31:50 +01:00
Alexey Sokolov 9f151c5bc9 Merge pull request #1130 from Zarthus/alias-dump-command
alias: add 'dump' command to copy your config between users.
2015-10-02 20:53:34 +01:00
Alexey Sokolov c19a214ca8 Merge pull request #1124 from Zarthus/printstatus-nook
Remove 'ok' from bootup
2015-10-02 20:43:25 +01:00
Alexey Sokolov 0b89db6753 Merge pull request #1113 from Mikaela/travis
.travis.yml: enable fast_finish
2015-10-02 20:42:24 +01:00
Alexey Sokolov 819ded0f9c Merge pull request #1138 from Zarthus/clientnotify-disconnect
Fixes a weird sentence in clientnotify syntax help.
2015-10-02 20:38:50 +01:00
Alexey Sokolov 30cbb5ab39 Merge pull request #1101 from Mikaela/perform-descriptions
perform: add descriptions for commands
2015-09-28 07:43:29 +01:00
Alexey Sokolov 3032664a65 Merge pull request #813 from anthonyryan1/master
Expand crypt module to cover Notices, Actions & Topics
2015-09-20 19:36:44 +01:00
Alexey Sokolov 9493964a3d Merge pull request #1087 from Mikaela/route_replies
route_replies: make the timeout error more clear
2015-09-20 15:16:13 +01:00
Alexey Sokolov 073e538094 Merge pull request #1104 from Mikaela/module-descriptions
Add descriptions for missing commands in lastseen & certauth & route_replies
2015-09-20 15:14:14 +01:00
Alexey Sokolov f848569309 Merge pull request #1065 from Mikaela/znc.service.in
znc.service.in: start after network-online.target
2015-09-19 19:25:32 +01:00
Alexey Sokolov 41f1e317c4 Merge pull request #1080 from RealRancor/add_httponly_flag
Set HttpOnly for session cookie
2015-09-19 13:55:19 +01:00
Alexey Sokolov e911c3b57a Merge pull request #1051 from ChasedSpade/controlpanel-syntax
ControlPanel: Move syntax of GetNetwork and SetNetwork
2015-08-30 23:39:07 +01:00
Alexey Sokolov 8f655ac179 Merge pull request #1050 from Mkaysi/contributing
CONTRIBUTING.md: ask for unmodified ZNC
2015-08-30 13:51:40 +01:00
Alexey Sokolov 1a574f95ae Merge pull request #978 from alprs/log-timestamp
log: Add -timestamp option (cont.)
2015-08-23 20:38:42 +01:00
Alexey Sokolov e546cedaa2 Merge pull request #1035 from jpnurmi/server-time
Make ZNC request server-time when available (close #839)
2015-08-20 22:31:24 +01:00
Alexey Sokolov abda566073 Merge pull request #1034 from jpnurmi/bindhost
Remove flawed Add/Del/List/BindHost(s) (close #983)
2015-08-17 23:50:44 +01:00
Alexey Sokolov 7f87e51f37 Merge pull request #1033 from Mkaysi/contributing
add simple CONTRIBUTING.md
2015-08-17 23:49:46 +01:00
Alexey Sokolov 6bfe7d840f Merge pull request #1000 from jpnurmi/message
Say hello to a Message type
2015-08-16 13:16:46 +01: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
Alexey Sokolov 483074cbf8 Merge pull request #1021 from gustavoz/master
Add <time.h> includes where appropiate
2015-08-07 09:25:54 +01:00
Alexey Sokolov e2222e3a18 Merge pull request #989 from Mkaysi/readme
README: fix formatting & links
2015-07-10 08:11:24 +01:00
Alexey Sokolov 95520630a1 Merge pull request #938 from Mkaysi/sasl
sasl: enable all mechanisms by default
2015-07-08 09:31:56 +01:00
Alexey Sokolov c2733f9f3e Merge pull request #970 from DarthGandalf/server-list
Make server editor in webadmin more fancy, when JS is enabled
2015-06-03 23:22:12 +01:00
Alexey Sokolov a3ed8147d0 Merge pull request #860 from ammaraskar/table_sorting
Implement table sorting in webadmin, addresses #40
2015-05-10 17:02:32 +01:00
Alexey Sokolov 0cdda5ad93 Merge pull request #962 from wolfy1339/pr-455-fix
Add third class to the port input [Fixes #446]
2015-05-09 08:48:44 +01:00
Alexey Sokolov 1d5b08fa03 Merge pull request #961 from wolfy1339/exra-td
Add extra td [Fixes #446]
2015-05-07 20:09:31 +01:00
Alexey Sokolov dc755ee3e6 Merge pull request #950 from jpnurmi/echo-message
Implement IRCv3.2 echo-message capability on the "client side"
2015-04-26 19:55:08 +01:00
Alexey Sokolov 1b743a2360 Merge pull request #939 from SaberUK/master+notice-grammar
Fix some iffy grammar in the NOTICE file.
2015-04-06 07:26:37 +01:00
Alexey Sokolov 2fe416987f Merge pull request #912 from jpnurmi/sasl
SASL: add webadmin interface (closes #910)
2015-04-05 11:49:49 +01:00
Alexey Sokolov faa77eceec Merge pull request #934 from teward/patch-1
Add Thomas Ward to contributors/helpers list
Thanks for contributions!
2015-03-30 22:07:13 +01:00
Alexey Sokolov 3f73231665 Merge pull request #918 from jpnurmi/weffc++
Fix warnings of -Weffc++ [-Weffc++] (#270)
2015-03-07 22:03:10 +00:00
Alexey Sokolov e2a99eeb21 Merge pull request #920 from Kriechi/readme-dependencies
Readme dependencies
2015-03-07 20:29:52 +00:00