Changeset 563 in code

Timestamp:

Jun 23, 2021, 5:23:09 PM (4 years ago)

Author:

contact

Message:

Allow admins to broadcast message to all bouncer users

Typically done via:

/notice $<bouncer> <message>

Or, for a connection not bound to a specific network:

/notice $* <message>

The message is broadcast as BouncerServ, because that's the only
user that can be trusted to belong to the bouncer by users. Any
other prefix would conflict with the upstream network.

Location:

trunk

Files:

• downstream.go (modified) (1 diff)
• server.go (modified) (1 diff)
• upstream.go (modified) (1 diff)
• user.go (modified) (2 diffs)

trunk/downstream.go

@@ -1914 +1914 @@
 
                 for _, name := range strings.Split(targetsStr, ",") {
+                        if name == "$"+dc.srv.Hostname || (name == "$*" && dc.network == nil) {
+                                // "$" means a server mask follows. If it's the bouncer's
+                                // hostname, broadcast the message to all bouncer users.
+                                if !dc.user.Admin {
+                                        return ircError{&irc.Message{
+                                                Prefix:  dc.srv.prefix(),
+                                                Command: irc.ERR_BADMASK,
+                                                Params:  []string{dc.nick, name, "Permission denied to broadcast message to all bouncer users"},
+                                        }}
+                                }
+
+                                dc.logger.Printf("broadcasting bouncer-wide %v: %v", msg.Command, text)
+
+                                broadcastTags := tags.Copy()
+                                broadcastTags["time"] = irc.TagValue(time.Now().UTC().Format(serverTimeLayout))
+                                broadcastMsg := &irc.Message{
+                                        Tags:    broadcastTags,
+                                        Prefix:  servicePrefix,
+                                        Command: msg.Command,
+                                        Params:  []string{name, text},
+                                }
+                                dc.srv.forEachUser(func(u *user) {
+                                        u.events <- eventBroadcast{broadcastMsg}
+                                })
+                                continue
+                        }
+
                         if dc.network == nil && casemapASCII(name) == dc.nickCM {
                                 dc.SendMessage(msg)

trunk/server.go

@@ -125 +125 @@
 }
 
+func (s *Server) forEachUser(f func(*user)) {
+        s.lock.Lock()
+        for _, u := range s.users {
+                f(u)
+        }
+        s.lock.Unlock()
+}
+
 func (s *Server) getUser(name string) *user {
         s.lock.Lock()

trunk/upstream.go

@@ -1769 +1769 @@
         }
 
+        // Don't store messages with a server mask target
+        if strings.HasPrefix(entity, "$") {
+                return ""
+        }
+
         entityCM := uc.network.casemap(entity)
         if entityCM == "nickserv" {

trunk/user.go

@@ -52 +52 @@
         uc   *upstreamConn
         name string
+}
+
+type eventBroadcast struct {
+        msg *irc.Message
 }
 
@@ -634 +638 @@
                                 dc.Close()
                         }
+                case eventBroadcast:
+                        msg := e.msg
+                        u.forEachDownstream(func(dc *downstreamConn) {
+                                dc.SendMessage(msg)
+                        })
                 case eventStop:
                         u.forEachDownstream(func(dc *downstreamConn) {