Changeset 542 in code

Timestamp:

May 26, 2021, 8:51:02 AM (4 years ago)

Author:

contact

Message:

Allow networks to be disabled

Location:

trunk

Files:

• contrib/znc-import.go (modified) (1 diff)
• db.go (modified) (1 diff)
• db_sqlite.go (modified) (6 diffs)
• doc/soju.1.scd (modified) (1 diff)
• downstream.go (modified) (2 diffs)
• service.go (modified) (8 diffs)
• user.go (modified) (1 diff)

trunk/contrib/znc-import.go

@@ -182 +182 @@
                         n.Realname = netRealname
                         n.Pass = pass
+                        n.Enabled = section.Values.Get("IRCConnectEnabled") != "false"
 
                         if err := db.StoreNetwork(userID, n); err != nil {

trunk/db.go

@@ -61 +61 @@
         ConnectCommands []string
         SASL            SASL
+        Enabled         bool
 }
 

trunk/db_sqlite.go

@@ -35 +35 @@
         sasl_external_cert BLOB DEFAULT NULL,
         sasl_external_key BLOB DEFAULT NULL,
+        enabled INTEGER NOT NULL DEFAULT 1,
         FOREIGN KEY(user) REFERENCES User(id),
         UNIQUE(user, addr, nick),
@@ -132 +133 @@
         `,
         "ALTER TABLE Channel ADD COLUMN detached_internal_msgid VARCHAR(255)",
+        "ALTER TABLE Network ADD COLUMN enabled INTEGER NOT NULL DEFAULT 1",
 }
 
@@ -313 +315 @@
         rows, err := db.db.Query(`SELECT id, name, addr, nick, username, realname, pass,
                         connect_commands, sasl_mechanism, sasl_plain_username, sasl_plain_password,
-                        sasl_external_cert, sasl_external_key
+                        sasl_external_cert, sasl_external_key, enabled
                 FROM Network
                 WHERE user = ?`,
@@ -329 +331 @@
                 err := rows.Scan(&net.ID, &name, &net.Addr, &net.Nick, &username, &realname,
                         &pass, &connectCommands, &saslMechanism, &saslPlainUsername, &saslPlainPassword,
-                        &net.SASL.External.CertBlob, &net.SASL.External.PrivKeyBlob)
+                        &net.SASL.External.CertBlob, &net.SASL.External.PrivKeyBlob, &net.Enabled)
                 if err != nil {
                         return nil, err
@@ -383 +385 @@
                         SET name = ?, addr = ?, nick = ?, username = ?, realname = ?, pass = ?, connect_commands = ?,
                                 sasl_mechanism = ?, sasl_plain_username = ?, sasl_plain_password = ?,
-                                sasl_external_cert = ?, sasl_external_key = ?
+                                sasl_external_cert = ?, sasl_external_key = ?, enabled = ?
                         WHERE id = ?`,
                         netName, network.Addr, network.Nick, netUsername, realname, pass, connectCommands,
                         saslMechanism, saslPlainUsername, saslPlainPassword,
