207 Commits

Author SHA1 Message Date
contact
9fe572eb4f Fix SQL error logged on JOIN
Closes: https://todo.sr.ht/~emersion/soju/40

git-svn-id: file:///srv/svn/repo/suika/trunk@207 f0ae65fe-ee39-954e-97ec-027ff2717ef4
2020-04-01 15:34:22 +00:00
contact
0e879e79d8 Set connect timeout
References: https://todo.sr.ht/~emersion/soju/26

git-svn-id: file:///srv/svn/repo/suika/trunk@206 f0ae65fe-ee39-954e-97ec-027ff2717ef4
2020-04-01 14:41:17 +00:00
contact
db1e84ce20 Set write deadlines
References: https://todo.sr.ht/~emersion/soju/26

git-svn-id: file:///srv/svn/repo/suika/trunk@205 f0ae65fe-ee39-954e-97ec-027ff2717ef4
2020-04-01 14:27:53 +00:00
contact
f4f532b00c Simplify ring consumer goroutine
Since network.history is now only accessed from the user goroutine, a
lock becomes unnecessary.

git-svn-id: file:///srv/svn/repo/suika/trunk@204 f0ae65fe-ee39-954e-97ec-027ff2717ef4
2020-04-01 14:02:31 +00:00
contact
9ae7d253b3 Stop ring consumers when deleting network
git-svn-id: file:///srv/svn/repo/suika/trunk@203 f0ae65fe-ee39-954e-97ec-027ff2717ef4
2020-04-01 13:48:56 +00:00
contact
d317a87876 Add "network delete" service command
And add all the infrastructure required to stop and delete networks.

References: https://todo.sr.ht/~emersion/soju/17

git-svn-id: file:///srv/svn/repo/suika/trunk@202 f0ae65fe-ee39-954e-97ec-027ff2717ef4
2020-04-01 13:40:20 +00:00
contact
5f0e31c148 Make user.getNetwork handle Network.Name
git-svn-id: file:///srv/svn/repo/suika/trunk@201 f0ae65fe-ee39-954e-97ec-027ff2717ef4
2020-04-01 13:04:32 +00:00
contact
0adb9a320e config: use shlex
This simplifies parsing and allows quoting words.

Closes: https://todo.sr.ht/~emersion/soju/43

git-svn-id: file:///srv/svn/repo/suika/trunk@200 f0ae65fe-ee39-954e-97ec-027ff2717ef4
2020-04-01 12:58:14 +00:00
contact
a8b006a658 Set network.conn in user goroutine
One step closed to removing that lock.

git-svn-id: file:///srv/svn/repo/suika/trunk@199 f0ae65fe-ee39-954e-97ec-027ff2717ef4
2020-04-01 10:21:31 +00:00
contact
b476131682 Auto away
Closes: https://todo.sr.ht/~emersion/soju/13

git-svn-id: file:///srv/svn/repo/suika/trunk@198 f0ae65fe-ee39-954e-97ec-027ff2717ef4
2020-04-01 10:16:32 +00:00
contact
fc82577f45 Only set network.conn when registered
git-svn-id: file:///srv/svn/repo/suika/trunk@197 f0ae65fe-ee39-954e-97ec-027ff2717ef4
2020-04-01 10:14:36 +00:00
contact
baadefdaef Add eventUpstreamConnected
This is used in the next commit.

git-svn-id: file:///srv/svn/repo/suika/trunk@196 f0ae65fe-ee39-954e-97ec-027ff2717ef4
2020-04-01 10:05:25 +00:00
contact
db2e08e72e Fix log dir permission
We need the permission to list files in the dir.

git-svn-id: file:///srv/svn/repo/suika/trunk@195 f0ae65fe-ee39-954e-97ec-027ff2717ef4
2020-03-31 20:21:49 +00:00
contact
dcb04da885 Add downstream support for server-time
git-svn-id: file:///srv/svn/repo/suika/trunk@194 f0ae65fe-ee39-954e-97ec-027ff2717ef4
2020-03-31 17:50:31 +00:00
contact
c2083296b3 Request server-time cap
If the server didn't populate the time tag, do it ourselves.

git-svn-id: file:///srv/svn/repo/suika/trunk@193 f0ae65fe-ee39-954e-97ec-027ff2717ef4
2020-03-31 17:45:04 +00:00
contact
106949d6e0 Avoid directly forwarding NOTICE messages
This would forward tags even if downstream doesn't support those.

