Changeset 730 in code

Timestamp:

Dec 1, 2021, 10:03:27 AM (4 years ago)

Author:

contact

Message:

Add "sasl status" command

Location:

trunk

Files:

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

trunk/doc/soju.1.scd

@@ -345 +345 @@
         currently used with the network.
 
+*sasl status* <network name>
+        Show current SASL status.
+
 *sasl set-plain* <network name> <username> <password>
         Set SASL PLAIN credentials.

trunk/service.go

@@ -242 +242 @@
                 "sasl": {
                         children: serviceCommandSet{
+                                "status": {
+                                        usage:  "<network name>",
+                                        desc:   "show SASL status",
+                                        handle: handleServiceSaslStatus,
+                                },
                                 "set-plain": {
                                         usage:  "<network name> <username> <password>",
@@ -685 +690 @@
 }
 
+func handleServiceSaslStatus(ctx context.Context, dc *downstreamConn, params []string) error {
+        if len(params) != 1 {
+                return fmt.Errorf("expected exactly one argument")
+        }
+
+        net := dc.user.getNetwork(params[0])
+        if net == nil {
+                return fmt.Errorf("unknown network %q", params[0])
+        }
+
+        switch net.SASL.Mechanism {
+        case "PLAIN":
+                sendServicePRIVMSG(dc, fmt.Sprintf("SASL PLAIN enabled with username %q", net.SASL.Plain.Username))
+        case "EXTERNAL":
+                sendServicePRIVMSG(dc, "SASL EXTERNAL (CertFP) enabled")
+        case "":
+                sendServicePRIVMSG(dc, "SASL is disabled")
+        }
+
+        if uc := net.conn; uc != nil {
+                if uc.account != "" {
+                        sendServicePRIVMSG(dc, fmt.Sprintf("Authenticated on upstream network with account %q", uc.account))
+                } else {
+                        sendServicePRIVMSG(dc, "Unauthenticated on upstream network")
+                }
+        } else {
+                sendServicePRIVMSG(dc, "Disconnected from upstream network")
+        }
+
+        return nil
+}
+
 func handleServiceSASLSetPlain(ctx context.Context, dc *downstreamConn, params []string) error {
         if len(params) != 3 {