Changeset 364 in code

Timestamp:

Jul 22, 2020, 10:20:52 AM (5 years ago)

Author:

contact

Message:

Rename certfp reset to sasl reset

And make it reset all SASL credentials.

Location:

trunk

Files:

• doc/soju.1.scd (modified) (1 diff)
• service.go (modified) (5 diffs)

trunk/doc/soju.1.scd

@@ -171 +171 @@
         currently used with the network.
 
-*certfp reset* <network name>
-        Disable SASL EXTERNAL authentication and remove stored certificate.
-
 *sasl set-plain* <network name> <username> <password>
         Set SASL PLAIN credentials.
+
+*sasl reset* <network name>
+        Disable SASL authentication and remove stored credentials.
 
 *user create* -username <username> -password <password> [-admin]

trunk/service.go

@@ -181 +181 @@
                                         handle: handleServiceCertfpFingerprints,
                                 },
-                                "reset": {
-                                        usage:  "<network name>",
-                                        desc:   "disable SASL EXTERNAL authentication and remove stored certificate",
-                                        handle: handleServiceCertfpReset,
-                                },
                         },
                 },
@@ -194 +189 @@
                                         desc:   "set SASL PLAIN credentials",
                                         handle: handleServiceSASLSetPlain,
+                                },
+                                "reset": {
+                                        usage:  "<network name>",
+                                        desc:   "disable SASL authentication and remove stored credentials",
+                                        handle: handleServiceSASLReset,
                                 },
                         },
@@ -574 +574 @@
 }
 
-func handleServiceCertfpReset(dc *downstreamConn, params []string) error {
-        if len(params) != 1 {
-                return fmt.Errorf("expected exactly one argument")
+func handleServiceSASLSetPlain(dc *downstreamConn, params []string) error {
+        if len(params) != 3 {
+                return fmt.Errorf("expected exactly 3 arguments")
         }
 
@@ -584 +584 @@
         }
 
-        net.SASL.External.CertBlob = nil
-        net.SASL.External.PrivKeyBlob = nil
-
-        if net.SASL.Mechanism == "EXTERNAL" {
-                net.SASL.Mechanism = ""
-        }
-        if err := dc.srv.db.StoreNetwork(dc.user.Username, &net.Network); err != nil {
-                return err
-        }
-
-        sendServicePRIVMSG(dc, "certificate reset")
-        return nil
-}
-
-func handleServiceSASLSetPlain(dc *downstreamConn, params []string) error {
-        if len(params) != 3 {
-                return fmt.Errorf("expected exactly 3 arguments")
+        net.SASL.Plain.Username = params[1]
+        net.SASL.Plain.Password = params[2]
+        net.SASL.Mechanism = "PLAIN"
+
+        if err := dc.srv.db.StoreNetwork(net.Username, &net.Network); err != nil {
+                return err
+        }
+
+        sendServicePRIVMSG(dc, "credentials saved")
+        return nil
+}
+
+func handleServiceSASLReset(dc *downstreamConn, params []string) error {
+        if len(params) != 1 {
+                return fmt.Errorf("expected exactly one argument")
         }
 
@@ -608 +606 @@
         }
 
-        net.SASL.Plain.Username = params[1]
-        net.SASL.Plain.Password = params[2]
-        net.SASL.Mechanism = "PLAIN"
-
-        if err := dc.srv.db.StoreNetwork(net.Username, &net.Network); err != nil {
-                return err
-        }
-
-        sendServicePRIVMSG(dc, "credentials saved")
+        net.SASL.Plain.Username = ""
+        net.SASL.Plain.Password = ""
+        net.SASL.External.CertBlob = nil
+        net.SASL.External.PrivKeyBlob = nil
+        net.SASL.Mechanism = ""
+
+        if err := dc.srv.db.StoreNetwork(dc.user.Username, &net.Network); err != nil {
+                return err
+        }
+
+        sendServicePRIVMSG(dc, "credentials reset")
         return nil
 }