Changeset 73 in code for trunk

Timestamp:

Mar 4, 2020, 2:44:13 PM (5 years ago)

Author:

contact

Message:

Allow clients to specify an upstream name in their username

Location:

trunk

Files:

• downstream.go (modified) (8 diffs)
• server.go (modified) (2 diffs)
• upstream.go (modified) (5 diffs)

trunk/downstream.go

@@ -59 +59 @@
         username   string
         realname   string
+        upstream   *Upstream
 }
 
@@ -98 +99 @@
 }
 
+func (dc *downstreamConn) forEachUpstream(f func(*upstreamConn)) {
+        dc.user.forEachUpstream(func(uc *upstreamConn) {
+                if dc.upstream != nil && uc.upstream != dc.upstream {
+                        return
+                }
+                f(uc)
+        })
+}
+
 func (dc *downstreamConn) unmarshalChannel(name string) (*upstreamConn, string, error) {
-        // TODO: extract network name from channel name
-        ch, err := dc.user.getChannel(name)
-        if err != nil {
-                return nil, "", err
-        }
-        return ch.conn, ch.Name, nil
+        // TODO: extract network name from channel name if dc.upstream == nil
+        var channel *upstreamChannel
+        var err error
+        dc.forEachUpstream(func(uc *upstreamConn) {
+                if err != nil {
+                        return
+                }
+                if ch, ok := uc.channels[name]; ok {
+                        if channel != nil {
+                                err = fmt.Errorf("ambiguous channel name %q", name)
+                        } else {
+                                channel = ch
+                        }
+                }
+        })
+        if channel == nil {
+                return nil, "", ircError{&irc.Message{
+                        Command: irc.ERR_NOSUCHCHANNEL,
+                        Params:  []string{name, "No such channel"},
+                }}
+        }
+        return channel.conn, channel.Name, nil
 }
 
@@ -275 +301 @@
 
 func (dc *downstreamConn) register() error {
-        u := dc.srv.getUser(strings.TrimPrefix(dc.username, "~"))
+        username := strings.TrimPrefix(dc.username, "~")
+        var network string
+        if i := strings.LastIndexAny(username, "/@"); i >= 0 {
+                network = username[i+1:]
+        }
+        if i := strings.IndexAny(username, "/@"); i >= 0 {
+                username = username[:i]
+        }
+
+        u := dc.srv.getUser(username)
         if u == nil {
-                dc.logger.Printf("failed authentication: unknown username %q", dc.username)
+                dc.logger.Printf("failed authentication: unknown username %q", username)
                 dc.SendMessage(&irc.Message{
                         Prefix:  dc.srv.prefix(),
@@ -286 +321 @@
         }
 
+        if network != "" {
+                dc.upstream = dc.srv.getUpstream(network)
+                if dc.upstream == nil {
+                        dc.logger.Printf("failed registration: unknown upstream %q", network)
+                        dc.SendMessage(&irc.Message{
+                                Prefix:  dc.srv.prefix(),
+                                Command: irc.ERR_PASSWDMISMATCH,
+                                Params:  []string{"*", fmt.Sprintf("Unknown upstream server %q", network)},
+                        })
+                        return nil
+                }
+        }
+
         dc.registered = true
         dc.user = u
@@ -320 +368 @@
         })
 
-        u.forEachUpstream(func(uc *upstreamConn) {
+        dc.forEachUpstream(func(uc *upstreamConn) {
                 // TODO: fix races accessing upstream connection data
                 for _, ch := range uc.channels {
@@ -328 +376 @@
                 }
 
-                // TODO: let clients specify the ring buffer name in their username
-                historyName := ""
+                historyName := dc.username
 
                 var seqPtr *uint64
@@ -377 +424 @@
                 }}
         case "NICK":
-                dc.user.forEachUpstream(func(uc *upstreamConn) {
+                dc.forEachUpstream(func(uc *upstreamConn) {
                         uc.SendMessage(msg)
                 })
@@ -449 +496 @@
 
                         if modeStr != "" {
-                                dc.user.forEachUpstream(func(uc *upstreamConn) {
+                                dc.forEachUpstream(func(uc *upstreamConn) {
                                         uc.SendMessage(&irc.Message{
                                                 Command: "MODE",

trunk/server.go

@@ -83 +83 @@
 }
 
-func (u *user) getChannel(name string) (*upstreamChannel, error) {
+func (u *user) getChannel(name string, upstream *Upstream) (*upstreamChannel, error) {
         var channel *upstreamChannel
         var err error
         u.forEachUpstream(func(uc *upstreamConn) {
                 if err != nil {
+                        return
+                }
+                if upstream != nil && uc.upstream != upstream {
                         return
                 }
@@ -197 +200 @@
 }
 
+func (s *Server) getUpstream(name string) *Upstream {
+        for i, upstream := range s.Upstreams {
+                if upstream.Addr == name {
+                        return &s.Upstreams[i]
+                }
+        }
+        return nil
+}
+
 func (s *Server) Serve(ln net.Listener) error {
         for {

trunk/upstream.go

@@ -101 +101 @@
 }
 
+func (uc *upstreamConn) forEachDownstream(f func(*downstreamConn)) {
+        uc.user.forEachDownstream(func(dc *downstreamConn) {
+                if dc.upstream != nil && dc.upstream != uc.upstream {
+                        return
+                }
+                f(dc)
+        })
+}
+
 func (uc *upstreamConn) getChannel(name string) (*upstreamChannel, error) {
         ch, ok := uc.channels[name]
@@ -141 +150 @@
                         }
 
-                        uc.user.forEachDownstream(func(dc *downstreamConn) {
+                        uc.forEachDownstream(func(dc *downstreamConn) {
                                 dc.SendMessage(&irc.Message{
                                         Prefix:  dc.marshalUserPrefix(uc, msg.Prefix),
@@ -211 +220 @@
                         }
 
-                        uc.user.forEachDownstream(func(dc *downstreamConn) {
+                        uc.forEachDownstream(func(dc *downstreamConn) {
                                 dc.SendMessage(&irc.Message{
                                         Prefix:  dc.marshalUserPrefix(uc, msg.Prefix),
@@ -241 +250 @@
                         }
 
-                        uc.user.forEachDownstream(func(dc *downstreamConn) {
+                        uc.forEachDownstream(func(dc *downstreamConn) {
                                 dc.SendMessage(&irc.Message{
                                         Prefix:  dc.marshalUserPrefix(uc, msg.Prefix),
@@ -327 +336 @@
                 ch.complete = true
 
-                uc.user.forEachDownstream(func(dc *downstreamConn) {
+                uc.forEachDownstream(func(dc *downstreamConn) {
                         forwardChannel(dc, ch)
                 })