Changeset 478 in code for trunk/user.go

Timestamp:

Mar 24, 2021, 5:15:52 PM (4 years ago)

Author:

hubert

Message:

Implement casemapping

TL;DR: supports for casemapping, now logs are saved in
casemapped/canonical/tolower form
(eg. in the #channel directory instead of #Channel... or something)

What is casemapping?

see <​https://modern.ircdocs.horse/#casemapping-parameter>

Casemapping and multi-upstream

Since each upstream does not necessarily use the same casemapping, and
since casemappings cannot coexist [0],

1. soju must also update the database accordingly to upstreams' casemapping, otherwise it will end up inconsistent,
2. soju must "normalize" entity names and expose only one casemapping that is a subset of all supported casemappings (here, ascii).

[0] On some upstreams, "emersion[m]" and "emersion{m}" refer to the same
user (upstreams that advertise rfc1459 for example), while on others
(upstreams that advertise ascii) they don't.

Once upstream's casemapping is known (default to rfc1459), entity names
in map keys are made into casemapped form, for upstreamConn,
upstreamChannel and network.

downstreamConn advertises "CASEMAPPING=ascii", and always casemap map
keys with ascii.

Some functions require the caller to casemap their argument (to avoid
needless calls to casemapping functions).

Message forwarding and casemapping

downstream message handling (joins and parts basically):
When relaying entity names from downstreams to upstreams, soju uses the
upstream casemapping, in order to not get in the way of the user. This
does not brings any issue, as long as soju replies with the ascii
casemapping in mind (solves point 1.).

marshalEntity/marshalUserPrefix:
When relaying entity names from upstreams with non-ascii casemappings,
soju *partially* casemap them: it only change the case of characters
which are not ascii letters. ASCII case is thus kept intact, while
special symbols like []{} are the same every time soju sends them to
downstreams (solves point 2.).

Casemapping changes

Casemapping changes are not fully supported by this patch and will
result in loss of history. This is a limitation of the protocol and
should be solved by the RENAME spec.

File:

• trunk/user.go (modified) (9 diffs)

trunk/user.go

@@ -62 +62 @@
 
         conn           *upstreamConn
-        channels       map[string]*Channel
-        delivered      map[string]map[string]string // entity -> client name -> msg ID
-        offlineClients map[string]struct{}          // indexed by client name
+        channels       channelCasemapMap
+        delivered      mapStringStringCasemapMap // entity -> client name -> msg ID
+        offlineClients map[string]struct{}       // indexed by client name
         lastError      error
+        casemap        casemapping
 }
 
 func newNetwork(user *user, record *Network, channels []Channel) *network {
-        m := make(map[string]*Channel, len(channels))
+        m := channelCasemapMap{newCasemapMap(0)}
         for _, ch := range channels {
                 ch := ch
-                m[ch.Name] = &ch
+                m.SetValue(ch.Name, &ch)
         }
 
@@ -80 +81 @@
                 stopped:        make(chan struct{}),
                 channels:       m,
-                delivered:      make(map[string]map[string]string),
+                delivered:      mapStringStringCasemapMap{newCasemapMap(0)},
                 offlineClients: make(map[string]struct{}),
+                casemap:        casemapRFC1459,
         }
 }
@@ -186 +188 @@
 
         if net.conn != nil {
-                if uch, ok := net.conn.channels[ch.Name]; ok {
+                uch := net.conn.channels.Value(ch.Name)
+                if uch != nil {
                         uch.updateAutoDetach(0)
                 }
@@ -211 +214 @@
         var uch *upstreamChannel
         if net.conn != nil {
-                uch = net.conn.channels[ch.Name]
+                uch = net.conn.channels.Value(ch.Name)
 
                 net.conn.updateChannelAutoDetach(ch.Name)
@@ -232 +235 @@
 
 func (net *network) deleteChannel(name string) error {
-        ch, ok := net.channels[name]
-        if !ok {
+        ch := net.channels.Value(name)
+        if ch == nil {
                 return fmt.Errorf("unknown channel %q", name)
         }
         if net.conn != nil {
-                if uch, ok := net.conn.channels[ch.Name]; ok {
+                uch := net.conn.channels.Value(ch.Name)
+                if uch != nil {
                         uch.updateAutoDetach(0)
                 }
@@ -245 +249 @@
                 return err
         }
-        delete(net.channels, name)
+        net.channels.Delete(name)
         return nil
+}
+
+func (net *network) updateCasemapping(newCasemap casemapping) {
+        net.casemap = newCasemap
+        net.channels.SetCasemapping(newCasemap)
+        net.delivered.SetCasemapping(newCasemap)
+        if net.conn != nil {
+                net.conn.channels.SetCasemapping(newCasemap)
+                for _, entry := range net.conn.channels.innerMap {
+                        uch := entry.value.(*upstreamChannel)
+                        uch.Members.SetCasemapping(newCasemap)
+                }
+        }
 }
 
@@ -411 +428 @@
                 case eventChannelDetach:
                         uc, name := e.uc, e.name
-                        c, ok := uc.network.channels[name]
-                        if !ok || c.Detached {
+                        c := uc.network.channels.Value(name)
+                        if c == nil || c.Detached {
                                 continue
                         }
@@ -500 +517 @@
         uc.endPendingLISTs(true)
 
-        for _, uch := range uc.channels {
+        for _, entry := range uc.channels.innerMap {
+                uch := entry.value.(*upstreamChannel)
                 uch.updateAutoDetach(0)
         }
@@ -571 +589 @@
         // Most network changes require us to re-connect to the upstream server
 
-        channels := make([]Channel, 0, len(network.channels))
-        for _, ch := range network.channels {
+        channels := make([]Channel, 0, network.channels.Len())
+        for _, entry := range network.channels.innerMap {
+                ch := entry.value.(*Channel)
                 channels = append(channels, *ch)
         }