-                        network.SASL.External.CertBlob, network.SASL.External.PrivKeyBlob,
+                        network.SASL.External.CertBlob, network.SASL.External.PrivKeyBlob, network.Enabled,
                         network.ID)
         } else {
@@ -393 +395 @@
                 res, err = db.db.Exec(`INSERT INTO Network(user, name, addr, nick, username,
                                 realname, pass, connect_commands, sasl_mechanism, sasl_plain_username,
-                                sasl_plain_password, sasl_external_cert, sasl_external_key)
-                        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+                                sasl_plain_password, sasl_external_cert, sasl_external_key, enabled)
+                        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
                         userID, netName, network.Addr, network.Nick, netUsername, realname, pass, connectCommands,
                         saslMechanism, saslPlainUsername, saslPlainPassword, network.SASL.External.CertBlob,
-                        network.SASL.External.PrivKeyBlob)
+                        network.SASL.External.PrivKeyBlob, network.Enabled)
                 if err != nil {
                         return err

trunk/doc/soju.1.scd

@@ -159 +159 @@
                 is used.
 
+        *-enabled* true|false
+                Enable or disable the network. If the network is disabled, the bouncer
+                won't connect to it. By default, the network is enabled.
+
         *-connect-command* <command>
                 Send the specified command as a raw IRC message right after connecting

trunk/downstream.go

@@ -1002 +1002 @@
                 var err error
                 network, err = dc.user.createNetwork(&Network{
-                        Addr: dc.networkName,
-                        Nick: nick,
+                        Addr:    dc.networkName,
+                        Nick:    nick,
+                        Enabled: true,
                 })
                 if err != nil {
@@ -2175 +2176 @@
                                 Realname: realname,
                                 Pass:     pass,
+                                Enabled:  true,
                         }
                         network, err := dc.user.createNetwork(record)

trunk/service.go

@@ -19 +19 @@
         "math/big"
         "sort"
+        "strconv"
         "strings"
         "time"
@@ -150 +151 @@
                         children: serviceCommandSet{
                                 "create": {
-                                        usage:  "-addr <addr> [-name name] [-username username] [-pass pass] [-realname realname] [-nick nick] [-connect-command command]...",
+                                        usage:  "-addr <addr> [-name name] [-username username] [-pass pass] [-realname realname] [-nick nick] [-enabled enabled] [-connect-command command]...",
                                         desc:   "add a new network",
                                         handle: handleServiceNetworkCreate,
@@ -159 +160 @@
                                 },
                                 "update": {
-                                        usage:  "<name> [-addr addr] [-name name] [-username username] [-pass pass] [-realname realname] [-nick nick] [-connect-command command]...",
+                                        usage:  "<name> [-addr addr] [-name name] [-username username] [-pass pass] [-realname realname] [-nick nick] [-enabled enabled] [-connect-command command]...",
                                         desc:   "update a network",
                                         handle: handleServiceNetworkUpdate,
@@ -318 +319 @@
 }
 
+type boolPtrFlag struct {
+        ptr **bool
+}
+
+func (f boolPtrFlag) String() string {
+        if f.ptr == nil || *f.ptr == nil {
+                return "<nil>"
+        }
+        return strconv.FormatBool(**f.ptr)
+}
+
+func (f boolPtrFlag) Set(s string) error {
+        v, err := strconv.ParseBool(s)
+        if err != nil {
+                return err
+        }
+        *f.ptr = &v
+        return nil
+}
+
 type networkFlagSet struct {
         *flag.FlagSet
         Addr, Name, Nick, Username, Pass, Realname *string
+        Enabled                                    *bool
         ConnectCommands                            []string
 }
@@ -332 +354 @@
         fs.Var(stringPtrFlag{&fs.Pass}, "pass", "")
         fs.Var(stringPtrFlag{&fs.Realname}, "realname", "")
+        fs.Var(boolPtrFlag{&fs.Enabled}, "enabled", "")
         fs.Var((*stringSliceFlag)(&fs.ConnectCommands), "connect-command", "")
         return fs
@@ -362 +385 @@
         if fs.Realname != nil {
                 network.Realname = *fs.Realname
+        }
+        if fs.Enabled != nil {
+                network.Enabled = *fs.Enabled
         }
         if fs.ConnectCommands != nil {
@@ -389 +415 @@
 
         record := &Network{
-                Addr: *fs.Addr,
-                Nick: dc.nick,
+                Addr:    *fs.Addr,
+                Nick:    dc.nick,
+                Enabled: true,
         }
         if err := fs.update(record); err != nil {
@@ -416 +443 @@
                         }
                         details = fmt.Sprintf("%v channels", uc.channels.Len())
+                } else if !net.Enabled {
+                        statuses = append(statuses, "disabled")
                 } else {
                         statuses = append(statuses, "disconnected")

trunk/user.go

@@ -173 +173 @@
 
 func (net *network) run() {
+        if !net.Enabled {
+                return
+        }
+
         var lastTry time.Time
         for {