git-svn-id: file:///srv/svn/repo/suika/trunk@192 f0ae65fe-ee39-954e-97ec-027ff2717ef4
2020-03-31 17:41:12 +00:00
contact
ee53042d08 Expose message-tags capability downstream
Strip tags if the client doesn't support them.

git-svn-id: file:///srv/svn/repo/suika/trunk@191 f0ae65fe-ee39-954e-97ec-027ff2717ef4
2020-03-31 17:39:06 +00:00
contact
fc6c4cf40b Make "@" and "/" indicate client name and network, respectively
This allows both kinds "<username>@<client>/<network>" and
"<username>/<network>@<client>".

git-svn-id: file:///srv/svn/repo/suika/trunk@190 f0ae65fe-ee39-954e-97ec-027ff2717ef4
2020-03-31 17:02:02 +00:00
contact
3047218c00 readme: advise connecting with "<username>/<network>"
This matches znc's behavior and is more consistent with the
multiple-upstream mode (where channels and nicks are suffixed with
"/<network>" as well).

git-svn-id: file:///srv/svn/repo/suika/trunk@189 f0ae65fe-ee39-954e-97ec-027ff2717ef4
2020-03-31 16:41:14 +00:00
contact
e972f4b7de Consume ring messages outside of writer goroutine
This fixes out-of-order JOIN and PRIVMSG messages.

Closes: https://todo.sr.ht/~emersion/soju/36

git-svn-id: file:///srv/svn/repo/suika/trunk@188 f0ae65fe-ee39-954e-97ec-027ff2717ef4
2020-03-31 16:16:54 +00:00
contact
547e49964d Rename AppendLog to appendLog
This function is only safe to call from inside the user goroutine. Let's
make it private.

git-svn-id: file:///srv/svn/repo/suika/trunk@187 f0ae65fe-ee39-954e-97ec-027ff2717ef4
2020-03-31 15:30:45 +00:00
contact
5f94f2b629 Fix missing upstreamConn.closed initialization
Fixes: b33e5f29abbe ("Fix race condition in upstreamConn.Close")

git-svn-id: file:///srv/svn/repo/suika/trunk@186 f0ae65fe-ee39-954e-97ec-027ff2717ef4
2020-03-28 19:00:56 +00:00
contact
b487a7dff2 Use clientName to decide whether or not history should be sent
Closes: https://todo.sr.ht/~emersion/soju/31

git-svn-id: file:///srv/svn/repo/suika/trunk@185 f0ae65fe-ee39-954e-97ec-027ff2717ef4
2020-03-28 16:36:09 +00:00
contact
40efde6626 Remove downstreamConn.username
Replace it with downstreamConn.user.Username

git-svn-id: file:///srv/svn/repo/suika/trunk@184 f0ae65fe-ee39-954e-97ec-027ff2717ef4
2020-03-28 16:28:28 +00:00
contact
0e1223c13d Add downstreamConn.clientName
git-svn-id: file:///srv/svn/repo/suika/trunk@183 f0ae65fe-ee39-954e-97ec-027ff2717ef4
2020-03-28 16:25:48 +00:00
contact
ac7553c1fb Update password on NickServ SET PASSWORD message
git-svn-id: file:///srv/svn/repo/suika/trunk@182 f0ae65fe-ee39-954e-97ec-027ff2717ef4
2020-03-28 09:40:33 +00:00
contact
ec1777f84e s/List/LIST/ when referring to the command
git-svn-id: file:///srv/svn/repo/suika/trunk@181 f0ae65fe-ee39-954e-97ec-027ff2717ef4
2020-03-28 00:03:00 +00:00
contact
5396567c1b Document functions safe to call from any goroutine
git-svn-id: file:///srv/svn/repo/suika/trunk@180 f0ae65fe-ee39-954e-97ec-027ff2717ef4
2020-03-27 23:54:42 +00:00
contact
003b8f8ec6 Introduce eventUpstreamDisconnected
This allows us to perform cleanup actions in the user goroutine. This
removes the need for pendingLISTsLock.

git-svn-id: file:///srv/svn/repo/suika/trunk@179 f0ae65fe-ee39-954e-97ec-027ff2717ef4
2020-03-27 23:51:58 +00:00
delthas
3ac0e6bd4d Add support for bouncer logs
Add bouncer logs, in a network/channel/date.log format, in a similar
manner to ZNC log module. PRIVMSG, JOIN, PART, QUIT, MODE are logged.

Add a config directive for the logs file, including a way to disable
them entirely.

