Add config keys for reserved names

lib/web/account.js

@@ -251,6 +251,18 @@ function handleNewChannel(req, res) {
             return;
         }
 
+        if (name.match(Config.get("reserved-names.channels"))) {
+            db.channels.listUserChannels(loginName, function (err2, channels) {
+                sendJade(res, "account-channels", {
+                    loggedIn: true,
+                    loginName: loginName,
+                    channels: err2 ? [] : channels,
+                    newChannelError: "That channel name is reserved"
+                });
+            });
+            return;
+        }
+
         db.channels.register(name, user.name, function (err, channel) {
             if (!err) {
                 Logger.eventlog.log("[channel] " + user.name + "@" +

lib/web/auth.js

@@ -12,6 +12,7 @@ var sendJade = require("./jade").sendJade;
 var Logger = require("../logger");
 var $util = require("../utilities");
 var db = require("../database");
+var Config = require("../config");
 
 /**
  * Processes a login request.  Sets a cookie upon successful authentication
@@ -168,6 +169,13 @@ function handleRegister(req, res) {
         return;
     }
 
+    if (name.match(Config.get("reserved-names.usernames"))) {
+        sendJade(res, "register", {
+            registerError: "That username is reserved"
+        });
+        return;
+    }
+
     if (password.length === 0) {
         sendJade(res, "register", {
             registerError: "Password must not be empty"