3
0
mirror of https://github.com/jlu5/PyLink.git synced 2024-12-19 16:42:51 +01:00
Commit Graph

400 Commits

Author SHA1 Message Date
James Lu
0d402af17e fantasy: support nick triggers (close ) 2015-11-28 20:46:53 -08:00
James Lu
7705d48425 commands: update irc.botdata in REHASH too 2015-11-26 22:57:52 -08:00
James Lu
3df0a24232 relay: catch PRIVMSG/NOTICE sent from servers, and relay them via the PyLink client instead of erroring 2015-11-26 22:51:19 -08:00
James Lu
a7f5068bd8 relay: squash another "dictionary changed size during iteration" bug 2015-11-26 22:50:20 -08:00
James Lu
adfa114c4b relay: remove cloak from whitelisted umodes, send modes to spawnClient as a set (prevents duplicates) 2015-11-22 13:08:31 -08:00
James Lu
5c0517ba40 unreal/ts6/relay: add some more user mode support
Cloaking is still a bit iffy on UnrealIRCd networks - Unreal insists on applying its own cloaking for +x users, but vHosts for non +x remote users don't apply at all (their real host is shown instead)
2015-11-21 23:57:24 -08:00
James Lu
a3e0159054 relay: normalize hostnames too (e.g. unreal doesn't allow / in vHosts) 2015-11-21 23:37:19 -08:00
James Lu
06539fc813 unreal: add missing SJOIN->JOIN hook map, and set irc.connected (relay will otherwise break) 2015-11-15 21:42:58 -08:00
James Lu
5027feb553 Don't crash when REHASH loads a config file that's invalid
This was actually several bugs in one:
- The sys.exit() call in loadConf should be... toggleable
- loadConf printed errors but forgot to re-raise the actual exception it caught
- The error reply in the REHASH command was passing the wrong arguments to irc.reply(), which would cause an error within an error when it ran
2015-11-11 18:55:51 -08:00
James Lu
5715835bbb fantasy: fix error handling if prefix isn't set 2015-11-01 20:55:01 -08:00
James Lu
86d3cd3295 relay: only join the main pseudoclient once per channel 2015-10-25 10:39:56 -07:00
James Lu
9a1eab3b82 commands: add command to set log level (Closes ) 2015-10-25 10:18:51 -07:00
James Lu
2bf9568fbb relay: Home network lost connection. => Relay network lost connection. 2015-10-23 18:50:42 -07:00
James Lu
cecb7f3800 plugins: chmod -x 2015-10-23 18:31:48 -07:00
James Lu
17a2dcd21f plugins: use irc.reply(...) instead of irc.msg(irc.called_by, ...) whereever possible 2015-10-23 18:29:10 -07:00
James Lu
d14cf3c7cf Move (un|re)?load, identify commands to coreplugin
This is so the commands plugin, which includes other generic (but not essential) commands, can be more easily reloaded.
2015-10-23 18:22:29 -07:00
James Lu
1b8f1ff95e commands: s/public channel/channel/ 2015-10-18 12:49:13 -07:00
James Lu
5327de9317 relay: fix local kicks not quitting users on remote networks when the target doesn't share any channels as a result
Closes .
2015-10-18 10:27:54 -07:00
James Lu
6034333682 commands: actually break when identify is sent in a channel 2015-10-18 10:27:27 -07:00
James Lu
d21ce9983d relay: don't spam subserver connects + instant disconnects for networks that are dead 2015-10-10 15:34:57 -07:00
James Lu
bde2f66b2a relay: don't send SQUIT for relay servers to networks that aren't connected 2015-10-10 15:27:57 -07:00
James Lu
e28c351792 relay: add missing return in getRemoteSid 2015-10-10 15:26:28 -07:00
James Lu
07694ae642 relay: restore checks for irc.connected/world.started to prevent server spawning from happening too quickly 2015-10-10 15:22:06 -07:00
James Lu
ffce69060c relay: fix RuntimeError in handle_disconnect (dict changed size during iteration) 2015-10-10 15:06:36 -07:00
James Lu
17cfdcab0a relay: fix 7d919e6 again
PyLink bots can send messages over the relay to channels, just not to remote users.
2015-10-02 23:40:20 -07:00
James Lu
7e57798f4d core: refresh various serverdata attributes on REHASH 2015-10-02 23:17:55 -07:00
James Lu
f20e677577 relay: fix PMs across the relay (7d919e64 regression) 2015-10-01 16:40:58 -07:00
James Lu
54414f307e commands: new REHASH command (Closes )
This command reloads the config and automatically add/removes networks that are in the new conf but not currently connected.
2015-09-28 19:13:08 -07:00
James Lu
e84a2d1025 Modularize our import hacks, make Irc() take a conf object again 2015-09-28 19:12:45 -07:00
James Lu
9e07949730 relay: make spawning of subservers toggleable 2015-09-28 18:22:03 -07:00
James Lu
55b642ea30 Revert "relay: remove ENDBURST hook (is this needed anymore?)"
This reverts commit 4a9a29e095.
2015-09-28 18:15:56 -07:00
James Lu
0d3a7a5ce0 exec: import world, for easier access to it 2015-09-27 12:15:10 -07:00
James Lu
5aeaac0394 commands: only allow loading plugins that aren't already loaded 2015-09-27 12:12:58 -07:00
James Lu
4a9a29e095 relay: remove ENDBURST hook (is this needed anymore?) 2015-09-27 11:56:32 -07:00
James Lu
a14e8a7b8f relay: add (experimental) support for plugin reloading 2015-09-27 11:56:09 -07:00
James Lu
07fe7202aa commands: add plugin loading/unloading/reloading support
Closes .
2015-09-27 11:54:06 -07:00
James Lu
bbedd38703 world: rename command_hooks=>hooks, bot_commands=>commands 2015-09-27 10:53:25 -07:00
James Lu
cc171eb79a relay: abort connection when spawning a server fails 2015-09-27 10:45:08 -07:00
James Lu
a37d4b6f3c fantasy: only work when the main PyLink client is in the channel 2015-09-26 10:20:23 -07:00
James Lu
7470efc461 commands: add an echo command 2015-09-26 10:20:23 -07:00
James Lu
7d919e643a relay: forward messages from the main PyLink client too
This may or may not have nasty regressions - time will tell I guess.
2015-09-26 10:20:23 -07:00
James Lu
0378fcca1d fantasy: don't allow internal clients to trigger 2015-09-26 10:20:23 -07:00
James Lu
8e444c5dbe plugins: support FANTASY (where reasonable) by using irc.msg(irc.called_by, ...) instead of irc.msg(source, ...) 2015-09-26 10:20:23 -07:00
James Lu
4509e0757d FANTASY support plugin (Closes ) 2015-09-26 10:20:23 -07:00
James Lu
7e12ec9e5e relay: don't prepend sender prefixes more than once (for servers and clients not on any relay networks) 2015-09-20 18:13:39 -07:00
James Lu
f2b6d1a3ad relay: use two locks (one for clients, one for servers) to prevent lock ups on start 2015-09-20 16:56:24 -07:00
James Lu
7b2d1d8129 relay: use the network's full name in spawning servers 2015-09-20 12:11:41 -07:00
James Lu
f38958995c Store opertypes with spaces instead of underscores, and only change them back when sending OPERTYPE
Another "Janus sucks" commit - it should be always using underscores when sending OPERTYPE, but it doesn't...
2015-09-20 11:25:45 -07:00
James Lu
0f26848b16 Add a useful "version" command 2015-09-19 11:51:56 -07:00
James Lu
0d207f7d08 relay: better description for 'showuser' 2015-09-19 10:39:56 -07:00
James Lu
dfe09263b9 plugins/exec: add 'eval' command too 2015-09-19 10:39:05 -07:00
James Lu
2c23cbe01e relay: fix some logging peculiarities in handle_kick? 2015-09-19 10:32:45 -07:00
James Lu
6ee2ec8a2d relay: make oper status/IP hiding configurable
Closes .
2015-09-19 10:17:25 -07:00
James Lu
c3e8420aa0 relay/ts6_common: be more error tolerant with network (dis)connections 2015-09-18 22:11:27 -07:00
James Lu
504e2683fb relay: hide +s/+p channels in LINKED output (closes ) 2015-09-18 22:05:51 -07:00
James Lu
4ad94ca4ea Merge branch 'master' into devel 2015-09-17 19:31:30 -07:00
James Lu
63189e9990 relay: look at the right prefix mode list when rejoining from KILL 2015-09-17 19:30:38 -07:00
James Lu
0371b21634 Merge branch 'master' into devel 2015-09-17 19:26:25 -07:00
James Lu
cb83db4c1c relay: don't allow creating a channel that's already part of a relay 2015-09-17 19:24:38 -07:00
James Lu
70227bf3e0 relay: use utils.checkAuthenticated() for checking oper status 2015-09-17 19:22:34 -07:00
James Lu
8faf86aa8f relay: rejoin killed users to the RIGHT channels 2015-09-17 19:15:51 -07:00
James Lu
10f3cd1fb8 bots: limit most commands to non-protected internal PyLink clients 2015-09-17 19:07:16 -07:00
James Lu
7011aa3b36 relay: send kick rejoins from CLAIM from the main relay server 2015-09-16 21:23:09 -07:00
James Lu
f92c2f731c relay: CLAIM command! Closes . 2015-09-16 20:59:32 -07:00
James Lu
04ca322154 relay: skip claim checks when claim list is empty for a channel 2015-09-16 20:59:08 -07:00
James Lu
b531a180dc commands: add a "showchan" command 2015-09-14 18:43:19 -07:00
James Lu
7ced47e9b3 bots: don't allow setting umode +o on InspIRCd users (forbidden and causes desync) 2015-09-14 18:09:39 -07:00
James Lu
b8d6e1e2ef bots: still allow setting modes on internal clients 2015-09-14 18:03:39 -07:00
James Lu
c5b6658200 bots: more validation in "MODE" to prevent bad things from happening
This adds a new "allow_forceset_usermodes" attribute to protocol modules, which determines whether the IRCd allows us to force usermode changes on other servers' clients.

Also, make sure our target is a valid nick/UID/channel, and that the parsed modes are not empty!
2015-09-14 17:46:20 -07:00
James Lu
78080bde6b relay: don't fail if oldchan is not given in MODE 2015-09-14 17:36:41 -07:00
James Lu
81628f9a6d relay: rename some internal functions to make more sense
getLocalUser => getOrigUser
findRemoteChan => getRemoteChan
findRelay => getRelay
2015-09-14 17:29:37 -07:00
James Lu
75de9c6be6 relay: sort code and document most internal functions 2015-09-14 17:25:17 -07:00
James Lu
1e6c5a231e relay.handle_topic: don't fail if we're bursting and no old topic exists 2015-09-13 17:58:39 -07:00
James Lu
4a4c9395d6 relay: remove broken logging line 2015-09-13 17:50:59 -07:00
James Lu
19530107d7 relay: enforce CLAIM checks in TOPIC too. 2015-09-13 14:23:27 -07:00
James Lu
9a139212dd relay/utils: make mode reversals work with mode changes that affect op statuses. 2015-09-13 13:48:14 -07:00
James Lu
fa4583c272 relay: basic CLAIM checking when setting modes ()
There's still some desyncs with checking op statuses, because hooks are only called AFTER the internal state updates. Fix for this will come soon.
2015-09-12 23:36:52 -07:00
James Lu
945306af34 relay: make CLAIM checking a shared function 2015-09-12 22:50:53 -07:00
James Lu
b3902c7711 relay: KILL war protection ()
TODO: possibly integrate this into core?
2015-09-12 17:41:49 -07:00
James Lu
1fcacd0d7c relay: more compact "showuser" output 2015-09-12 16:03:59 -07:00
James Lu
1c97927b5d relay: monitor SAVE floods by network, not by target nick 2015-09-12 16:03:47 -07:00
James Lu
95b70f3ebf relay: spawn a server for every linked network (Closes ) 2015-09-12 12:08:02 -07:00
James Lu
7f526267ec relay: minor typo in error message 2015-09-09 20:53:04 -07:00
James Lu
9e73af050c relay: unpluralize "relayWhoisHandlers"
There's only one handler, why did I make it plural?
2015-09-06 22:39:40 -07:00
James Lu
9dc836d921 Merge remote-tracking branch 'origin/wip/document-everything' into devel 2015-09-06 22:31:41 -07:00
James Lu
62e7cc4fca move utils.msg() => classes.Irc.msg()
New function gets an extra (optional) "source" argument for specifying a sender UID. It's also shorter since no IRC object has to be passed to utils.
2015-09-06 22:23:44 -07:00
James Lu
57da0aa3b3 Classify all our protocol modules - why didn't I do this earlier 2015-09-05 18:00:57 -07:00
James Lu
2777b88d33 commands: Add a shutdown command ()
Sometimes exiting takes a little time, possibly from waiting for sockets to close?
2015-09-02 23:46:59 -07:00
James Lu
0404801b18 plugins/admin.py -> plugins/bots.py
- admin: Drop "showchan" command. It's not very useful, and doesn't handle long output strings at all.
- All the remaining commands are dedicated to spawning bots and playing with them anyways, so this new name fits better.
2015-09-02 23:24:58 -07:00
James Lu
c0f5bedbd3 Add new "networks" plugin, for controlling connections to networks
Daemonized threads are lovely; when all connections are closed, PyLink just exits :)