git-svn-id: file:///srv/svn/repo/suika/trunk@178 f0ae65fe-ee39-954e-97ec-027ff2717ef4
2020-03-27 23:07:20 +00:00
delthas
9aeb067b1b Add LIST support
This commit adds support for downstream LIST messages from multiple
concurrent downstreams to multiple concurrent upstreams, including
support for multiple pending LIST requests from the same downstream.

Because a unique RPL_LISTEND message must be sent to the requesting
downstream, and that there might be multiple upstreams, each sending
their own RPL_LISTEND, a cache of RPL_LISTEND replies of some sort is
required to match RPL_LISTEND together in order to only send one back
downstream.

This commit adds a list of "pending LIST" structs, which each contain a
map of all upstreams that yet need to send a RPL_LISTEND, and the
corresponding LIST request associated with that response. This list of
pending LISTs is sorted according to the order that the requesting
downstreams sent the LIST messages in. Each pending set also stores the
id of the requesting downstream, in order to only forward the replies to
it and no other downstream. (This is important because LIST replies can
typically amount to several thousands messages on large servers.)

When a single downstream makes multiple LIST requests, only the first
one will be immediately sent to the upstream servers. The next ones will
be buffered until the first one is completed. Distinct downstreams can
make concurrent LIST requests without any request buffering.

Each RPL_LIST message is forwarded to the downstream of the first
matching pending LIST struct.

When an upstream sends an RPL_LISTEND message, the upstream is removed
from the first matching pending LIST struct, but that message is not
immediately forwarded downstream. If there are no remaining pending LIST
requests in that struct is then empty, that means all upstreams have
sent back all their RPL_LISTEND replies (which means they also sent all
their RPL_LIST replies); so a unique RPL_LISTEND is sent to downstream
and that pending LIST set is removed from the cache.

Upstreams are removed from the pending LIST structs in two other cases:
- when they are closed (to avoid stalling because of a disconnected
upstream that will never reply to the LIST message): they are removed
from all pending LIST structs
- when they reply with an ERR_UNKNOWNCOMMAND or RPL_TRYAGAIN LIST reply,
which is typically used when a user is not allowed to LIST because they
just joined the server: they are removed from the first pending LIST
struct, as if an RPL_LISTEND message was received

git-svn-id: file:///srv/svn/repo/suika/trunk@177 f0ae65fe-ee39-954e-97ec-027ff2717ef4
2020-03-27 23:07:20 +00:00
delthas
f8dc7b05a1 Make upstream.SendMessageLabeled use an uint64 id
This commit is preparatory work for code that will call
SendMessageLabeled with a direct downstream id rather than a
downstreamConnection pointer.

git-svn-id: file:///srv/svn/repo/suika/trunk@176 f0ae65fe-ee39-954e-97ec-027ff2717ef4
2020-03-27 23:07:20 +00:00
contact
21656bbbc9 Fix race condition in upstreamConn.Close
upstreamConn.closed was a bool accessed from different goroutines. Use
the same pattern as downstreamConn instead.

git-svn-id: file:///srv/svn/repo/suika/trunk@175 f0ae65fe-ee39-954e-97ec-027ff2717ef4
2020-03-27 22:08:35 +00:00
delthas
559a13f249 Fix parsing wrong empty element in RPL_WHOISCHANNELS channel list
Some servers add a trailing space to the channel list in
RPL_WHOISCHANNELS. This commit works around this issue by removing any
empty trailing element after splitting.

Since RPL_WHOISCHANNELS could send an empty channel parameter, we can't
just use strings.TrimRight(s, " "), because splitting on an empty string
would still return an empty element.

Closes: https://todo.sr.ht/~emersion/soju/25

git-svn-id: file:///srv/svn/repo/suika/trunk@174 f0ae65fe-ee39-954e-97ec-027ff2717ef4
2020-03-27 21:53:21 +00:00
contact
a17e0acde2 Stop accessing user data in downstreamConn.authenticate
This becomes racy once user.Password is updated on-the-fly.

git-svn-id: file:///srv/svn/repo/suika/trunk@173 f0ae65fe-ee39-954e-97ec-027ff2717ef4
2020-03-27 21:38:38 +00:00
contact
ff41376348 Get rid of Server.downstreamConns
This is unused right now. Let's remove it, we'll add it back if we
really need it.

git-svn-id: file:///srv/svn/repo/suika/trunk@172 f0ae65fe-ee39-954e-97ec-027ff2717ef4
2020-03-27 21:24:12 +00:00
delthas
f81ecd67cf Marshal NOTICE user prefixes and channels
NOTICE messages can be both special messages from the server (with no
prefix nick), or regular PRIVMSG-like messages from users. This commit
adds support for marshaling channel and user prefixes in the latter
case.

