Passphrases are supported (they are completely optional.)

supernovus · Aug 3, 2011 · f0c04f2 · f0c04f2
1 parent 07aaebe
commit f0c04f2
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 18 deletions.
diff --git a/README b/README
@@ -18,7 +18,7 @@ you can say "oh". That said, it works, in a limited sort of way.
  * Basic navigation ("go north" or "n")
  * Mixins
  * Basic world config
- * Login based users (no passwords yet though.)
+ * Login based users (with optional passphrases.)
  * Simple permissions (build, admin, etc.)
  * Built-in default god user (cannot be killed, can always grant, etc.)
 
@@ -28,10 +28,15 @@ you can say "oh". That said, it works, in a limited sort of way.
  * Inventory
  * Light / Visibility
  * Stats
- * Passwords
  * Persistence (saving Rooms and Clients to disk.)
+ * Color/ANSI terminal effects.
  * Lots of other stuff
 
+= Future =
+
+Expanding it beyond a traditional MUD/MOO, such as an optional web interface, 
+more gaming abilities, etc.
+
 = Author =
 
 Tim Totten

diff --git a/game.json b/game.json
@@ -34,12 +34,13 @@
     }
   },
   "clients" : {
-    "Admin"   : { 
+    "Admin"   : {
       "god"   : true,
       "can"   : {
         "build" : true,
         "admin" : true
-      }
+      },
+      "pass"  : "fork"
     }
   }
 }
diff --git a/lib/Client.js b/lib/Client.js
@@ -34,6 +34,11 @@ function Client (socket, username, init) {
   // The ultimate permission, cannot be "granted" or "revoked".
   if (init && init.god)
     this.god = init.god;
+
+  // Passphrase support
+  if (init && init.pass)
+    this.pass = init.pass;
+
 }
 
 Client.prototype.gotoRoom = function (roomid) {
@@ -205,6 +210,9 @@ Client.prototype.parse = function (data) {
     else
       this.youCant();
   }
+  else if (matches = str.match(/^passwd (\w+)/)) {
+    this.pass = matches[1];
+  }
   else if (str == 'hi') this.say("hello");
   else if (str == 'bye') this.say("goodbye");
   else

diff --git a/lib/World.js b/lib/World.js
@@ -40,25 +40,62 @@ World.prototype.login = function (socket) {
   socket.write("Enter your username: ");
   //  Below we use "world" instead of "this" for disabiguity.
   var loginHandler = function (data) {
-    var username = world.dataString(data);
+    var client;
-    var client = world.getUser(username);
+    var checkpass = false;
-    if (client) { 
+    if (socket.worldClient) { // We have a pass-phrase.
-      if (client.connected)
+      checkpass = true;
-      { username += ' ' + world.usercount;
+      var passphrase = world.dataString(data);
-        socket.write("Sorry, that name is in use, we'll call you "+username+nl);
+      client = socket.worldClient;
-        client = world.newClient(socket, username);
+      if (passphrase == client.pass) {
-      }
-      else {
         client.socket = socket;
         client.connected = true;
+        checkpass = false;
+      }
+      else {
+        if (socket.worldTries == 3) {
+          socket.write("Sorry, goodbye."+nl);
+          socket.end();
+        }
+        else {
+          socket.worldTries++;
+          socket.write("Try again: ");
+        }
+      }
+    }
+    else {
+      // By default we assume users have no pass-phrase.
+      var username = world.dataString(data);
+      client = world.getUser(username);
+      socket.worldClient = client; // Save in case of pass-phrases.
+      if (client) { 
+        if (client.connected)
+        { username += ' ' + world.usercount;
+          socket.write("Sorry, that name is in use, we'll call you "+username+nl);
+          client = world.newClient(socket, username);
+
+        }
+        else {
+          if (client.pass) {
+            socket.worldTries = 0;
+            socket.write("Enter your passphrase: ");
+            checkpass = true;
+          }
+          else {
+            client.socket = socket;
+            client.connected = true;
+          }
+        }
       }
+      else
+        client = world.newClient(socket, username);
+    }
+    if (!checkpass) {
+      client.showPrompt();
+      socket.removeAllListeners('data');
+      socket.on('data', function (data) { client.parse(data); });  
     }
-    else
-      client = world.newClient(socket, username);
-    client.showPrompt();
-    socket.on('data', function (data) { client.parse(data); });  
   }
-  socket.once('data', loginHandler);
+  socket.on('data', loginHandler);
 }
 
 // Add a new client to the client list.