Closes .
2015-09-02 23:08:04 -07:00
James Lu
320de2079a relay: add INVITE support (Closes ) 2015-09-02 21:30:31 -07:00
James Lu
60dc3fe026 relay: use "Channel delinked." part message when delinking channels 2015-09-02 20:46:21 -07:00
James Lu
9a47ff87af Merge branch 'master' into devel 2015-09-02 20:44:03 -07:00
James Lu
043fccf447 Fix previous commit (Closes ) 2015-09-02 18:56:53 -07:00
James Lu
ace0ddf28c relay: use JOIN instead of SJOIN for non-burst joins
Closes .
2015-09-02 18:33:04 -07:00
James Lu
c2ee9ef808 Merge branch 'master' into devel 2015-09-02 18:15:34 -07:00
James Lu
708d949164 relay: join remote users before sending ours
This fixes race conditions where modes can be set on our joining users (e.g. auto-op by ChanServ), but are promptly erased as relay joins remote users and resets the channel TS.

Also, move relayModes() calls back into relayJoins(), with an optional "burst" argument.

Closes .
2015-09-02 18:08:39 -07:00
James Lu
19fa31d012 relay: fix incorrect logging in getSupportedUmodes() 2015-09-01 22:14:25 -07:00
James Lu
2f760c8c92 relay: Don't send empty user mode changes 2015-09-01 22:13:29 -07:00
James Lu
4f40faeaf0 relay: in logs, be a bit more specific why we're blocking KILLs and KICKs 2015-09-01 22:02:34 -07:00
James Lu
0b590d6ab3 relay/protocols: use utils.toLower() for channel names, respecting IRCd casemappings
Closes .
2015-09-01 22:01:22 -07:00
James Lu
8d44830d5c relay.handle_kill: prevent yet another RuntimeError
(cherry picked from commit 4525b8117e)

