Changeset 174 in code for trunk/upstream.go

Timestamp:

Mar 27, 2020, 9:53:21 PM (5 years ago)

Author:

delthas

Message:

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

File:

• trunk/upstream.go (modified) (5 diffs)

trunk/upstream.go

@@ -822 +822 @@
                         return err
                 }
-                members = strings.TrimRight(members, " ")
 
                 ch, ok := uc.channels[name]
@@ -829 +828 @@
                         uc.forEachDownstreamByID(downstreamID, func(dc *downstreamConn) {
                                 channel := dc.marshalChannel(uc, name)
-                                members := strings.Split(members, " ")
+                                members := splitSpace(members)
                                 for i, member := range members {
                                         membership, nick := uc.parseMembershipPrefix(member)
@@ -851 +850 @@
                 ch.Status = status
 
-                for _, s := range strings.Split(members, " ") {
+                for _, s := range splitSpace(members) {
                         membership, nick := uc.parseMembershipPrefix(s)
                         ch.Members[nick] = membership
@@ -996 +995 @@
                         return err
                 }
-                channels := strings.Split(channelList, " ")
+                channels := splitSpace(channelList)
 
                 uc.forEachDownstreamByID(downstreamID, func(dc *downstreamConn) {
@@ -1095 +1094 @@
 }
 
+func splitSpace(s string) []string {
+        return strings.FieldsFunc(s, func(r rune) bool {
+                return r == ' '
+        })
+}
+
 func (uc *upstreamConn) register() {
         uc.nick = uc.network.Nick