Changeset 197 in code for trunk

Timestamp:

Apr 1, 2020, 10:14:36 AM (5 years ago)

Author:

contact

Message:

Only set network.conn when registered

Location:

trunk

Files:

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

trunk/upstream.go

@@ -1327 +1327 @@
 }
 
+func (uc *upstreamConn) runUntilRegistered() error {
+        for !uc.registered {
+                msg, err := uc.irc.ReadMessage()
+                if err != nil {
+                        return fmt.Errorf("failed to read message: %v", err)
+                }
+
+                if uc.srv.Debug {
+                        uc.logger.Printf("received: %v", msg)
+                }
+
+                if err := uc.handleMessage(msg); err != nil {
+                        return fmt.Errorf("failed to handle message %q: %v", msg, err)
+                }
+        }
+
+        return nil
+}
+
 func (uc *upstreamConn) requestSASL() bool {
         if uc.network.SASL.Mechanism == "" {

trunk/user.go

@@ -72 +72 @@
 
                 uc.register()
-
-                // TODO: wait for the connection to be registered before adding it to
-                // net, otherwise messages might be sent to it while still being
-                // unauthenticated
+                if err := uc.runUntilRegistered(); err != nil {
+                        uc.logger.Printf("failed to register: %v", err)
+                        uc.Close()
+                        continue
+                }
+
                 net.lock.Lock()
                 net.conn = uc
@@ -135 +137 @@
         for _, network := range u.networks {
                 uc := network.upstream()
-                if uc == nil || !uc.registered {
+                if uc == nil {
                         continue
                 }