Conflicts:
	plugins/relay.py
2015-09-01 19:42:12 -07:00
James Lu
6d6606900e relay: coerse "/" to "|" in nicks if "/" isn't present in the separator
a.k.a. make J*anus* happy :)
2015-09-01 09:56:28 -07:00
James Lu
4525b8117e relay.handle_kill: prevent yet another RuntimeError 2015-08-31 15:04:06 -07:00
James Lu
26e102f01a Show oper types on WHOIS 2015-08-31 14:52:56 -07:00
James Lu
8d19057118 relay: set umode +H (hideoper) on all remote opered clients 2015-08-31 14:23:42 -07:00
James Lu
f9b4457ced Decorate relay clients, etc. with custom OPERTYPEs
New PyLink internal hook: PYLINK_CLIENT_OPERED, called (supposedly) when a client opers up.
2015-08-31 13:31:20 -07:00
James Lu
4a964b1595 Merge branch 'master' into devel 2015-08-31 10:58:47 -07:00
James Lu
9f0f4cb124 relay: burst the right set of modes
It's moments like this where I wonder what I'm even doing with my life...
2015-08-31 09:28:14 -07:00
James Lu
94f83eb33b relay.showuser: show home network/nick, and relay nicks regardless of oper status 2015-08-29 19:49:37 -07:00
James Lu
5503477646 commands: distinguish commands with multiple binds in 'list' 2015-08-29 19:29:49 -07:00
James Lu
8976322273 Replace admin.showuser with prettier whois-style cmds in 'commands' and 'relay' 2015-08-29 19:29:05 -07:00
James Lu
e1e31f64ad Allow multiple plugins to bind to one command name!
They will get called in a list, one after the other. The "help" command is able to distinguish with this too.
2015-08-29 19:25:07 -07:00
James Lu
973aba6de7 Move utils' global variables to world.py 2015-08-29 09:39:33 -07:00
James Lu
2fe9b624e7 Consistently capitalize errors and other messages 2015-08-25 20:55:39 -07:00
James Lu
bc7765b241 Let's use consistent "Unknown command" errors, right? 2015-08-25 20:51:13 -07:00
James Lu
d059bd4ff1 Move 'exec' command into its separate plugin 2015-08-25 20:47:21 -07:00
James Lu
3d621b00df Move checkAuthenticated() to utils, and give it and isOper() toggles for allowing oper/PyLink logins 2015-08-25 20:47:21 -07:00
James Lu
51389b96e2 relay: LINKACL command (Closes ) 2015-08-25 20:18:14 -07:00
James Lu
0610783479 Merge branch 'devel' into wip/document-everything 2015-08-24 10:09:41 -07:00
James Lu
713ba1469b relay: log blocked KILLs/KICKs (Closes ) 2015-08-22 21:43:25 -07:00
James Lu
20474dabac relay: fix many bugs with nick collision handling, and add flood prevention for fixing nicks
Closes . Nick collisions caused by internal clients are handled fine now, including the following cases:
- Abusing spawnClient to create a user with the same nick as a relay client, but with a lower TS.
- When both an UID (e.g. 42XAAAAAA) and a tagged UID (_42XAAAAAA) exist on the same network (the two will both try to take the same nick of _42XAAAAAA/net over the relay).

