Added "login" permission checking.

huin · Jul 17, 2011 · 09824fd · 09824fd
1 parent c3f6575
commit 09824fd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/groups.json b/groups.json
@@ -2,7 +2,6 @@
   "default": {
     "default":true,
     "permissions": [
-      "login",
       "user.commands.help",
       "user.commands.kill",
       "user.commands.me",

diff --git a/src/chunkymonkey/game.go b/src/chunkymonkey/game.go
@@ -11,6 +11,7 @@ import (
 	"time"
 
 	. "chunkymonkey/entity"
+	"chunkymonkey/gamerules"
 	"chunkymonkey/player"
 	"chunkymonkey/proto"
 	"chunkymonkey/server_auth"
@@ -99,6 +100,14 @@ func (game *Game) login(conn net.Conn) {
 		return
 	}
 
+	// Load player permissions.
+	permissions := gamerules.Permissions.UserPermissions(username)
+	if !permissions.Has("login") {
+		err = fmt.Errorf("Player %q does not have login permission", username)
+		clientErr = os.NewError("You do not have access to this server.")
+		return
+	}
+
 	if err = proto.ServerWriteHandshake(conn, game.serverId); err != nil {
 		clientErr = os.NewError("Handshake error.")
 		return