Changeset 484 in code for trunk/downstream.go

Timestamp:

Mar 29, 2021, 3:07:39 PM (4 years ago)

Author:

contact

Message:

Ensure targets are case-mapped before being passed to messageStore

messageStore isn't aware of the network's case-mapping. We need
to canonicalize the names before passing them to messageStore.

File:

• trunk/downstream.go (modified) (2 diffs)

trunk/downstream.go

@@ -1002 +1002 @@
 
                 // Fast-forward history to last message
-                for target, entry := range net.delivered.innerMap {
+                for targetCM, entry := range net.delivered.innerMap {
                         delivered := entry.value.(deliveredClientMap)
-                        ch := net.channels.Value(target)
+                        ch := net.channels.Value(targetCM)
                         if ch != nil && ch.Detached {
                                 continue
                         }
 
-                        lastID, err := dc.user.msgStore.LastMsgID(net, target, time.Now())
+                        lastID, err := dc.user.msgStore.LastMsgID(net, targetCM, time.Now())
                         if err != nil {
                                 dc.logger.Printf("failed to get last message ID: %v", err)
@@ -1059 +1059 @@
 
         limit := 4000
-        history, err := dc.user.msgStore.LoadLatestID(net, target, lastDelivered, limit)
+        targetCM := net.casemap(target)
+        history, err := dc.user.msgStore.LoadLatestID(net, targetCM, lastDelivered, limit)
         if err != nil {
                 dc.logger.Printf("failed to send implicit history for %q: %v", target, err)