The case where changing NICK from a long cut-off nick to another long cut-off nick is also mitigated. somelongnick/net won't show nick changes to somelongnic//net if the old and new nicks have give the same normalized relay nick.

This introduces a new dependency, expiringdict, from https://pypi.python.org/pypi/expiringdict/1.1.2, which is used as a cache for flood prevention.
2015-08-22 21:01:51 -07:00
James Lu
c1d98838d7 plugins/admin: allow sending KICK from servers () 2015-08-21 00:39:58 -07:00
James Lu
bd2bd55e89 relay: fix mode relaying when sender is a client but isn't in any shared channels 2015-08-20 22:13:28 -07:00
James Lu
834136e848 Merge branch 'devel' into wip/document-everything 2015-08-20 08:14:22 -07:00
James Lu
dde9539e77 relay: fix incorrect logging in normalizeNick 2015-08-20 03:04:40 -07:00
James Lu
821f546f12 Make sure the PyLink client rejoins all relay channels on KILL
This adds a new internal hook, 'PYLINK_SPAWNMAIN', which is triggered whenever Irc().spawnMain() is called.
2015-08-18 05:44:36 -07:00
James Lu
f93349ae1f relay: when restoring a user after KICK, join them to the *right* channel 2015-08-18 02:59:56 -07:00
James Lu
5704fddfb4 relay: ignore internal clients for CLAIM checks 2015-08-18 02:57:40 -07:00
James Lu
0d2fbc330d relay: fix "Left all shared channels" quits for KICK handling 2015-08-18 02:44:27 -07:00
James Lu
d6e6e56e03 relay: hotfix to fix KILL handling of relay clients 2015-08-17 21:15:44 -07:00
James Lu
de36c7a62a Merge branch 'wip/admin-commands-loopback' into devel
Conflicts:
	plugins/relay.py