git-svn-id: file:///srv/svn/repo/suika/trunk@171 f0ae65fe-ee39-954e-97ec-027ff2717ef4
2020-03-27 20:12:16 +00:00
contact
f61efcbe80 doc: add basic architecture document
git-svn-id: file:///srv/svn/repo/suika/trunk@170 f0ae65fe-ee39-954e-97ec-027ff2717ef4
2020-03-27 18:49:55 +00:00
contact
2e6e091858 Move man page to doc/
git-svn-id: file:///srv/svn/repo/suika/trunk@169 f0ae65fe-ee39-954e-97ec-027ff2717ef4
2020-03-27 18:23:41 +00:00
contact
d288ab6aad Nuke user.lock
Split user.register into two functions, one to make sure the user is
authenticated, the other to send our current state. This allows to get
rid of data races by doing the second part in the user goroutine.

Closes: https://todo.sr.ht/~emersion/soju/22

git-svn-id: file:///srv/svn/repo/suika/trunk@168 f0ae65fe-ee39-954e-97ec-027ff2717ef4
2020-03-27 18:17:58 +00:00
contact
520585d901 Add eventDownstreamDisconnected
This should remove the need for protecting user.downstreamConns with a
mutex.

git-svn-id: file:///srv/svn/repo/suika/trunk@167 f0ae65fe-ee39-954e-97ec-027ff2717ef4
2020-03-27 16:55:03 +00:00
contact
0def23b671 Add eventDownstreamConnected
In a later commit, we'll be able to move part of downstreamConn.register
into the user goroutine to prevent races.

References: https://todo.sr.ht/~emersion/soju/22

git-svn-id: file:///srv/svn/repo/suika/trunk@166 f0ae65fe-ee39-954e-97ec-027ff2717ef4
2020-03-27 16:21:05 +00:00
contact
f4631f5dd6 Introduce a user.events channel
This allows to easily add new events, and also guarantees ordering
between different event types.

git-svn-id: file:///srv/svn/repo/suika/trunk@165 f0ae65fe-ee39-954e-97ec-027ff2717ef4
2020-03-27 15:33:19 +00:00
delthas
43fd40bf31 Add downstream NOTICE support
git-svn-id: file:///srv/svn/repo/suika/trunk@164 f0ae65fe-ee39-954e-97ec-027ff2717ef4
2020-03-27 08:40:51 +00:00
delthas
fc905bc9ed Add downstream INVITE support
git-svn-id: file:///srv/svn/repo/suika/trunk@163 f0ae65fe-ee39-954e-97ec-027ff2717ef4
2020-03-26 21:43:48 +00:00
delthas
290366abfb Add upstream RPL_CREATIONTIME support
git-svn-id: file:///srv/svn/repo/suika/trunk@162 f0ae65fe-ee39-954e-97ec-027ff2717ef4
2020-03-26 21:33:44 +00:00
delthas
781dafad76 Fix capitalization of 'id'
Following the Go project source code guidelines, id is an abbreviation
and must typically be written as id or ID, not Id.

git-svn-id: file:///srv/svn/repo/suika/trunk@161 f0ae65fe-ee39-954e-97ec-027ff2717ef4
2020-03-26 21:28:13 +00:00
delthas
9ba13fd38b Add downstream TOPIC support
git-svn-id: file:///srv/svn/repo/suika/trunk@160 f0ae65fe-ee39-954e-97ec-027ff2717ef4
2020-03-26 21:27:46 +00:00
delthas
3318e3fbfe Add KICK support
Downstream and upstream message handling are slightly different because
downstreams can send KICK messages with multiple channels or users,
while upstreams can only send KICK messages with one channel and one
user (according to the RFC).

git-svn-id: file:///srv/svn/repo/suika/trunk@159 f0ae65fe-ee39-954e-97ec-027ff2717ef4
2020-03-25 23:15:26 +00:00
delthas
8a4a0173a4 Simplify error handling for downstream JOIN/PART
downstreamConnection.unmarshalEntity already returns an ircError of
command ERR_NOSUCHCHANNEL, so there's no need to explicitly return
another ircError of that type.

git-svn-id: file:///srv/svn/repo/suika/trunk@158 f0ae65fe-ee39-954e-97ec-027ff2717ef4
2020-03-25 23:12:53 +00:00