Changeset 307 in code for trunk/db.go

Timestamp:

Jun 2, 2020, 9:24:22 AM (5 years ago)

Author:

fox.cpp

Message:

Implement upstream SASL EXTERNAL support

Closes: ​https://todo.sr.ht/~emersion/soju/47

File:

• trunk/db.go (modified) (7 diffs)

trunk/db.go

@@ -21 +21 @@
                 Username string
                 Password string
+        }
+
+        // TLS client certificate authentication.
+        External struct {
+                // X.509 certificate in DER form.
+                CertBlob []byte
+                // PKCS#8 private key in DER form.
+                PrivKeyBlob []byte
         }
 }
@@ -69 +77 @@
         sasl_plain_username VARCHAR(255),
         sasl_plain_password VARCHAR(255),
+        sasl_external_cert BLOB DEFAULT NULL,
+        sasl_external_key BLOB DEFAULT NULL,
         FOREIGN KEY(user) REFERENCES User(username),
         UNIQUE(user, addr, nick)
@@ -88 +98 @@
         "ALTER TABLE Network ADD COLUMN connect_commands VARCHAR(1023)",
         "ALTER TABLE Channel ADD COLUMN detached INTEGER NOT NULL DEFAULT 0",
+        "ALTER TABLE Network ADD COLUMN sasl_external_cert BLOB DEFAULT NULL",
+        "ALTER TABLE Network ADD COLUMN sasl_external_key BLOB DEFAULT NULL",
 }
 
@@ -239 +251 @@
 
         rows, err := db.db.Query(`SELECT id, name, addr, nick, username, realname, pass,
-                        connect_commands, sasl_mechanism, sasl_plain_username, sasl_plain_password
+                        connect_commands, sasl_mechanism, sasl_plain_username, sasl_plain_password,
+                        sasl_external_cert, sasl_external_key
                 FROM Network
                 WHERE user = ?`,
@@ -254 +267 @@
                 var saslMechanism, saslPlainUsername, saslPlainPassword *string
                 err := rows.Scan(&net.ID, &name, &net.Addr, &net.Nick, &username, &realname,
-                        &pass, &connectCommands, &saslMechanism, &saslPlainUsername, &saslPlainPassword)
+                        &pass, &connectCommands, &saslMechanism, &saslPlainUsername, &saslPlainPassword,
+                        &net.SASL.External.CertBlob, &net.SASL.External.PrivKeyBlob)
                 if err != nil {
                         return nil, err
@@ -294 +308 @@
                         saslPlainUsername = toStringPtr(network.SASL.Plain.Username)
                         saslPlainPassword = toStringPtr(network.SASL.Plain.Password)
+                        network.SASL.External.CertBlob = nil
+                        network.SASL.External.PrivKeyBlob = nil
+                case "EXTERNAL":
+                        // keep saslPlain* nil
                 default:
                         return fmt.Errorf("soju: cannot store network: unsupported SASL mechanism %q", network.SASL.Mechanism)
@@ -303 +321 @@
                 _, err = db.db.Exec(`UPDATE Network
                         SET name = ?, addr = ?, nick = ?, username = ?, realname = ?, pass = ?, connect_commands = ?,
-                                sasl_mechanism = ?, sasl_plain_username = ?, sasl_plain_password = ?
+                                sasl_mechanism = ?, sasl_plain_username = ?, sasl_plain_password = ?,
+                                sasl_external_cert = ?, sasl_external_key = ?
                         WHERE id = ?`,
                         netName, network.Addr, network.Nick, netUsername, realname, pass, connectCommands,
-                        saslMechanism, saslPlainUsername, saslPlainPassword, network.ID)
+                        saslMechanism, saslPlainUsername, saslPlainPassword,
+                        network.SASL.External.CertBlob, network.SASL.External.PrivKeyBlob,
+                        network.ID)
         } else {
                 var res sql.Result
                 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)
-                        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+                                sasl_plain_password, sasl_external_cert, sasl_external_key)
+                        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
                         username, netName, network.Addr, network.Nick, netUsername, realname, pass, connectCommands,
-                        saslMechanism, saslPlainUsername, saslPlainPassword)
+                        saslMechanism, saslPlainUsername, saslPlainPassword, network.SASL.External.CertBlob,
+                        network.SASL.External.PrivKeyBlob)
                 if err != nil {
                         return err