2015-08-17 07:52:45 -07:00
James Lu
e7f187c672 relay: send modes once at init, not on every JOIN 2015-08-15 23:31:54 -07:00
James Lu
3b83c3d567 relay: fix TOPIC relaying when the source and target channels have different names 2015-08-15 23:05:09 -07:00
James Lu
4352a68357 Check for TS changes on SJOIN (both incoming and outgoing)
Restore relay to the devel branch; TS bursts shouldn't be handled there, but in the protocol modules.

TODO: fix prefixmodes being cleared after BURST, and never being reset?
2015-08-15 19:53:09 -07:00
James Lu
0d41e35d9c Merge branch 'devel' into wip/handle-ts-bursts
Conflicts:
	plugins/relay.py
2015-08-15 19:28:49 -07:00
James Lu
aec29d2aae relay: continue, not return
(fix SQUIT not rejoining relay users properly)
2015-08-15 19:23:41 -07:00
James Lu
043a4bc27a Merge branch 'devel' into wip/admin-commands-loopback
Conflicts:
	plugins/relay.py
2015-08-15 19:21:38 -07:00
James Lu
dd91b7e5a0 relay: more efficient getLocalUser
Set the .remote attribute of each relay client to the original netname, user pair.
2015-08-15 19:18:04 -07:00
James Lu
a1db4932e1 relay: Don't allow kicks/parts to the PyLink client to be relayed. 2015-08-15 06:05:12 -07:00
James Lu
6ebe6e7867 relay: check for whether clients are relay clients, instead of just internal clients
This prevents things like non-relay PyLink clients being quit for "Left all shared channels", and allows kicks between internal clients to relay properly.
2015-08-15 05:54:18 -07:00
James Lu
f63d17f945 relay: don't relay kicks if the target has no client on the remote network? 2015-08-15 05:54:05 -07:00
James Lu
cc7e52a190 relayJoins: remove check for whether the sender internal client
This is already done by the .remote attribute check.
2015-08-15 05:20:17 -07:00
James Lu
b2e1f9678f plugins/admin: make command sending loop via hooks
This should allow plugins like relay to relay messages, kicks, etc. sent from these admin commands to actually work, preventing desyncs.
2015-08-15 05:12:49 -07:00
James Lu
d3ee7ed918 plugins/admin: fix command help for 'mode' 2015-08-15 05:12:20 -07:00
James Lu
f53e818438 plugins/admin: add 'msg' command () 2015-08-15 04:51:32 -07:00
James Lu
5daf38d880 relay: restore ability to message @#channels across the relay () 2015-08-15 00:12:30 -07:00
James Lu
4382b22138 relay: warn users when messaging channels they aren't in / remote users w/o sharing a channel
Some refactoring of relay's PRIVMSG handling is done here:
- Messages to channels the sender isn't in are dropped, with a notice warning sent.
- Messaging a remote user without sharing a channel with them raises an error, and is dropped.

Closes .
2015-08-15 00:02:46 -07:00
James Lu
e5c7d438b1 relay: in handle_kick, only remove the target from the user cache after the kick has been relayed to all networks 2015-08-14 19:05:07 -07:00
James Lu
13b5377102 relay: Fix check for whether target user is on our target channel
Really closes ; can I sleep now...
2015-08-14 19:02:51 -07:00