Changeset 328 in code for trunk

Timestamp:

Jun 8, 2020, 8:30:09 PM (5 years ago)

Author:

delthas

Message:

Add support for admin-restricted service commands

This is preparatory work for creating new users from a service command.

This adds support for specifying specific service commands as
admin-restricted. Only admin users can run these commands. These
commands won't show up in the help when run from a non-admin
user, unless the user is requesting help for that specific command.

File:

• trunk/service.go (modified) (6 diffs)

trunk/service.go

@@ -41 +41 @@
         handle   func(dc *downstreamConn, params []string) error
         children serviceCommandSet
+        admin    bool
 }
 
@@ -69 +70 @@
         if err != nil {
                 sendServicePRIVMSG(dc, fmt.Sprintf(`error: %v (type "help" for a list of commands)`, err))
+                return
+        }
+        if cmd.admin && !dc.user.Admin {
+                sendServicePRIVMSG(dc, fmt.Sprintf(`error: you must be an admin to use this command`))
                 return
         }
@@ -166 +171 @@
 }
 
-func appendServiceCommandSetHelp(cmds serviceCommandSet, prefix []string, l *[]string) {
+func appendServiceCommandSetHelp(cmds serviceCommandSet, prefix []string, admin bool, l *[]string) {
         for name, cmd := range cmds {
+                if cmd.admin && !admin {
+                        continue
+                }
                 words := append(prefix, name)
                 if len(cmd.children) == 0 {
@@ -173 +181 @@
                         *l = append(*l, s)
                 } else {
-                        appendServiceCommandSetHelp(cmd.children, words, l)
+                        appendServiceCommandSetHelp(cmd.children, words, admin, l)
                 }
         }
@@ -188 +196 @@
                 if len(cmd.children) > 0 {
                         var l []string
-                        appendServiceCommandSetHelp(cmd.children, words, &l)
+                        appendServiceCommandSetHelp(cmd.children, words, dc.user.Admin, &l)
                         sendServicePRIVMSG(dc, "available commands: "+strings.Join(l, ", "))
                 } else {
@@ -201 +209 @@
         } else {
                 var l []string
-                appendServiceCommandSetHelp(serviceCommands, nil, &l)
+                appendServiceCommandSetHelp(serviceCommands, nil, dc.user.Admin, &l)
                 sendServicePRIVMSG(dc, "available commands: "+strings.Join(l, ", "))
         }