Changeset 91 in code for trunk

Timestamp:

Mar 12, 2020, 8:28:09 PM (5 years ago)

Author:

contact

Message:

Auto-save IRC networks

Location:

trunk

Files:

• README.md (modified) (1 diff)
• downstream.go (modified) (3 diffs)
• server.go (modified) (1 diff)

trunk/README.md

@@ -15 +15 @@
     go run ./cmd/jounce
 
+Then connect with username `jounce@chat.freenode.net` and join `#jounce`.
+
 ## Contributing
 

trunk/downstream.go

@@ -2 +2 @@
 
 import (
+        "crypto/tls"
         "fmt"
         "io"
         "net"
         "strings"
+        "time"
 
         "golang.org/x/crypto/bcrypt"
@@ -337 +339 @@
 }
 
+func sanityCheckServer(addr string) error {
+        dialer := net.Dialer{Timeout: 30 * time.Second}
+        conn, err := tls.DialWithDialer(&dialer, "tcp", addr, nil)
+        if err != nil {
+                return err
+        }
+        return conn.Close()
+}
+
 func (dc *downstreamConn) register() error {
         username := strings.TrimPrefix(dc.username, "~")
@@ -366 +377 @@
                 network = u.getNetwork(networkName)
                 if network == nil {
-                        dc.logger.Printf("failed registration: unknown network %q", networkName)
-                        dc.SendMessage(&irc.Message{
-                                Prefix:  dc.srv.prefix(),
-                                Command: irc.ERR_PASSWDMISMATCH,
-                                Params:  []string{"*", fmt.Sprintf("Unknown network %q", networkName)},
-                        })
-                        return nil
+                        addr := networkName
+                        if !strings.ContainsRune(addr, ':') {
+                                addr = addr + ":6697"
+                        }
+
+                        dc.logger.Printf("trying to connect to new upstream server %q", addr)
+                        if err := sanityCheckServer(addr); err != nil {
+                                dc.logger.Printf("failed to connect to %q: %v", addr, err)
+                                return ircError{&irc.Message{
+                                        Command: irc.ERR_PASSWDMISMATCH,
+                                        Params:  []string{"*", fmt.Sprintf("Failed to connect to %q", networkName)},
+                                }}
+                        }
+
+                        dc.logger.Printf("auto-adding network %q", networkName)
+                        network, err = u.createNetwork(networkName, dc.nick)
+                        if err != nil {
+                                return err
+                        }
                 }
         }

trunk/server.go

@@ -162 +162 @@
         }
         u.lock.Unlock()
+}
+
+func (u *user) createNetwork(addr, nick string) (*network, error) {
+        network := newNetwork(u, &Network{
+                Addr: addr,
+                Nick: nick,
+        })
+        err := u.srv.db.StoreNetwork(u.Username, &network.Network)
+        if err != nil {
+                return nil, err
+        }
+        u.lock.Lock()
+        u.networks = append(u.networks, network)
+        u.lock.Unlock()
+        go network.run()
+        return network, nil
 }