Changeset 446a23e

Timestamp:

2016-03-23T06:44:13Z (8 years ago)

Author:

Dennis Kaarsemaker <dennis@…>

Branches:

master

Children:

8e6ecfe

Parents:

e41ba05

git-author:

Dennis Kaarsemaker <dennis@…> (22-02-16 20:25:39)

git-committer:

Dennis Kaarsemaker <dennis@…> (23-03-16 06:44:13)

Message:

Add a setting to disable 'account add'

In a locked down bitlbee instance it is useful to disable the 'account
add' command.

Files:

• bitlbee.conf (modified) (1 diff)
• conf.c (modified) (2 diffs)
• conf.h (modified) (1 diff)
• root_commands.c (modified) (1 diff)

bitlbee.conf

@@ -69 +69 @@
 ## or
 # OperPassword = md5:I0mnZbn1t4R731zzRdDN2/pK7lRX
+
+## AllowAccountAdd
+##
+## Whether to allow registered and identified users to add new accounts using
+## 'account add'
+##
+# AllowAccountAdd 1
 
 ## HostName

conf.c

@@ -57 +57 @@
         conf->auth_pass = NULL;
         conf->oper_pass = NULL;
+        conf->allow_account_add = 1;
         conf->configdir = g_strdup(CONFIG);
         conf->plugindir = g_strdup(PLUGINDIR);
@@ -246 +247 @@
                                 g_free(conf->oper_pass);
                                 conf->oper_pass = g_strdup(ini->value);
+                        } else if (g_strcasecmp(ini->key, "allowaccountadd") == 0) {
+                                if (!is_bool(ini->value)) {
+                                        fprintf(stderr, "Invalid %s value: %s\n", ini->key, ini->value);
+                                        return 0;
+                                }
+                                conf->allow_account_add = bool2int(ini->value);
                         } else if (g_strcasecmp(ini->key, "hostname") == 0) {
                                 g_free(conf->hostname);

conf.h

@@ -39 +39 @@
         char *auth_pass;
         char *oper_pass;
+        int allow_account_add;
         char *hostname;
         char *configdir;

root_commands.c

@@ -416 +416 @@
 
                 MIN_ARGS(3);
+
+                if (!global.conf->allow_account_add) {
+                        irc_rootmsg(irc, "This server does not allow adding new accounts");
+                        return;
+                }
 
                 if (cmd[4] == NULL) {